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

diff --git a/lexlua/applescript.lua b/lexlua/applescript.lua
index 3f21f1512..cbdf95072 100644
--- a/lexlua/applescript.lua
+++ b/lexlua/applescript.lua
@@ -46,19 +46,19 @@ lex:add_rule('constant', token(lexer.CONSTANT, word_match[[
 ]], true))
 
 -- Identifiers.
-lex:add_rule('identifier', token(lexer.IDENTIFIER, (lexer.alpha + '_') *
-                                                   lexer.alnum^0))
+lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.alpha *
+  (lexer.alnum + '_')^0))
 
 -- Strings.
-lex:add_rule('string', token(lexer.STRING, lexer.delimited_range('"', true)))
+lex:add_rule('string', token(lexer.STRING, lexer.range('"', true)))
 
 -- Comments.
-local line_comment = '--' * lexer.nonnewline^0
-local block_comment = '(*' * (lexer.any - '*)')^0 * P('*)')^-1
+local line_comment = lexer.to_eol('--')
+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))
+lex:add_rule('number', token(lexer.NUMBER, lexer.number))
 
 -- Operators.
 lex:add_rule('operator', token(lexer.OPERATOR, S('+-^*/&<>=:,(){}')))