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.

1 files changed, 11 insertions, 10 deletions

diff --git a/lexlua/boo.lua b/lexlua/boo.lua
index 907f72c19..926351f04 100644
--- a/lexlua/boo.lua
+++ b/lexlua/boo.lua
@@ -41,22 +41,23 @@ lex:add_rule('function', token(lexer.FUNCTION, word_match[[
 lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
 
 -- Strings.
-local sq_str = lexer.delimited_range("'", true)
-local dq_str = lexer.delimited_range('"', true)
-local triple_dq_str = '"""' * (lexer.any - '"""')^0 * P('"""')^-1
+local sq_str = lexer.range("'", true)
+local dq_str = lexer.range('"', true)
+local tq_str = lexer.range('"""')
+local string = token(lexer.STRING, tq_str + sq_str + dq_str)
 local regex_str = #P('/') * lexer.last_char_includes('!%^&*([{-=+|:;,?<>~') *
-                  lexer.delimited_range('/', true)
-lex:add_rule('string', token(lexer.STRING, triple_dq_str + sq_str + dq_str) +
-                       token(lexer.REGEX, regex_str))
+  lexer.range('/', true)
+local regex = token(lexer.REGEX, regex_str)
+lex:add_rule('string', string + regex)
 
 -- Comments.
-local line_comment = '#' * lexer.nonnewline_esc^0
-local block_comment = '/*' * (lexer.any - '*/')^0 * P('*/')^-1
+local line_comment = lexer.to_eol('#', true)
+local block_comment = lexer.range('/*', '*/')
 lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment))
 
 -- Numbers.
-lex:add_rule('number', token(lexer.NUMBER, (lexer.float + lexer.integer) *
-                                           (S('msdhsfFlL') + 'ms')^-1))
+lex:add_rule('number', token(lexer.NUMBER, lexer.number *
+  (S('msdhsfFlL') + 'ms')^-1))
 
 -- Operators.
 lex:add_rule('operator', token(lexer.OPERATOR, S('!%^&*()[]{}-=+/|:;.,?<>~`')))