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, 13 insertions, 14 deletions

diff --git a/lexlua/bash.lua b/lexlua/bash.lua
index d3a3953e8..fb214bca8 100644
--- a/lexlua/bash.lua
+++ b/lexlua/bash.lua
@@ -23,29 +23,28 @@ lex:add_rule('keyword', token(lexer.KEYWORD, word_match[[
 lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
 
 -- Strings.
-local sq_str = lexer.delimited_range("'", false, true)
-local dq_str = lexer.delimited_range('"')
-local ex_str = lexer.delimited_range('`')
+local sq_str = lexer.range("'", false, false)
+local dq_str = lexer.range('"')
+local ex_str = lexer.range('`')
 local heredoc = '<<' * P(function(input, index)
-  local s, e, _, delimiter =
-    input:find('%-?(["\']?)([%a_][%w_]*)%1[\n\r\f;]+', index)
-  if s == index and delimiter then
-    local _, e = input:find('[\n\r\f]+'..delimiter, e)
-    return e and e + 1 or #input + 1
-  end
+  local _, e, _, delimiter = input:find(
+    '^%-?(["\']?)([%a_][%w_]*)%1[\n\r\f;]+', index)
+  if not delimiter then return end
+  _, e = input:find('[\n\r\f]+' .. delimiter, e)
+  return e and e + 1 or #input + 1
 end)
 lex:add_rule('string', token(lexer.STRING, sq_str + dq_str + ex_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.float + lexer.integer))
+lex:add_rule('number', token(lexer.NUMBER, lexer.number))
 
 -- Variables.
-lex:add_rule('variable', token(lexer.VARIABLE,
-                               '$' * (S('!#?*@$') + lexer.digit^1 + lexer.word +
-                                      lexer.delimited_range('{}', true, true))))
+lex:add_rule('variable', token(lexer.VARIABLE, '$' * (
+  S('!#?*@$') + lexer.digit^1 + lexer.word + lexer.range('{', '}', true)
+)))
 
 -- Operators.
 lex:add_rule('operator', token(lexer.OPERATOR, S('=!<>+-/*^&|~.,:;?()[]{}')))