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/tex.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lexlua/tex.lua') diff --git a/lexlua/tex.lua b/lexlua/tex.lua index 9e707f9be..8c9e76860 100644 --- a/lexlua/tex.lua +++ b/lexlua/tex.lua @@ -12,16 +12,16 @@ local lex = lexer.new('tex') lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1)) -- Comments. -lex:add_rule('comment', token(lexer.COMMENT, '%' * lexer.nonnewline^0)) +lex:add_rule('comment', token(lexer.COMMENT, lexer.to_eol('%'))) -- TeX environments. lex:add_rule('environment', token('environment', '\\' * (P('begin') + 'end') * - lexer.word)) + lexer.word)) lex:add_style('environment', lexer.STYLE_KEYWORD) -- Commands. -lex:add_rule('command', token(lexer.KEYWORD, '\\' * - (lexer.alpha^1 + S('#$&~_^%{}')))) +lex:add_rule('command', token(lexer.KEYWORD, '\\' * (lexer.alpha^1 + + S('#$&~_^%{}')))) -- Operators. lex:add_rule('operator', token(lexer.OPERATOR, S('$&#{}[]'))) -- cgit v1.2.3