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

diff --git a/lexlua/gnuplot.lua b/lexlua/gnuplot.lua
index 5c14f49ae..ca9ca5bad 100644
--- a/lexlua/gnuplot.lua
+++ b/lexlua/gnuplot.lua
@@ -45,13 +45,13 @@ lex:add_rule('variable', token(lexer.VARIABLE, word_match[[
 lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
 
 -- Strings.
-lex:add_rule('string', token(lexer.STRING, lexer.delimited_range("'") +
-                                           lexer.delimited_range('"') +
-                                           lexer.delimited_range('[]', true) +
-                                           lexer.delimited_range('{}', true)))
+local sq_str = lexer.range("'")
+local dq_str = lexer.range('"')
+local br_str = lexer.range('[', ']', true) + lexer.range('{', '}', true)
+lex:add_rule('string', token(lexer.STRING, sq_str + dq_str + br_str))
 
 -- Comments.
-lex:add_rule('comment', token(lexer.COMMENT, '#' * lexer.nonnewline^0))
+lex:add_rule('comment', token(lexer.COMMENT, lexer.to_eol('#')))
 
 -- Operators.
 lex:add_rule('operator', token(lexer.OPERATOR, S('-+~!$*%=<>&|^?:()')))