From a4a5a6907acf6361618a8aa723a4bacc489f270a Mon Sep 17 00:00:00 2001 From: mitchell Date: Tue, 14 Jul 2020 10:09:33 -0400 Subject: lexlua: Minor pattern refactoring. --- lexlua/xml.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lexlua/xml.lua') diff --git a/lexlua/xml.lua b/lexlua/xml.lua index 5b1e58128..6bb3679c2 100644 --- a/lexlua/xml.lua +++ b/lexlua/xml.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S, V = lpeg.P, lpeg.R, lpeg.S, lpeg.V +local P, S, V = lpeg.P, lpeg.S, lpeg.V local lex = lexer.new('xml') @@ -16,7 +16,7 @@ lex:add_rule('comment', token(lexer.COMMENT, lexer.range(''))) lex:add_rule('cdata', token('cdata', lexer.range(''))) lex:add_style('cdata', lexer.styles.comment) -local alpha = R('az', 'AZ', '\127\255') +local alpha = lpeg.R('az', 'AZ', '\127\255') local word_char = lexer.alnum + S('_-:.??') local identifier = (alpha + S('_-:.?')) * word_char^0 @@ -66,7 +66,7 @@ lex:add_rule('string', #S('\'"') * lexer.last_char_includes('=') * -- Numbers. lex:add_rule('number', #lexer.digit * lexer.last_char_includes('=') * - token(lexer.NUMBER, lexer.digit^1 * P('%')^-1))--*in_tag) + token(lexer.NUMBER, lexer.dec_num * P('%')^-1))--*in_tag) -- Entities. lex:add_rule('entity', token('entity', '&' * word_match[[ -- cgit v1.2.3