diff options
Diffstat (limited to 'lexlua/csharp.lua')
| -rw-r--r-- | lexlua/csharp.lua | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/lexlua/csharp.lua b/lexlua/csharp.lua index 83f17e411..3a63a20cf 100644 --- a/lexlua/csharp.lua +++ b/lexlua/csharp.lua @@ -31,27 +31,24 @@ lex:add_rule('type', token(lexer.TYPE, word_match[[ 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)) -- Strings. -local sq_str = lexer.delimited_range("'", true) -local dq_str = lexer.delimited_range('"', true) -local ml_str = P('@')^-1 * lexer.delimited_range('"', false, true) +local sq_str = lexer.range("'", true) +local dq_str = lexer.range('"', true) +local ml_str = P('@')^-1 * lexer.range('"', false, false) lex:add_rule('string', token(lexer.STRING, sq_str + dq_str + ml_str)) -- Numbers. -lex:add_rule('number', token(lexer.NUMBER, (lexer.float + lexer.integer) * - S('lLdDfFMm')^-1)) +lex:add_rule('number', token(lexer.NUMBER, lexer.number * S('lLdDfFmM')^-1)) -- Preprocessor. -local preproc_word = word_match[[ - define elif else endif error if line undef warning region endregion -]] -lex:add_rule('preprocessor', token(lexer.PREPROCESSOR, lexer.starts_line('#') * - S('\t ')^0 * - preproc_word)) +lex:add_rule('preprocessor', token(lexer.PREPROCESSOR, '#' * S('\t ')^0 * + word_match[[ + define elif else endif error if line undef warning region endregion + ]])) -- Operators. lex:add_rule('operator', token(lexer.OPERATOR, S('~!.,:;+-*/<>=\\^|&%?()[]{}'))) |