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

diff --git a/lexlua/matlab.lua b/lexlua/matlab.lua
index d371ebc96..7800a421c 100644
--- a/lexlua/matlab.lua
+++ b/lexlua/matlab.lua
@@ -54,23 +54,22 @@ 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("'", true) +
-                                           lexer.delimited_range('"') +
-                                           lexer.delimited_range('`')))
+local sq_str = lexer.range("'", true)
+local dq_str = lexer.range('"')
+local bq_str = lexer.range('`')
+lex:add_rule('string', token(lexer.STRING, sq_str + dq_str + bq_str))
 
 -- Comments.
-local line_comment = (P('%') + '#') * lexer.nonnewline^0
-local block_comment = '%{' * (lexer.any - '%}')^0 * P('%}')^-1
+local line_comment = lexer.to_eol(P('%') + '#')
+local block_comment = lexer.range('%{', '%}')
 lex:add_rule('comment', token(lexer.COMMENT, block_comment + line_comment))
 
 -- Numbers.
-lex:add_rule('number', token(lexer.NUMBER, lexer.float + lexer.integer +
-                                           lexer.dec_num + lexer.hex_num +
-                                           lexer.oct_num))
+lex:add_rule('number', token(lexer.NUMBER, lexer.number))
 
 -- Operators.
 lex:add_rule('operator', token(lexer.OPERATOR,
-                               S('!%^&*()[]{}-=+/\\|:;.,?<>~`´')))
+  S('!%^&*()[]{}-=+/\\|:;.,?<>~`´')))
 
 -- Fold points.
 lex:add_fold_point(lexer.KEYWORD, 'if', 'end')