aboutsummaryrefslogtreecommitdiffhomepage
path: root/lexlua/protobuf.lua
diff options
context:
space:
mode:
Diffstat (limited to 'lexlua/protobuf.lua')
-rw-r--r--lexlua/protobuf.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/lexlua/protobuf.lua b/lexlua/protobuf.lua
index c90778407..71284dbdf 100644
--- a/lexlua/protobuf.lua
+++ b/lexlua/protobuf.lua
@@ -24,20 +24,20 @@ lex:add_rule('type', token(lexer.TYPE, word_match[[
]]))
-- Strings.
-local sq_str = P('L')^-1 * lexer.delimited_range("'", true)
-local dq_str = P('L')^-1 * lexer.delimited_range('"', true)
+local sq_str = P('L')^-1 * lexer.range("'", true)
+local dq_str = P('L')^-1 * lexer.range('"', true)
lex:add_rule('string', token(lexer.STRING, sq_str + dq_str))
-- Identifiers.
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))
-- 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('<>=|;,.()[]{}')))