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

diff --git a/lexlua/rc.lua b/lexlua/rc.lua
index 8c257c6fb..3639cc556 100644
--- a/lexlua/rc.lua
+++ b/lexlua/rc.lua
@@ -20,32 +20,31 @@ lex:add_rule('keyword', token(lexer.KEYWORD, word_match[[
 lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
 
 -- Strings.
-local str = lexer.delimited_range("'", false, true)
+local str = lexer.range("'", false, false)
 local heredoc = '<<' * P(function(input, index)
   local s, e, _, delimiter = input:find('[ \t]*(["\']?)([%w!"%%+,-./:?@_~]+)%1',
-                                        index)
+    index)
   if s == index and delimiter then
     delimiter = delimiter:gsub('[%%+-.?]', '%%%1')
-    local _, e = input:find('[\n\r]'..delimiter..'[\n\r]', e)
+    local _, e = input:find('[\n\r]' .. delimiter .. '[\n\r]', e)
     return e and e + 1 or #input + 1
   end
 end)
 lex:add_rule('string', token(lexer.STRING, str + heredoc))
 
 -- Comments.
-lex:add_rule('comment', token(lexer.COMMENT, '#' * lexer.nonnewline^0))
+lex:add_rule('comment', token(lexer.COMMENT, lexer.to_eol('#')))
 
 -- Numbers.
-lex:add_rule('number', token(lexer.NUMBER, lexer.integer + lexer.float))
+lex:add_rule('number', token(lexer.NUMBER, lexer.number))
 
 -- Variables.
 lex:add_rule('variable', token(lexer.VARIABLE, '$' * S('"#')^-1 *
-                                               ('*' + lexer.digit^1 +
-                                                lexer.word)))
+  ('*' + lexer.digit^1 + lexer.word)))
 
 -- Operators.
 lex:add_rule('operator', token(lexer.OPERATOR, S('@`=!<>*&^|;?()[]{}') +
-                                               '\\\n'))
+  '\\\n'))
 
 -- Fold points.
 lex:add_fold_point(lexer.OPERATOR, '{', '}')