diff options
Diffstat (limited to 'lexlua/chuck.lua')
| -rw-r--r-- | lexlua/chuck.lua | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lexlua/chuck.lua b/lexlua/chuck.lua index 1db6913d9..2f918ed73 100644 --- a/lexlua/chuck.lua +++ b/lexlua/chuck.lua @@ -48,23 +48,23 @@ lex:add_style('time', lexer.STYLE_NUMBER) -- Special special value. lex:add_rule('now', token('now', P('now'))) -lex:add_style('now', lexer.STYLE_CONSTANT..',bold') +lex:add_style('now', lexer.STYLE_CONSTANT .. ',bold') -- Strings. -local sq_str = P('L')^-1 * lexer.delimited_range("'", true) -local dq_str = P('L')^-1 * lexer.delimited_range('"', true) +local sq_str = P('L')^-1 * lexer.range("'", true) +local dq_str = P('L')^-1 * lexer.range('"', true) lex:add_rule('string', token(lexer.STRING, sq_str + dq_str)) -- Identifiers. lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word)) -- 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, S('+-/*%<>!=^&|?~:;.()[]{}@'))) |