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/io_lang.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lexlua/io_lang.lua') diff --git a/lexlua/io_lang.lua b/lexlua/io_lang.lua index 44143dc6f..573bd7ca8 100644 --- a/lexlua/io_lang.lua +++ b/lexlua/io_lang.lua @@ -26,22 +26,22 @@ lex:add_rule('type', token(lexer.TYPE, word_match[[ lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word)) -- Strings. -local sq_str = lexer.delimited_range("'") -local dq_str = lexer.delimited_range('"') -local tq_str = '"""' * (lexer.any - '"""')^0 * P('"""')^-1 +local sq_str = lexer.range("'") +local dq_str = lexer.range('"') +local tq_str = lexer.range('"""') lex:add_rule('string', token(lexer.STRING, tq_str + sq_str + dq_str)) -- Comments. -local line_comment = (P('#') + '//') * lexer.nonnewline^0 -local block_comment = '/*' * (lexer.any - '*/')^0 * P('*/')^-1 +local line_comment = lexer.to_eol(P('#') + '//') +local block_comment = lexer.range('/*', '*/') lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment)) -- Numbers. -lex:add_rule('number', token(lexer.NUMBER, lexer.float + lexer.integer)) +lex:add_rule('number', token(lexer.NUMBER, lexer.number)) -- Operators. lex:add_rule('operator', token(lexer.OPERATOR, - S('`~@$%^&*-+/=\\<>?.,:;()[]{}'))) + S('`~@$%^&*-+/=\\<>?.,:;()[]{}'))) -- Fold points. lex:add_fold_point(lexer.OPERATOR, '(', ')') -- cgit v1.2.3