diff options
Diffstat (limited to 'lexlua/wsf.lua')
| -rw-r--r-- | lexlua/wsf.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lexlua/wsf.lua b/lexlua/wsf.lua index 9c903349c..7e4736979 100644 --- a/lexlua/wsf.lua +++ b/lexlua/wsf.lua @@ -4,7 +4,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('wsf') @@ -15,7 +15,7 @@ lex:add_rule('whitespace', ws) -- Comments. lex:add_rule('comment', token(lexer.COMMENT, lexer.range('<!--', '-->'))) -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 @@ -54,7 +54,7 @@ lex:add_rule('string', string) -- 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[[ |