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

diff --git a/lexlua/haskell.lua b/lexlua/haskell.lua
index 524773301..2b36473a3 100644
--- a/lexlua/haskell.lua
+++ b/lexlua/haskell.lua
@@ -22,22 +22,23 @@ local op = lexer.punct - S('()[]{}')
 
 -- Types & type constructors.
 lex:add_rule('type', token(lexer.TYPE, (lexer.upper * word) +
-                                       (":" * (op^1 - ":"))))
+  (":" * (op^1 - ":"))))
 
 -- Identifiers.
 lex:add_rule('identifier', token(lexer.IDENTIFIER, (lexer.alpha + '_') * word))
 
 -- Strings.
-lex:add_rule('string', token(lexer.STRING, lexer.delimited_range("'", true) +
-                                           lexer.delimited_range('"')))
+local sq_str = lexer.range("'", true)
+local dq_str = lexer.range('"')
+lex:add_rule('string', token(lexer.STRING, sq_str + dq_str))
 
 -- Comments.
-local line_comment = '--' * lexer.nonnewline_esc^0
-local block_comment = '{-' * (lexer.any - '-}')^0 * P('-}')^-1
+local line_comment = lexer.to_eol('--', true)
+local block_comment = lexer.range('{-', '-}')
 lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment))
 
 -- Numbers.
-lex:add_rule('number', token(lexer.NUMBER, lexer.float + lexer.integer))
+lex:add_rule('number', token(lexer.NUMBER, lexer.number))
 
 -- Operators.
 lex:add_rule('operator', token(lexer.OPERATOR, op))