diff options
Diffstat (limited to 'lexlua/fsharp.lua')
| -rw-r--r-- | lexlua/fsharp.lua | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lexlua/fsharp.lua b/lexlua/fsharp.lua index d8ecdc628..b80bf37e4 100644 --- a/lexlua/fsharp.lua +++ b/lexlua/fsharp.lua @@ -34,26 +34,28 @@ lex:add_rule('type', token(lexer.TYPE, word_match[[ lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word)) -- Strings. -lex:add_rule('string', token(lexer.STRING, lexer.delimited_range("'", true) + - lexer.delimited_range('"', true))) +local sq_str = lexer.range("'", true) +local dq_str = lexer.range('"', true) +lex:add_rule('string', token(lexer.STRING, sq_str + dq_str)) -- Comments. -lex:add_rule('comment', token(lexer.COMMENT, '//' * lexer.nonnewline^0 + - lexer.nested_pair('(*', '*)'))) +local line_comment = lexer.to_eol('//') +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.integer * S('uUlL')^-1))) +lex:add_rule('number', token(lexer.NUMBER, + (lexer.float + lexer.integer * S('uUlL')^-1))) -- Preprocessor. local preproc_word = word_match[[ else endif endregion if ifdef ifndef light region ]] lex:add_rule('preproc', token(lexer.PREPROCESSOR, lexer.starts_line('#') * - S('\t ')^0 * preproc_word)) + S('\t ')^0 * preproc_word)) -- Operators. lex:add_rule('operator', token(lexer.OPERATOR, - S('=<>+-*/^.,:;~!@#%^&|?[](){}'))) + S('=<>+-*/^.,:;~!@#%^&|?[](){}'))) return lex |