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/json.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lexlua/json.lua') diff --git a/lexlua/json.lua b/lexlua/json.lua index 787fc99a5..c6feb3a60 100644 --- a/lexlua/json.lua +++ b/lexlua/json.lua @@ -12,15 +12,16 @@ local lex = lexer.new('json') lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1)) -- Strings. -lex:add_rule('string', token(lexer.STRING, lexer.delimited_range("'", true) + - lexer.delimited_range('"', true))) +local sq_str = lexer.range("'", true) +local dq_str = lexer.range('"', true) +lex:add_rule('string', token(lexer.STRING, sq_str + dq_str)) -- Keywords. lex:add_rule('keyword', token(lexer.KEYWORD, word_match[[true false null]])) -- Comments. -local line_comment = '//' * lexer.nonnewline_esc^0 -local block_comment = '/*' * (lexer.any - '*/')^0 * P('*/')^-1 +local line_comment = lexer.to_eol('//', true) +local block_comment = lexer.range('/*', '*/') lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment)) -- Numbers. -- cgit v1.2.3