diff options
Diffstat (limited to 'lexlua/moonscript.lua')
| -rw-r--r-- | lexlua/moonscript.lua | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/lexlua/moonscript.lua b/lexlua/moonscript.lua index 933130b74..d57cd55a9 100644 --- a/lexlua/moonscript.lua +++ b/lexlua/moonscript.lua @@ -110,24 +110,25 @@ lex:add_style('proper_ident', lexer.STYLE_CLASS) lex:add_style('tbl_key', lexer.STYLE_REGEX) local longstring = lpeg.Cmt('[' * lpeg.C(P('=')^0) * '[', - function(input, index, eq) - local _, e = input:find(']'..eq..']', index, true) - return (e or #input) + 1 - end) + function(input, index, eq) + local _, e = input:find(']' .. eq .. ']', index, true) + return (e or #input) + 1 + end) -- Strings. -local sq_str = lexer.delimited_range("'", false, true) -local dq_str = lexer.delimited_range('"', false, true) +local sq_str = lexer.range("'", false, false) +local dq_str = lexer.range('"', false, false) lex:add_rule('string', token(lexer.STRING, sq_str + dq_str) + - token('longstring', longstring)) + token('longstring', longstring)) lex:add_style('longstring', lexer.STYLE_STRING) -- Comments. -lex:add_rule('comment', token(lexer.COMMENT, '--' * (longstring + - lexer.nonnewline^0))) +local line_comment = lexer.to_eol('--') +local block_comment = '--' * longstring +lex:add_rule('comment', token(lexer.COMMENT, block_comment + line_comment)) -- Numbers. -lex:add_rule('number', token(lexer.NUMBER, lexer.float + lexer.integer)) +lex:add_rule('number', token(lexer.NUMBER, lexer.number)) -- Function definition. lex:add_rule('fndef', token('fndef', P('->') + '=>')) |