aboutsummaryrefslogtreecommitdiffhomepage
path: root/lexlua/scheme.lua
diff options
context:
space:
mode:
authormitchell <unknown>2020-04-25 16:26:31 -0400
committermitchell <unknown>2020-04-25 16:26:31 -0400
commitfad15f79b1230b3076be515d6894c8919562809b (patch)
tree72c848ef02c3331de5ca54eff7adaea3a9a6fb88 /lexlua/scheme.lua
parent1fd02a367dec125c0b49dd9246a0928433866b96 (diff)
downloadscintilla-mirror-fad15f79b1230b3076be515d6894c8919562809b.tar.gz
Reformatted Lua LPeg lexers and added new convenience functions and pattern.
`lexer.range()` replaces `lexer.delimited_range()` and `lexer.nested_pair()`. `lexer.to_eol()` replaces `patt * lexer.nonnewline^0` constructs. `lexer.number` replaces `lexer.float + lexer.integer`. Also added unit tests for lexer functions.
Diffstat (limited to 'lexlua/scheme.lua')
-rw-r--r--lexlua/scheme.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/lexlua/scheme.lua b/lexlua/scheme.lua
index 1d37c65c6..326f52cf5 100644
--- a/lexlua/scheme.lua
+++ b/lexlua/scheme.lua
@@ -53,17 +53,17 @@ lex:add_rule('identifier', token(lexer.IDENTIFIER, word))
-- Strings.
local literal = (P("'") + '#' * S('\\bdox')) * lexer.word
-local dq_str = lexer.delimited_range('"')
+local dq_str = lexer.range('"')
lex:add_rule('string', token(lexer.STRING, literal + dq_str))
-- Comments.
-local line_comment = ';' * lexer.nonnewline^0
-local block_comment = '#|' * (lexer.any - '|#')^0 * P('|#')^-1
+local line_comment = lexer.to_eol(';')
+local block_comment = lexer.range('#|', '|#')
lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment))
-- Numbers.
lex:add_rule('number', token(lexer.NUMBER, P('-')^-1 * lexer.digit^1 *
- (S('./') * lexer.digit^1)^-1))
+ (S('./') * lexer.digit^1)^-1))
-- Operators.
lex:add_rule('operator', token(lexer.OPERATOR, S('<>=*/+-`@%:()')))