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/pascal.lua | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'lexlua/pascal.lua') diff --git a/lexlua/pascal.lua b/lexlua/pascal.lua index e5db67982..05cb3b5c0 100644 --- a/lexlua/pascal.lua +++ b/lexlua/pascal.lua @@ -38,23 +38,21 @@ lex:add_rule('type', token(lexer.TYPE, word_match([[ ]], true))) -- Strings. -lex:add_rule('string', token(lexer.STRING, - S('uUrR')^-1 * - lexer.delimited_range("'", true, true))) +lex:add_rule('string', token(lexer.STRING, S('uUrR')^-1 * + lexer.range("'", true, false))) -- Identifiers. lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word)) -- Comments. -local line_comment = '//' * lexer.nonnewline_esc^0 -local bblock_comment = '{' * (lexer.any - '}')^0 * P('}')^-1 -local pblock_comment = '(*' * (lexer.any - '*)')^0 * P('*)')^-1 +local line_comment = lexer.to_eol('//', true) +local bblock_comment = lexer.range('{', '}') +local pblock_comment = lexer.range('(*', '*)') lex:add_rule('comment', token(lexer.COMMENT, line_comment + bblock_comment + - pblock_comment)) + pblock_comment)) -- Numbers. -lex:add_rule('number', token(lexer.NUMBER, (lexer.float + lexer.integer) * - S('LlDdFf')^-1)) +lex:add_rule('number', token(lexer.NUMBER, lexer.number * S('LlDdFf')^-1)) -- Operators. lex:add_rule('operator', token(lexer.OPERATOR, S('.,;^@:=<>+-/*()[]'))) -- cgit v1.2.3