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

diff --git a/lexlua/ada.lua b/lexlua/ada.lua
index bdcbfe313..3a4c385f4 100644
--- a/lexlua/ada.lua
+++ b/lexlua/ada.lua
@@ -37,19 +37,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('"', true, true)))
+lex:add_rule('string', token(lexer.STRING, lexer.range('"', true, false)))
 
 -- Comments.
-lex:add_rule('comment', token(lexer.COMMENT, '--' * lexer.nonnewline^0))
+lex:add_rule('comment', token(lexer.COMMENT, lexer.to_eol('--')))
 
 -- Numbers.
-local hex_num = 'O' * S('xX') * (lexer.xdigit + '_')^1
 local integer = lexer.digit^1 * ('_' * lexer.digit^1)^0
 local float = integer^1 * ('.' * integer^0)^-1 * S('eE') * S('+-')^-1 * integer
-lex:add_rule('number', token(lexer.NUMBER, hex_num +
-                                           S('+-')^-1 * (float + integer) *
-                                           S('LlUuFf')^-3))
+lex:add_rule('number', token(lexer.NUMBER, S('+-')^-1 * (float + integer)))
 
 -- Operators.
 lex:add_rule('operator', token(lexer.OPERATOR, S(':;=<>&+-*/.()')))