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/lisp.lua | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'lexlua/lisp.lua') diff --git a/lexlua/lisp.lua b/lexlua/lisp.lua index 374956b1a..88d6488f0 100644 --- a/lexlua/lisp.lua +++ b/lexlua/lisp.lua @@ -36,17 +36,16 @@ local word = lexer.alpha * (lexer.alnum + '_' + '-')^0 lex:add_rule('identifier', token(lexer.IDENTIFIER, word)) -- Strings. -lex:add_rule('string', token(lexer.STRING, "'" * word + - lexer.delimited_range('"'))) +lex:add_rule('string', token(lexer.STRING, "'" * word + lexer.range('"'))) -- 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)) -- Entities. lex:add_rule('entity', token('entity', '&' * word)) -- cgit v1.2.3