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, 3 insertions, 6 deletions

diff --git a/lexlua/vbscript.lua b/lexlua/vbscript.lua
index c0d5ba221..0bf2c0e12 100644
--- a/lexlua/vbscript.lua
+++ b/lexlua/vbscript.lua
@@ -33,19 +33,16 @@ lex:add_rule('type', token(lexer.TYPE, word_match([[
 
 -- Comments.
 lex:add_rule('comment', token(lexer.COMMENT,
-                              (P("'") + word_match([[rem]], true)) *
-                              lexer.nonnewline^0))
+  lexer.to_eol("'" + word_match([[rem]], true))))
 
 -- Identifiers.
 lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
 
 -- Strings.
-lex:add_rule('string', token(lexer.STRING,
-                             lexer.delimited_range('"', true, true)))
+lex:add_rule('string', token(lexer.STRING, lexer.range('"', true, false)))
 
 -- Numbers.
-lex:add_rule('number', token(lexer.NUMBER, (lexer.float + lexer.integer) *
-                                           S('LlUuFf')^-2))
+lex:add_rule('number', token(lexer.NUMBER, lexer.number * S('LlUuFf')^-2))
 
 -- Operators.
 lex:add_rule('operator', token(lexer.OPERATOR, S('=><+-*^&:.,_()')))