diff options
120 files changed, 154 insertions, 154 deletions
diff --git a/lexlua/actionscript.lua b/lexlua/actionscript.lua index 401ae77c0..3202a9a01 100644 --- a/lexlua/actionscript.lua +++ b/lexlua/actionscript.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('actionscript') diff --git a/lexlua/ada.lua b/lexlua/ada.lua index 3a4c385f4..09047df7c 100644 --- a/lexlua/ada.lua +++ b/lexlua/ada.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('ada') diff --git a/lexlua/ansi_c.lua b/lexlua/ansi_c.lua index b0c646b5c..b523f918b 100644 --- a/lexlua/ansi_c.lua +++ b/lexlua/ansi_c.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('ansi_c') @@ -25,7 +25,7 @@ lex:add_rule('type', token(lexer.TYPE, word_match[[ _Bool _Complex _Imaginary -- Stdlib types. ptrdiff_t size_t max_align_t wchar_t intptr_t uintptr_t intmax_t uintmax_t -]] + P('u')^-1 * 'int' * (P('_least') + '_fast')^-1 * R('09')^1 * '_t')) +]] + P('u')^-1 * 'int' * (P('_least') + '_fast')^-1 * lexer.digit^1 * '_t')) -- Constants. lex:add_rule('constants', token(lexer.CONSTANT, word_match[[ diff --git a/lexlua/antlr.lua b/lexlua/antlr.lua index 278122863..b9d10c2cc 100644 --- a/lexlua/antlr.lua +++ b/lexlua/antlr.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('antlr') diff --git a/lexlua/apdl.lua b/lexlua/apdl.lua index be70f2a5d..148913c6c 100644 --- a/lexlua/apdl.lua +++ b/lexlua/apdl.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('apdl', {case_insensitive_fold_points = true}) diff --git a/lexlua/apl.lua b/lexlua/apl.lua index ad0ec2d99..c7de3075f 100644 --- a/lexlua/apl.lua +++ b/lexlua/apl.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('apl') @@ -20,7 +20,7 @@ local dq_str = lexer.range('"') lex:add_rule('string', token(lexer.STRING, sq_str + dq_str)) -- Numbers. -local dig = R('09') +local dig = lexer.digit local rad = P('.') local exp = S('eE') local img = S('jJ') @@ -31,12 +31,12 @@ lex:add_rule('number', token(lexer.NUMBER, float * img * float + float)) -- Keywords. lex:add_rule('keyword', token(lexer.KEYWORD, P('⍞') + 'χ' + '⍺' + '⍶' + '⍵' + - '⍹' + '⎕' * R('AZ', 'az')^0)) + '⍹' + '⎕' * lexer.alpha^0)) -- Names. -local n1l = R('AZ', 'az') +local n1l = lexer.alpha local n1b = P('_') + '∆' + '⍙' -local n2l = n1l + R('09') +local n2l = n1l + lexer.digit local n2b = n1b + '¯' local n1 = n1l + n1b local n2 = n2l + n2b diff --git a/lexlua/applescript.lua b/lexlua/applescript.lua index cbdf95072..1daeb2ec1 100644 --- a/lexlua/applescript.lua +++ b/lexlua/applescript.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('applescript') diff --git a/lexlua/asm.lua b/lexlua/asm.lua index f2e80a3d0..7aca5a392 100644 --- a/lexlua/asm.lua +++ b/lexlua/asm.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('asm') @@ -345,7 +345,7 @@ local pp_word = word_match[[ ixdefine line local macro pathsearch pop push rep repl rmacro rotate stacksize strcat strlen substr undef unmacro use warning while xdefine ]] -local pp_symbol = '??' + S('!$+?') + '%' * -lexer.space + R('09')^1 +local pp_symbol = '??' + S('!$+?') + '%' * -lexer.space + lexer.digit^1 lex:add_rule('preproc', token(lexer.PREPROCESSOR, '%' * (pp_word + pp_symbol))) -- Operators. diff --git a/lexlua/asp.lua b/lexlua/asp.lua index 90ef15657..723cdabea 100644 --- a/lexlua/asp.lua +++ b/lexlua/asp.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local html = lexer.load('html') local lex = lexer.new('asp', {inherit = html}) -- proxy for HTML diff --git a/lexlua/autoit.lua b/lexlua/autoit.lua index 856657904..f2b64318d 100644 --- a/lexlua/autoit.lua +++ b/lexlua/autoit.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('autoit') diff --git a/lexlua/awk.lua b/lexlua/awk.lua index cfff1beaf..a1b4779eb 100644 --- a/lexlua/awk.lua +++ b/lexlua/awk.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('awk') diff --git a/lexlua/bash.lua b/lexlua/bash.lua index fb214bca8..ddf87e63c 100644 --- a/lexlua/bash.lua +++ b/lexlua/bash.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('bash') diff --git a/lexlua/batch.lua b/lexlua/batch.lua index 314f4cd3a..bed316271 100644 --- a/lexlua/batch.lua +++ b/lexlua/batch.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('batch', {case_insensitive_fold_points = true}) diff --git a/lexlua/bibtex.lua b/lexlua/bibtex.lua index edd1b659f..3cecf8084 100644 --- a/lexlua/bibtex.lua +++ b/lexlua/bibtex.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('bibtex') diff --git a/lexlua/boo.lua b/lexlua/boo.lua index 926351f04..c9b754b66 100644 --- a/lexlua/boo.lua +++ b/lexlua/boo.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('boo') diff --git a/lexlua/caml.lua b/lexlua/caml.lua index a65d5552a..a0d5dee68 100644 --- a/lexlua/caml.lua +++ b/lexlua/caml.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('caml') diff --git a/lexlua/chuck.lua b/lexlua/chuck.lua index 3726a1440..b71b4b37e 100644 --- a/lexlua/chuck.lua +++ b/lexlua/chuck.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('chuck') diff --git a/lexlua/cmake.lua b/lexlua/cmake.lua index 2c78d5d25..ea6d472bb 100644 --- a/lexlua/cmake.lua +++ b/lexlua/cmake.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('cmake') diff --git a/lexlua/context.lua b/lexlua/context.lua index 904354c55..7ff82f541 100644 --- a/lexlua/context.lua +++ b/lexlua/context.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('context') diff --git a/lexlua/cpp.lua b/lexlua/cpp.lua index 61d18454f..0f04061fe 100644 --- a/lexlua/cpp.lua +++ b/lexlua/cpp.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('cpp') diff --git a/lexlua/crystal.lua b/lexlua/crystal.lua index 797469b49..e40e6f888 100644 --- a/lexlua/crystal.lua +++ b/lexlua/crystal.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('crystal') diff --git a/lexlua/csharp.lua b/lexlua/csharp.lua index 3a63a20cf..eff79c533 100644 --- a/lexlua/csharp.lua +++ b/lexlua/csharp.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('csharp') diff --git a/lexlua/css.lua b/lexlua/css.lua index 07061e223..17d503aee 100644 --- a/lexlua/css.lua +++ b/lexlua/css.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('css') @@ -154,7 +154,7 @@ local unit = token('unit', word_match[[ vh vmax vmin vw ]]) lex:add_style('unit', lexer.styles.number) -lex:add_rule('number', token(lexer.NUMBER, lexer.digit^1) * unit^-1) +lex:add_rule('number', token(lexer.NUMBER, lexer.dec_num) * unit^-1) -- Operators. lex:add_rule('operator', token(lexer.OPERATOR, S('~!#*>+=|.,:;()[]{}'))) diff --git a/lexlua/cuda.lua b/lexlua/cuda.lua index 061a1f698..f2810edf2 100644 --- a/lexlua/cuda.lua +++ b/lexlua/cuda.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('cuda', {inherit = lexer.load('cpp')}) diff --git a/lexlua/dart.lua b/lexlua/dart.lua index 74690feca..6ca08208e 100644 --- a/lexlua/dart.lua +++ b/lexlua/dart.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('dart') diff --git a/lexlua/desktop.lua b/lexlua/desktop.lua index 32716bd61..0adcf259b 100644 --- a/lexlua/desktop.lua +++ b/lexlua/desktop.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('desktop') diff --git a/lexlua/diff.lua b/lexlua/diff.lua index c5c6b8738..676865f08 100644 --- a/lexlua/diff.lua +++ b/lexlua/diff.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('diff', {lex_by_line = true}) @@ -16,7 +16,7 @@ lex:add_rule('header', token('header', (P('*** ') + '--- ' + '+++ ') * lex:add_style('header', lexer.styles.comment) -- Location. -lex:add_rule('location', token(lexer.NUMBER, ('@@' + lexer.digit^1 + '****') * +lex:add_rule('location', token(lexer.NUMBER, ('@@' + lexer.dec_num + '****') * lexer.any^1)) -- Additions, deletions, and changes. diff --git a/lexlua/django.lua b/lexlua/django.lua index e311825ef..c914f9aa7 100644 --- a/lexlua/django.lua +++ b/lexlua/django.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('django') diff --git a/lexlua/dmd.lua b/lexlua/dmd.lua index 968b01e6c..f04eeb271 100644 --- a/lexlua/dmd.lua +++ b/lexlua/dmd.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local M = {_NAME = 'dmd'} diff --git a/lexlua/dockerfile.lua b/lexlua/dockerfile.lua index 6aeef3a06..8d9c17791 100644 --- a/lexlua/dockerfile.lua +++ b/lexlua/dockerfile.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('dockerfile', {fold_by_indentation = true}) diff --git a/lexlua/dot.lua b/lexlua/dot.lua index 906ce6b48..6b298b47a 100644 --- a/lexlua/dot.lua +++ b/lexlua/dot.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('dot') @@ -42,7 +42,7 @@ 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.digit^1 + lexer.float)) +lex:add_rule('number', token(lexer.NUMBER, lexer.dec_num + lexer.float)) -- Operators. lex:add_rule('operator', token(lexer.OPERATOR, S('->()[]{};'))) diff --git a/lexlua/eiffel.lua b/lexlua/eiffel.lua index 7dda50bad..7dc95fecd 100644 --- a/lexlua/eiffel.lua +++ b/lexlua/eiffel.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('eiffel') diff --git a/lexlua/elixir.lua b/lexlua/elixir.lua index 18c62aaa9..6dc0bfff4 100644 --- a/lexlua/elixir.lua +++ b/lexlua/elixir.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local B, P, R, S = lpeg.B, lpeg.P, lpeg.R, lpeg.S +local B, P, S, R = lpeg.B, lpeg.P, lpeg.S, lpeg.R local lex = lexer.new('elixir', {fold_by_indentation = true}) diff --git a/lexlua/erlang.lua b/lexlua/erlang.lua index f0b8d9f6e..df5448866 100644 --- a/lexlua/erlang.lua +++ b/lexlua/erlang.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('erlang') diff --git a/lexlua/faust.lua b/lexlua/faust.lua index 2e579dfd8..ab61a06be 100644 --- a/lexlua/faust.lua +++ b/lexlua/faust.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('faust') @@ -29,7 +29,7 @@ local block_comment = lexer.range('/*', '*/') lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment)) -- Numbers. -local int = R('09')^1 +local int = lexer.digit^1 local rad = P('.') local exp = (P('e') * S('+-')^-1 * int)^-1 local flt = int * (rad * int)^-1 * exp + int^-1 * rad * int * exp diff --git a/lexlua/fish.lua b/lexlua/fish.lua index 3cbd41c21..f75dee112 100644 --- a/lexlua/fish.lua +++ b/lexlua/fish.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('fish') diff --git a/lexlua/forth.lua b/lexlua/forth.lua index 7f1d92ace..c657acbfe 100644 --- a/lexlua/forth.lua +++ b/lexlua/forth.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('forth') diff --git a/lexlua/fortran.lua b/lexlua/fortran.lua index e07068833..c18197f74 100644 --- a/lexlua/fortran.lua +++ b/lexlua/fortran.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('fortran') diff --git a/lexlua/fsharp.lua b/lexlua/fsharp.lua index b80bf37e4..f3f3877de 100644 --- a/lexlua/fsharp.lua +++ b/lexlua/fsharp.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('fsharp', {fold_by_indentation = true}) diff --git a/lexlua/gap.lua b/lexlua/gap.lua index 15cbc75dd..779a93e73 100644 --- a/lexlua/gap.lua +++ b/lexlua/gap.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('gap') @@ -28,7 +28,7 @@ lex:add_rule('string', token(lexer.STRING, sq_str + dq_str)) lex:add_rule('comment', token(lexer.COMMENT, lexer.to_eol('#'))) -- Numbers. -lex:add_rule('number', token(lexer.NUMBER, lexer.digit^1 * -lexer.alpha)) +lex:add_rule('number', token(lexer.NUMBER, lexer.dec_num * -lexer.alpha)) -- Operators. lex:add_rule('operator', token(lexer.OPERATOR, S('*+-,./:;<=>~^#()[]{}'))) diff --git a/lexlua/gettext.lua b/lexlua/gettext.lua index 3c06487b3..d90465661 100644 --- a/lexlua/gettext.lua +++ b/lexlua/gettext.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('gettext') diff --git a/lexlua/gherkin.lua b/lexlua/gherkin.lua index 66882bdaa..1c06f6e26 100644 --- a/lexlua/gherkin.lua +++ b/lexlua/gherkin.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('gherkin', {fold_by_indentation = true}) diff --git a/lexlua/glsl.lua b/lexlua/glsl.lua index d6bef2b44..0350b4c69 100644 --- a/lexlua/glsl.lua +++ b/lexlua/glsl.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S, R = lpeg.P, lpeg.S, lpeg.R local lex = lexer.new('glsl', {inherit = lexer.load('cpp')}) diff --git a/lexlua/gnuplot.lua b/lexlua/gnuplot.lua index ca9ca5bad..4704c09a8 100644 --- a/lexlua/gnuplot.lua +++ b/lexlua/gnuplot.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('gnuplot') diff --git a/lexlua/go.lua b/lexlua/go.lua index 397908a0a..95b8caa16 100644 --- a/lexlua/go.lua +++ b/lexlua/go.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('go') diff --git a/lexlua/groovy.lua b/lexlua/groovy.lua index 07e0586a0..ed0caeb54 100644 --- a/lexlua/groovy.lua +++ b/lexlua/groovy.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('groovy') diff --git a/lexlua/gtkrc.lua b/lexlua/gtkrc.lua index 477fa9d65..59baa37fd 100644 --- a/lexlua/gtkrc.lua +++ b/lexlua/gtkrc.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('gtkrc') diff --git a/lexlua/haskell.lua b/lexlua/haskell.lua index 2b36473a3..ec968cf37 100644 --- a/lexlua/haskell.lua +++ b/lexlua/haskell.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('haskell', {fold_by_indentation = true}) diff --git a/lexlua/html.lua b/lexlua/html.lua index 416fc69cd..c43f336a6 100644 --- a/lexlua/html.lua +++ b/lexlua/html.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('html') @@ -87,7 +87,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', '&' * (lexer.any - lexer.space - ';')^1 * diff --git a/lexlua/icon.lua b/lexlua/icon.lua index 3a8a75316..46abf8833 100644 --- a/lexlua/icon.lua +++ b/lexlua/icon.lua @@ -5,7 +5,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('icon') diff --git a/lexlua/idl.lua b/lexlua/idl.lua index 83fb65a8c..cfc16d29c 100644 --- a/lexlua/idl.lua +++ b/lexlua/idl.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('idl') diff --git a/lexlua/inform.lua b/lexlua/inform.lua index dc702cbc6..e8257a681 100644 --- a/lexlua/inform.lua +++ b/lexlua/inform.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('inform') diff --git a/lexlua/ini.lua b/lexlua/ini.lua index d56539d42..f6bc4b097 100644 --- a/lexlua/ini.lua +++ b/lexlua/ini.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('ini') diff --git a/lexlua/io_lang.lua b/lexlua/io_lang.lua index 573bd7ca8..c98b1acd3 100644 --- a/lexlua/io_lang.lua +++ b/lexlua/io_lang.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('io_lang') diff --git a/lexlua/java.lua b/lexlua/java.lua index 547cb5d0a..85466fe35 100644 --- a/lexlua/java.lua +++ b/lexlua/java.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('java') diff --git a/lexlua/javascript.lua b/lexlua/javascript.lua index a2733a1cb..92ad67ede 100644 --- a/lexlua/javascript.lua +++ b/lexlua/javascript.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('javascript') diff --git a/lexlua/json.lua b/lexlua/json.lua index c6feb3a60..eaddb0d56 100644 --- a/lexlua/json.lua +++ b/lexlua/json.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('json') @@ -25,7 +25,7 @@ local block_comment = lexer.range('/*', '*/') lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment)) -- Numbers. -local integer = S('+-')^-1 * lexer.digit^1 * S('Ll')^-1 +local integer = S('+-')^-1 * lexer.dec_num * S('Ll')^-1 lex:add_rule('number', token(lexer.NUMBER, lexer.float + integer)) -- Operators. diff --git a/lexlua/jsp.lua b/lexlua/jsp.lua index d3f2eaaa2..31af239a1 100644 --- a/lexlua/jsp.lua +++ b/lexlua/jsp.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('jsp', {inherit = lexer.load('html')}) diff --git a/lexlua/latex.lua b/lexlua/latex.lua index 3f18601f6..b82af0fac 100644 --- a/lexlua/latex.lua +++ b/lexlua/latex.lua @@ -5,7 +5,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('latex') diff --git a/lexlua/ledger.lua b/lexlua/ledger.lua index b6751ec27..c6a72e438 100644 --- a/lexlua/ledger.lua +++ b/lexlua/ledger.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('ledger', {lex_by_line = true}) diff --git a/lexlua/lexer.lua b/lexlua/lexer.lua index f65fc15d4..72952c774 100644 --- a/lexlua/lexer.lua +++ b/lexlua/lexer.lua @@ -70,7 +70,7 @@ local M = {} -- -- local lexer = require('lexer') -- local token, word_match = lexer.token, lexer.word_match --- local P, R, S = lpeg.P, lpeg.R, lpeg.S +-- local P, S = lpeg.P, lpeg.S -- -- local lex = lexer.new('?') -- @@ -661,7 +661,7 @@ local M = {} -- -- local lexer = require('lexer') -- local token, word_match = lexer.token, lexer.word_match --- local P, R, S = lpeg.P, lpeg.R, lpeg.S +-- local P, S = lpeg.P, lpeg.S -- -- local lex = lexer.new('legacy') -- diff --git a/lexlua/lilypond.lua b/lexlua/lilypond.lua index 645a64fbc..ec9264778 100644 --- a/lexlua/lilypond.lua +++ b/lexlua/lilypond.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('lilypond') diff --git a/lexlua/lisp.lua b/lexlua/lisp.lua index 38c432130..7c2cda738 100644 --- a/lexlua/lisp.lua +++ b/lexlua/lisp.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('lisp') diff --git a/lexlua/logtalk.lua b/lexlua/logtalk.lua index 245af99fd..522a147c7 100644 --- a/lexlua/logtalk.lua +++ b/lexlua/logtalk.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('logtalk', {inherit = lexer.load('prolog')}) diff --git a/lexlua/lua.lua b/lexlua/lua.lua index 74d6ef653..6a42a032c 100644 --- a/lexlua/lua.lua +++ b/lexlua/lua.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('lua') diff --git a/lexlua/makefile.lua b/lexlua/makefile.lua index 3c9b41af2..663708372 100644 --- a/lexlua/makefile.lua +++ b/lexlua/makefile.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('makefile', {lex_by_line = true}) diff --git a/lexlua/man.lua b/lexlua/man.lua index 3a875f6b9..967460af1 100644 --- a/lexlua/man.lua +++ b/lexlua/man.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('man') diff --git a/lexlua/markdown.lua b/lexlua/markdown.lua index e49826e5a..9eb38a9d9 100644 --- a/lexlua/markdown.lua +++ b/lexlua/markdown.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('markdown') @@ -27,7 +27,7 @@ lex:add_rule('blockquote', token(lexer.STRING, end))) lex:add_rule('list', token('list', - lexer.starts_line(S(' \t')^0 * (S('*+-') + R('09')^1 * '.')) * S(' \t'))) + lexer.starts_line(S(' \t')^0 * (S('*+-') + lexer.digit^1 * '.')) * S(' \t'))) lex:add_style('list', lexer.styles.constant) local hspace = S('\t\v\f\r ') diff --git a/lexlua/matlab.lua b/lexlua/matlab.lua index 7800a421c..27a51b0b2 100644 --- a/lexlua/matlab.lua +++ b/lexlua/matlab.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('matlab') diff --git a/lexlua/mediawiki.lua b/lexlua/mediawiki.lua index 3b4548d2c..8a72b7215 100644 --- a/lexlua/mediawiki.lua +++ b/lexlua/mediawiki.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S, B = lpeg.P, lpeg.R, lpeg.S, lpeg.B +local P, S, B = lpeg.P, lpeg.S, lpeg.B local lex = lexer.new('mediawiki') diff --git a/lexlua/moonscript.lua b/lexlua/moonscript.lua index c7c19834c..161736df0 100644 --- a/lexlua/moonscript.lua +++ b/lexlua/moonscript.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, S, R = lpeg.P, lpeg.S, lpeg.R +local P, S = lpeg.P, lpeg.S local lex = lexer.new('moonscript', {fold_by_indentation = true}) @@ -103,7 +103,7 @@ lex:add_style('library', lexer.styles.type) -- Identifiers. local identifier = token(lexer.IDENTIFIER, lexer.word) -local proper_ident = token('proper_ident', R('AZ') * lexer.word) +local proper_ident = token('proper_ident', lexer.upper * lexer.word) local tbl_key = token('tbl_key', lexer.word * ':' + ':' * lexer.word ) lex:add_rule('identifier', tbl_key + proper_ident + identifier) lex:add_style('proper_ident', lexer.styles.class) diff --git a/lexlua/myrddin.lua b/lexlua/myrddin.lua index 1277468c4..0807512e8 100644 --- a/lexlua/myrddin.lua +++ b/lexlua/myrddin.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('myrddin') @@ -37,9 +37,9 @@ lex:add_rule('string', token(lexer.STRING, sq_str + dq_str)) -- Numbers. local digit = lexer.digit + '_' -local bdigit = R'01' + '_' +local bdigit = S'01' + '_' local xdigit = lexer.xdigit + '_' -local odigit = R'07' + '_' +local odigit = lpeg.R'07' + '_' local integer = '0x' * xdigit^1 + '0o' * odigit^1 + '0b' * bdigit^1 + digit^1 local float = digit^1 * ( ('.' * digit^1) * (S'eE' * S'+-'^-1 * digit^1)^-1 + diff --git a/lexlua/nemerle.lua b/lexlua/nemerle.lua index 196d0f028..03d3db3a2 100644 --- a/lexlua/nemerle.lua +++ b/lexlua/nemerle.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('nemerle') diff --git a/lexlua/nim.lua b/lexlua/nim.lua index 8840aa8fc..a7220851e 100644 --- a/lexlua/nim.lua +++ b/lexlua/nim.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('nim', {fold_by_indentation = true}) @@ -85,7 +85,7 @@ lex:add_rule('comment', token(lexer.COMMENT, lexer.to_eol('#', true))) local dec = lexer.digit^1 * ('_' * lexer.digit^1)^0 local hex = '0' * S('xX') * lexer.xdigit^1 * ('_' * lexer.xdigit^1)^0 local bin = '0' * S('bB') * S('01')^1 * ('_' * S('01')^1)^0 -local oct = '0o' * R('07')^1 +local oct = '0o' * lpeg.R('07')^1 local integer = S('+-')^-1 * (bin + hex + oct + dec) * ("'" * S('iIuUfF') * (P('8') + '16' + '32' + '64'))^-1 local float = lexer.digit^1 * ('_' * lexer.digit^1)^0 * diff --git a/lexlua/nsis.lua b/lexlua/nsis.lua index 39be082d3..4f99ab07a 100644 --- a/lexlua/nsis.lua +++ b/lexlua/nsis.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('nsis') diff --git a/lexlua/objective_c.lua b/lexlua/objective_c.lua index 348b2a9b8..026d83f0a 100644 --- a/lexlua/objective_c.lua +++ b/lexlua/objective_c.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('objective_c') diff --git a/lexlua/pascal.lua b/lexlua/pascal.lua index 05cb3b5c0..c76a4c471 100644 --- a/lexlua/pascal.lua +++ b/lexlua/pascal.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('pascal') diff --git a/lexlua/perl.lua b/lexlua/perl.lua index 819b2a1a3..8021f3ea4 100644 --- a/lexlua/perl.lua +++ b/lexlua/perl.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('perl') diff --git a/lexlua/php.lua b/lexlua/php.lua index 05589d649..07886f950 100644 --- a/lexlua/php.lua +++ b/lexlua/php.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('php') @@ -21,8 +21,8 @@ lex:add_rule('keyword', token(lexer.KEYWORD, word_match[[ __class__ __file__ __function__ __line__ __sleep __wakeup ]])) -local word = (lexer.alpha + '_' + R('\127\255')) * - (lexer.alnum + '_' + R('\127\255'))^0 +local word = (lexer.alpha + '_' + lpeg.R('\127\255')) * + (lexer.alnum + '_' + lpeg.R('\127\255'))^0 -- Identifiers. lex:add_rule('identifier', token(lexer.IDENTIFIER, word)) diff --git a/lexlua/pico8.lua b/lexlua/pico8.lua index dd398f862..b4ae876c6 100644 --- a/lexlua/pico8.lua +++ b/lexlua/pico8.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('pico8') diff --git a/lexlua/pike.lua b/lexlua/pike.lua index 3dff044ac..f0667d6ed 100644 --- a/lexlua/pike.lua +++ b/lexlua/pike.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('pike') diff --git a/lexlua/pkgbuild.lua b/lexlua/pkgbuild.lua index 7916487c3..88c25d76b 100644 --- a/lexlua/pkgbuild.lua +++ b/lexlua/pkgbuild.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('pkgbuild') @@ -64,7 +64,7 @@ local parens = lexer.range('(', ')', true) local brackets = lexer.range('[', ']', true) local braces = lexer.range('{', '}', true) local backticks = lexer.range('`', true, false) -local number = lexer.digit^1 +local number = lexer.dec_num lex:add_rule('variable', token(lexer.VARIABLE, '$' * (symbol + parens + brackets + braces + backticks + number + lexer.word))) diff --git a/lexlua/powershell.lua b/lexlua/powershell.lua index d69f8f328..a9666fb42 100644 --- a/lexlua/powershell.lua +++ b/lexlua/powershell.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('powershell') diff --git a/lexlua/prolog.lua b/lexlua/prolog.lua index d12b5709c..f98489780 100644 --- a/lexlua/prolog.lua +++ b/lexlua/prolog.lua @@ -26,7 +26,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S, B, V, C = lpeg.P, lpeg.R, lpeg.S, lpeg.B, lpeg.V, lpeg.C +local P, S, B, V, C = lpeg.P, lpeg.S, lpeg.B, lpeg.V, lpeg.C local lex = lexer.new('prolog') diff --git a/lexlua/props.lua b/lexlua/props.lua index f249fe6c4..240ace78f 100644 --- a/lexlua/props.lua +++ b/lexlua/props.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('props', {lex_by_line = true}) diff --git a/lexlua/protobuf.lua b/lexlua/protobuf.lua index 71284dbdf..1d3533297 100644 --- a/lexlua/protobuf.lua +++ b/lexlua/protobuf.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('protobuf') diff --git a/lexlua/ps.lua b/lexlua/ps.lua index 8ebde45fd..8c4cbf794 100644 --- a/lexlua/ps.lua +++ b/lexlua/ps.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('ps') diff --git a/lexlua/pure.lua b/lexlua/pure.lua index 5e8f04aa9..6905f4d5d 100644 --- a/lexlua/pure.lua +++ b/lexlua/pure.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('pure') @@ -28,8 +28,8 @@ lex:add_rule('keyword', token(lexer.KEYWORD, word_match[[ -- Numbers. local bin = '0' * S('Bb') * S('01')^1 -local hex = '0' * S('Xx') * (R('09') + R('af') + R('AF'))^1 -local dec = R('09')^1 +local hex = lexer.hex_num +local dec = lexer.dec_num local int = (bin + hex + dec) * P('L')^-1 local rad = P('.') - '..' local exp = (S('Ee') * S('+-')^-1 * int)^-1 diff --git a/lexlua/python.lua b/lexlua/python.lua index 4786e7a44..629f61f7a 100644 --- a/lexlua/python.lua +++ b/lexlua/python.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('python', {fold_by_indentation = true}) @@ -86,9 +86,9 @@ lex:add_rule('string', token(lexer.STRING, tq_str + sq_str + dq_str + raw_sq_str + raw_dq_str)) -- Numbers. -local dec = lexer.digit^1 * S('Ll')^-1 +local dec = lexer.dec_num * S('Ll')^-1 local bin = '0b' * S('01')^1 * ('_' * S('01')^1)^0 -local oct = '0' * R('07')^1 * S('Ll')^-1 +local oct = lexer.oct_num * S('Ll')^-1 local integer = S('+-')^-1 * (bin + lexer.hex_num + oct + dec) lex:add_rule('number', token(lexer.NUMBER, lexer.float + integer)) diff --git a/lexlua/rails.lua b/lexlua/rails.lua index 4b3e76948..4837b8afb 100644 --- a/lexlua/rails.lua +++ b/lexlua/rails.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('rails', {inherit = lexer.load('ruby')}) diff --git a/lexlua/rc.lua b/lexlua/rc.lua index 3639cc556..749911a6e 100644 --- a/lexlua/rc.lua +++ b/lexlua/rc.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('rc') diff --git a/lexlua/rebol.lua b/lexlua/rebol.lua index 5994a4cd5..dcf71dfbb 100644 --- a/lexlua/rebol.lua +++ b/lexlua/rebol.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('rebol') diff --git a/lexlua/rest.lua b/lexlua/rest.lua index a4060a8bb..5b064f365 100644 --- a/lexlua/rest.lua +++ b/lexlua/rest.lua @@ -3,7 +3,7 @@ local l = require('lexer') local token, word_match, starts_line = l.token, l.word_match, l.starts_line -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local M = {_NAME = 'rest'} diff --git a/lexlua/rexx.lua b/lexlua/rexx.lua index e33a613fc..97036b8aa 100644 --- a/lexlua/rexx.lua +++ b/lexlua/rexx.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('rexx') diff --git a/lexlua/rhtml.lua b/lexlua/rhtml.lua index b3bedbfcb..9c2a96409 100644 --- a/lexlua/rhtml.lua +++ b/lexlua/rhtml.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('rhtml', {inherit = lexer.load('html')}) diff --git a/lexlua/rstats.lua b/lexlua/rstats.lua index d499dc500..7a1ffc83c 100644 --- a/lexlua/rstats.lua +++ b/lexlua/rstats.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('rstats') diff --git a/lexlua/ruby.lua b/lexlua/ruby.lua index c05747c75..cdfed8ae3 100644 --- a/lexlua/ruby.lua +++ b/lexlua/ruby.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('ruby') diff --git a/lexlua/rust.lua b/lexlua/rust.lua index 427b12d04..af1184e12 100644 --- a/lexlua/rust.lua +++ b/lexlua/rust.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 C, Cmt = lpeg.C, lpeg.Cmt local lex = lexer.new('rust') @@ -48,7 +48,7 @@ local function prefixed_integer(prefix, digit) end local integer = ( prefixed_integer('0b', S('01')) + - prefixed_integer('0o', R('07')) + + prefixed_integer('0o', lpeg.R('07')) + prefixed_integer('0x', lexer.xdigit) + decimal_literal ) * (S('iu') * (P('8') + '16' + '32' + '64' + '128' + 'size'))^-1 diff --git a/lexlua/scala.lua b/lexlua/scala.lua index f2959396f..e389f80ff 100644 --- a/lexlua/scala.lua +++ b/lexlua/scala.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('scala') diff --git a/lexlua/scheme.lua b/lexlua/scheme.lua index a03e82d61..3c60b017d 100644 --- a/lexlua/scheme.lua +++ b/lexlua/scheme.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('scheme') diff --git a/lexlua/smalltalk.lua b/lexlua/smalltalk.lua index 0acad115f..05c1ebc39 100644 --- a/lexlua/smalltalk.lua +++ b/lexlua/smalltalk.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('smalltalk') diff --git a/lexlua/snobol4.lua b/lexlua/snobol4.lua index 1723a127f..f3055e212 100644 --- a/lexlua/snobol4.lua +++ b/lexlua/snobol4.lua @@ -4,7 +4,7 @@ local lexer = require 'lexer' local token, word_match = lexer.token, lexer.word_match -local B, P, R, S, V = lpeg.B, lpeg.P, lpeg.R, lpeg.S, lpeg.V +local B, P, S, V = lpeg.B, lpeg.P, lpeg.S, lpeg.V local M = { _NAME = 'snobol4' } diff --git a/lexlua/sql.lua b/lexlua/sql.lua index f0049f552..de9370f33 100644 --- a/lexlua/sql.lua +++ b/lexlua/sql.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('sql') diff --git a/lexlua/taskpaper.lua b/lexlua/taskpaper.lua index a7a390c68..eaef5eac7 100644 --- a/lexlua/taskpaper.lua +++ b/lexlua/taskpaper.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token = lexer.token -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local M = {_NAME = 'taskpaper'} @@ -20,7 +20,7 @@ local overdue_tag = token('overdue_tag', P('@overdue')) local plain_tag = token('plain_tag', P('@') * lexer.word) local extended_tag = token('extended_tag', P('@') * lexer.word * P('(') * - (lexer.word + R('09') + P('-'))^1 * P(')')) + (lexer.word + lexer.digit + P('-'))^1 * P(')')) -- Projects local project = token('project', lexer.range(lexer.starts_line(lexer.alnum), diff --git a/lexlua/tcl.lua b/lexlua/tcl.lua index 0f0a0d80a..4f8a7eb64 100644 --- a/lexlua/tcl.lua +++ b/lexlua/tcl.lua @@ -5,7 +5,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('tcl') diff --git a/lexlua/template.txt b/lexlua/template.txt index a4dda44c4..d12f41c66 100644 --- a/lexlua/template.txt +++ b/lexlua/template.txt @@ -2,7 +2,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('?') diff --git a/lexlua/tex.lua b/lexlua/tex.lua index d54d3c931..5dfb9ea0e 100644 --- a/lexlua/tex.lua +++ b/lexlua/tex.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('tex') diff --git a/lexlua/texinfo.lua b/lexlua/texinfo.lua index f7479fa5d..413597adc 100644 --- a/lexlua/texinfo.lua +++ b/lexlua/texinfo.lua @@ -27,7 +27,7 @@ folding, useful with large documents. local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('texinfo') diff --git a/lexlua/toml.lua b/lexlua/toml.lua index 0c659b549..5e9f38e4a 100644 --- a/lexlua/toml.lua +++ b/lexlua/toml.lua @@ -3,7 +3,7 @@ local lexer = require("lexer") local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('toml', {fold_by_indentation = true}) diff --git a/lexlua/txt2tags.lua b/lexlua/txt2tags.lua index 06b407928..dd2b7c3c5 100644 --- a/lexlua/txt2tags.lua +++ b/lexlua/txt2tags.lua @@ -5,7 +5,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local nonspace = lexer.any - lexer.space local lex = lexer.new('txt2tags') @@ -14,7 +14,7 @@ local lex = lexer.new('txt2tags') local ws = token(lexer.WHITESPACE, (lexer.space - lexer.newline)^1) -- Titles -local alphanumeric = R('AZ') + R('az') + R('09') + P('_') + P('-') +local alphanumeric = lexer.alnum + S('_-') local header_label = token('header_label_start', '[') * token('header_label', alphanumeric^1) * token('header_label_end', ']') local function h(level) diff --git a/lexlua/vala.lua b/lexlua/vala.lua index 3a2b16fbf..ca2fd579e 100644 --- a/lexlua/vala.lua +++ b/lexlua/vala.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('vala') diff --git a/lexlua/vb.lua b/lexlua/vb.lua index f85f8f875..00bf95b18 100644 --- a/lexlua/vb.lua +++ b/lexlua/vb.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('vb') diff --git a/lexlua/vbscript.lua b/lexlua/vbscript.lua index 0bf2c0e12..d5b2c8b1c 100644 --- a/lexlua/vbscript.lua +++ b/lexlua/vbscript.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('vbscript') diff --git a/lexlua/vcard.lua b/lexlua/vcard.lua index 0ea39b284..16076108d 100644 --- a/lexlua/vcard.lua +++ b/lexlua/vcard.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local M = {_NAME = 'vcard'} diff --git a/lexlua/verilog.lua b/lexlua/verilog.lua index e3b5bf454..c9fba0bd8 100644 --- a/lexlua/verilog.lua +++ b/lexlua/verilog.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('verilog') diff --git a/lexlua/vhdl.lua b/lexlua/vhdl.lua index 7570de7f5..18d3e917f 100644 --- a/lexlua/vhdl.lua +++ b/lexlua/vhdl.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('vhdl') 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[[ 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('<![CDATA[', ']]>'))) 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[[ diff --git a/lexlua/xtend.lua b/lexlua/xtend.lua index f0d3a56b1..f9a910f7d 100644 --- a/lexlua/xtend.lua +++ b/lexlua/xtend.lua @@ -3,7 +3,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local lex = lexer.new('xtend') diff --git a/lexlua/yaml.lua b/lexlua/yaml.lua index fd70182fc..b427382b9 100644 --- a/lexlua/yaml.lua +++ b/lexlua/yaml.lua @@ -4,7 +4,7 @@ local lexer = require('lexer') local token, word_match = lexer.token, lexer.word_match -local P, R, S = lpeg.P, lpeg.R, lpeg.S +local P, S = lpeg.P, lpeg.S local M = {_NAME = 'yaml'} @@ -22,7 +22,7 @@ local dq_str = lexer.range('"') local string = token(lexer.STRING, sq_str + dq_str) -- Numbers. -local integer = lexer.dec_num + lexer.hex_num + '0' * S('oO') * R('07')^1 +local integer = lexer.dec_num + lexer.hex_num + '0' * S('oO') * lpeg.R('07')^1 local special_num = '.' * word_match({'inf', 'nan'}, nil, true) local number = token(lexer.NUMBER, special_num + lexer.float + integer) |