diff options
Diffstat (limited to 'lexlua/caml.lua')
| -rw-r--r-- | lexlua/caml.lua | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lexlua/caml.lua b/lexlua/caml.lua index 5d668d133..a65d5552a 100644 --- a/lexlua/caml.lua +++ b/lexlua/caml.lua @@ -47,14 +47,16 @@ lex:add_rule('function', token(lexer.FUNCTION, 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('"', true))) +local sq_str = lexer.range("'", true) +local dq_str = lexer.range('"', true) +lex:add_rule('string', token(lexer.STRING, sq_str + dq_str)) -- Comments. -lex:add_rule('comment', token(lexer.COMMENT, lexer.nested_pair('(*', '*)'))) +lex:add_rule('comment', token(lexer.COMMENT, + lexer.range('(*', '*)', false, false, true))) -- 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, S('=<>+-*/.,:;~!#%^&|?[](){}'))) |