diff options
Diffstat (limited to 'lexlua/pike.lua')
| -rw-r--r-- | lexlua/pike.lua | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lexlua/pike.lua b/lexlua/pike.lua index c17d1b4b4..3dff044ac 100644 --- a/lexlua/pike.lua +++ b/lexlua/pike.lua @@ -29,21 +29,21 @@ 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) + - '#' * lexer.delimited_range('"'))) +local sq_str = lexer.range("'", true) +local dq_str = P('#')^-1 * lexer.range('"', true) +lex:add_rule('string', token(lexer.STRING, sq_str + dq_str)) -- Comments. -lex:add_rule('comment', token(lexer.COMMENT, '//' * lexer.nonnewline_esc^0 + - lexer.nested_pair('/*', '*/'))) +local line_comment = lexer.to_eol('//', true) +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('lLdDfF')^-1)) +lex:add_rule('number', token(lexer.NUMBER, lexer.number * S('lLdDfF')^-1)) -- Preprocessors. -lex:add_rule('preprocessor', token(lexer.PREPROCESSOR, lexer.starts_line('#') * - lexer.nonnewline^0)) +lex:add_rule('preprocessor', token(lexer.PREPROCESSOR, + lexer.to_eol(lexer.starts_line('#')))) -- Operators. lex:add_rule('operator', token(lexer.OPERATOR, S('<>=!+-/*%&|^~@`.,:;()[]{}'))) |