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/smalltalk.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lexlua/smalltalk.lua') diff --git a/lexlua/smalltalk.lua b/lexlua/smalltalk.lua index 086ce79e6..0acad115f 100644 --- a/lexlua/smalltalk.lua +++ b/lexlua/smalltalk.lua @@ -24,15 +24,15 @@ lex:add_rule('type', token(lexer.TYPE, word_match[[ lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word)) -- Strings. -lex:add_rule('string', token(lexer.STRING, lexer.delimited_range("'") + - '$' * lexer.word)) +local sq_str = lexer.range("'") +local word_str = '$' * lexer.word +lex:add_rule('string', token(lexer.STRING, sq_str + word_str)) -- Comments. -lex:add_rule('comment', token(lexer.COMMENT, - lexer.delimited_range('"', false, true))) +lex:add_rule('comment', token(lexer.COMMENT, lexer.range('"', false, false))) -- 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(':=_<>+-/*!()[]'))) -- cgit v1.2.3