diff options
Diffstat (limited to 'lexlua/sql.lua')
| -rw-r--r-- | lexlua/sql.lua | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lexlua/sql.lua b/lexlua/sql.lua index b38e48501..f0049f552 100644 --- a/lexlua/sql.lua +++ b/lexlua/sql.lua @@ -41,17 +41,18 @@ lex:add_rule('keyword', token(lexer.KEYWORD, word_match([[ lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word)) -- Strings. -lex:add_rule('string', token(lexer.STRING, lexer.delimited_range("'") + - lexer.delimited_range('"') + - lexer.delimited_range('`'))) +local sq_str = lexer.range("'") +local dq_str = lexer.range('"') +local bq_str = lexer.range('`') +lex:add_rule('string', token(lexer.STRING, sq_str + dq_str + bq_str)) -- Comments. -local line_comment = (P('--') + '#') * lexer.nonnewline^0 -local block_comment = '/*' * (lexer.any - '*/')^0 * P('*/')^-1 +local line_comment = lexer.to_eol(P('--') + '#') +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(',()'))) |