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, 10 insertions, 8 deletions

diff --git a/lexlua/coffeescript.lua b/lexlua/coffeescript.lua
index 62023be60..b5edd1120 100644
--- a/lexlua/coffeescript.lua
+++ b/lexlua/coffeescript.lua
@@ -20,25 +20,27 @@ lex:add_rule('keyword', token(lexer.KEYWORD, word_match[[
 
 -- Fields: object properties and methods.
 lex:add_rule('field', token(lexer.FUNCTION, '.' * (S('_$') + lexer.alpha) *
-                                            (S('_$') + lexer.alnum)^0))
+  (S('_$') + lexer.alnum)^0))
 
 -- Identifiers.
 lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
 
 -- Strings.
+local sq_str = lexer.range("'")
+local dq_str = lexer.range('"')
+local string = token(lexer.STRING, sq_str + dq_str)
 local regex_str = #P('/') * lexer.last_char_includes('+-*%<>!=^&|?~:;,([{') *
-                  lexer.delimited_range('/', true) * S('igm')^0
-lex:add_rule('string', token(lexer.STRING, lexer.delimited_range("'") +
-                                           lexer.delimited_range('"')) +
-                       token(lexer.REGEX, regex_str))
+  lexer.range('/', true) * S('igm')^0
+local regex = token(lexer.REGEX, regex_str)
+lex:add_rule('string', string + regex)
 
 -- Comments.
-local block_comment = '###' * (lexer.any - '###')^0 * P('###')^-1
-local line_comment = '#' * lexer.nonnewline_esc^0
+local block_comment = lexer.range('###')
+local line_comment = lexer.to_eol('#', true)
 lex:add_rule('comment', token(lexer.COMMENT, block_comment + line_comment))
 
 -- 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('+-/*%<>!=^&|?~:;,.()[]{}')))