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/lilypond.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lexlua/lilypond.lua') diff --git a/lexlua/lilypond.lua b/lexlua/lilypond.lua index a7775016a..645a64fbc 100644 --- a/lexlua/lilypond.lua +++ b/lexlua/lilypond.lua @@ -18,12 +18,11 @@ lex:add_rule('keyword', token(lexer.KEYWORD, '\\' * lexer.word)) lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word)) -- Strings. -lex:add_rule('string', token(lexer.STRING, - lexer.delimited_range('"', false, true))) +lex:add_rule('string', token(lexer.STRING, lexer.range('"', false, false))) -- Comments. -- TODO: block comment. -lex:add_rule('comment', token(lexer.COMMENT, '%' * lexer.nonnewline^0)) +lex:add_rule('comment', token(lexer.COMMENT, lexer.to_eol('%'))) -- Operators. lex:add_rule('operator', token(lexer.OPERATOR, S("{}'~<>|"))) -- cgit v1.2.3