diff options
Diffstat (limited to 'lexlua/dart.lua')
| -rw-r--r-- | lexlua/dart.lua | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lexlua/dart.lua b/lexlua/dart.lua index c9aa80200..fca648485 100644 --- a/lexlua/dart.lua +++ b/lexlua/dart.lua @@ -25,22 +25,21 @@ lex:add_rule('builtin', token(lexer.CONSTANT, word_match[[ ]])) -- Strings. -local sq_str = S('r')^-1 * lexer.delimited_range("'", true) -local dq_str = S('r')^-1 * lexer.delimited_range('"', true) -local sq_str_multiline = S('r')^-1 * "'''" * (lexer.any - "'''")^0 * P("'''")^-1 -local dq_str_multiline = S('r')^-1 * '"""' * (lexer.any - '"""')^0 * P('"""')^-1 -lex:add_rule('string', token(lexer.STRING, sq_str_multiline + dq_str_multiline + - sq_str + dq_str)) +local sq_str = S('r')^-1 * lexer.range("'", true) +local dq_str = S('r')^-1 * lexer.range('"', true) +local tq_str = S('r')^-1 * (lexer.range("'''") + lexer.range('"""')) +lex:add_rule('string', token(lexer.STRING, tq_str + sq_str + dq_str)) -- Identifiers. lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word)) -- Comments. -lex:add_rule('comment', token(lexer.COMMENT, '//' * lexer.nonnewline_esc^0 + - lexer.nested_pair('/*', '*/'))) +local line_comment = lexer.to_eol('//', true) +local block_comment = lexer.range('/*', '*/', false, false, true) +lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment)) -- Numbers. -lex:add_rule('number', token(lexer.NUMBER, lexer.float + lexer.hex_num)) +lex:add_rule('number', token(lexer.NUMBER, lexer.number)) -- Operators. lex:add_rule('operator', token(lexer.OPERATOR, S('#?=!<>+-*$/%&|^~.,;()[]{}'))) |