diff options
Diffstat (limited to 'lexlua/vala.lua')
| -rw-r--r-- | lexlua/vala.lua | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lexlua/vala.lua b/lexlua/vala.lua index 456841187..3a2b16fbf 100644 --- a/lexlua/vala.lua +++ b/lexlua/vala.lua @@ -34,20 +34,19 @@ lex:add_rule('type', token(lexer.TYPE, word_match[[ lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word)) -- Strings. -local sq_str = lexer.delimited_range("'", true) -local dq_str = lexer.delimited_range('"', true) -local tq_str = '"""' * (lexer.any - '"""')^0 * P('"""')^-1 -local ml_str = '@' * lexer.delimited_range('"', false, true) +local sq_str = lexer.range("'", true) +local dq_str = lexer.range('"', true) +local tq_str = lexer.range('"""') +local ml_str = '@' * lexer.range('"', false, false) lex:add_rule('string', token(lexer.STRING, tq_str + sq_str + dq_str + ml_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) * - S('uUlLfFdDmM')^-1)) +lex:add_rule('number', token(lexer.NUMBER, lexer.number * S('uUlLfFdDmM')^-1)) -- Operators. lex:add_rule('operator', token(lexer.OPERATOR, S('+-/*%<>!=^&|?~:;.()[]{}'))) |