diff options
Diffstat (limited to 'lexlua/fish.lua')
| -rw-r--r-- | lexlua/fish.lua | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lexlua/fish.lua b/lexlua/fish.lua index 6585e240b..5ec829391 100644 --- a/lexlua/fish.lua +++ b/lexlua/fish.lua @@ -25,24 +25,23 @@ lex:add_rule('keyword', token(lexer.KEYWORD, word_match[[ lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word)) -- Variables. -lex:add_rule('variable', token(lexer.VARIABLE, - '$' * (lexer.word + - lexer.delimited_range('{}', true, true)))) +lex:add_rule('variable', token(lexer.VARIABLE, '$' * (lexer.word + + lexer.range('{', '}', true)))) -- Strings. -local sq_str = lexer.delimited_range("'", false, true) -local dq_str = lexer.delimited_range('"') +local sq_str = lexer.range("'", false, false) +local dq_str = lexer.range('"') lex:add_rule('string', token(lexer.STRING, sq_str + dq_str)) -- Shebang. -lex:add_rule('shebang', token('shebang', '#!/' * lexer.nonnewline^0)) +lex:add_rule('shebang', token('shebang', lexer.to_eol('#!/'))) lex:add_style('shebang', lexer.STYLE_LABEL) -- Comments. -lex:add_rule('comment', token(lexer.COMMENT, '#' * lexer.nonnewline^0)) +lex:add_rule('comment', token(lexer.COMMENT, lexer.to_eol('#'))) -- 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('=!<>+-/*^&|~.,:;?()[]{}'))) |