From fad15f79b1230b3076be515d6894c8919562809b Mon Sep 17 00:00:00 2001 From: mitchell Date: Sat, 25 Apr 2020 16:26:31 -0400 Subject: 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. --- lexlua/pure.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lexlua/pure.lua') diff --git a/lexlua/pure.lua b/lexlua/pure.lua index db75233b7..5e8f04aa9 100644 --- a/lexlua/pure.lua +++ b/lexlua/pure.lua @@ -11,8 +11,8 @@ local lex = lexer.new('pure') lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1)) -- 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)) -- Pragmas. @@ -45,6 +45,6 @@ lex:add_rule('operator', token(lexer.OPERATOR, dots + punct)) lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word)) -- Strings. -lex:add_rule('string', token(lexer.STRING, lexer.delimited_range('"', true))) +lex:add_rule('string', token(lexer.STRING, lexer.range('"', true))) return lex -- cgit v1.2.3