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

diff --git a/lexlua/latex.lua b/lexlua/latex.lua
index c4df8e641..bb2f70823 100644
--- a/lexlua/latex.lua
+++ b/lexlua/latex.lua
@@ -13,10 +13,9 @@ local lex = lexer.new('latex')
 lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
 
 -- Comments.
-local line_comment = '%' * lexer.nonnewline^0
-local block_comment = '\\begin' * P(' ')^0 * '{comment}' *
-                      (lexer.any - '\\end' * P(' ')^0 * '{comment}')^0 *
-                      P('\\end' * P(' ')^0 * '{comment}')^-1
+local line_comment = lexer.to_eol('%')
+local block_comment = lexer.range('\\begin' * P(' ')^0 * '{comment}',
+  '\\end' * P(' ')^0 * '{comment}')
 lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment))
 
 -- Math environments.
@@ -24,15 +23,13 @@ local math_word = word_match[[
   align displaymath eqnarray equation gather math multline
 ]]
 local math_begin_end = (P('begin') + P('end')) * P(' ')^0 *
-                       '{' * math_word * P('*')^-1 * '}'
+  '{' * math_word * P('*')^-1 * '}'
 lex:add_rule('math', token('math', '$' + '\\' * (S('[]()') + math_begin_end)))
 lex:add_style('math', lexer.STYLE_FUNCTION)
 
 -- LaTeX environments.
 lex:add_rule('environment', token('environment', '\\' *
-                                                 (P('begin') + P('end')) *
-                                                 P(' ')^0 * '{' * lexer.word *
-                                                 P('*')^-1 * '}'))
+  (P('begin') + P('end')) * P(' ')^0 * '{' * lexer.word * P('*')^-1 * '}'))
 lex:add_style('environment', lexer.STYLE_KEYWORD)
 
 -- Sections.
@@ -43,7 +40,7 @@ lex:add_style('section', lexer.STYLE_CLASS)
 
 -- Commands.
 lex:add_rule('command', token('command', '\\' *
-                                         (lexer.alpha^1 + S('#$&~_^%{}'))))
+  (lexer.alpha^1 + S('#$&~_^%{}'))))
 lex:add_style('command', lexer.STYLE_KEYWORD)
 
 -- Operators.