standardize definition of lexer and lex, remove whitespace definition

Partially fixes: orbitalquark#76
mcepl · Jan 16, 2025 · 31de5ff · 31de5ff
1 parent 06f2108
commit 31de5ff
Show file tree

Hide file tree

Showing 88 changed files with 158 additions and 419 deletions.
diff --git a/lexers/actionscript.lua b/lexers/actionscript.lua
@@ -1,14 +1,11 @@
 -- Copyright 2006-2025 Mitchell. See LICENSE.
 -- Actionscript LPeg lexer.
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
-local lex = lexer.new('actionscript')
-
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
+local lex = lexer.new(...)
 
 -- Keywords.
 lex:add_rule('keyword', token(lexer.KEYWORD, word_match{

diff --git a/lexers/ada.lua b/lexers/ada.lua
@@ -1,14 +1,11 @@
 -- Copyright 2006-2025 Mitchell. See LICENSE.
 -- Ada LPeg lexer.
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
-local lex = lexer.new('ada')
-
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
+local lex = lexer.new(...)
 
 -- Keywords.
 lex:add_rule('keyword', token(lexer.KEYWORD, word_match({

diff --git a/lexers/antlr.lua b/lexers/antlr.lua
@@ -1,14 +1,11 @@
 -- Copyright 2006-2025 Mitchell. See LICENSE.
 -- ANTLR LPeg lexer.
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
-local lex = lexer.new('antlr')
-
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
+local lex = lexer.new(...)
 
 -- Keywords.
 lex:add_rule('keyword', token(lexer.KEYWORD, word_match{

diff --git a/lexers/apdl.lua b/lexers/apdl.lua
@@ -1,15 +1,12 @@
 -- Copyright 2006-2025 Mitchell. See LICENSE.
 -- APDL LPeg lexer.
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
 local lex = lexer.new('apdl', {case_insensitive_fold_points = true})
 
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
-
 -- Keywords.
 lex:add_rule('keyword', token(lexer.KEYWORD, word_match({
 	'*abbr', '*abb', '*afun', '*afu', '*ask', '*cfclos', '*cfc', '*cfopen', '*cfo', '*cfwrite',

diff --git a/lexers/apl.lua b/lexers/apl.lua
@@ -1,14 +1,11 @@
 -- Copyright 2015-2025 David B. Lamkins <[email protected]>. See LICENSE.
 -- APL LPeg lexer.
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
-local lex = lexer.new('apl')
-
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
+local lex = lexer.new(...)
 
 -- Comments.
 lex:add_rule('comment', token(lexer.COMMENT, lexer.to_eol(P('⍝') + '#')))

diff --git a/lexers/applescript.lua b/lexers/applescript.lua
@@ -1,14 +1,11 @@
 -- Copyright 2006-2025 Mitchell. See LICENSE.
 -- Applescript LPeg lexer.
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
-local lex = lexer.new('applescript')
-
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
+local lex = lexer.new(...)
 
 -- Keywords.
 lex:add_rule('keyword', token(lexer.KEYWORD, word_match({

diff --git a/lexers/batch.lua b/lexers/batch.lua
@@ -1,15 +1,12 @@
 -- Copyright 2006-2025 Mitchell. See LICENSE.
 -- Batch LPeg lexer.
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
 local lex = lexer.new('batch', {case_insensitive_fold_points = true})
 
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
-
 -- Keywords.
 lex:add_rule('keyword', token(lexer.KEYWORD, word_match({
 	'cd', 'chdir', 'md', 'mkdir', 'cls', 'for', 'if', 'echo', 'echo.', 'move', 'copy', 'ren', 'del',

diff --git a/lexers/boo.lua b/lexers/boo.lua
@@ -1,14 +1,11 @@
 -- Copyright 2006-2025 Mitchell. See LICENSE.
 -- Boo LPeg lexer.
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
-local lex = lexer.new('boo')
-
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
+local lex = lexer.new(...)
 
 -- Keywords.
 lex:add_rule('keyword', token(lexer.KEYWORD, word_match{

diff --git a/lexers/caml.lua b/lexers/caml.lua
@@ -1,14 +1,11 @@
 -- Copyright 2006-2025 Mitchell. See LICENSE.
 -- OCaml LPeg lexer.
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
-local lex = lexer.new('caml')
-
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
+local lex = lexer.new(...)
 
 -- Keywords.
 lex:add_rule('keyword', token(lexer.KEYWORD, word_match{

diff --git a/lexers/clojure.lua b/lexers/clojure.lua
@@ -2,14 +2,11 @@
 -- Clojure LPeg lexer.
 -- Contributed by Christos Chatzifountas.
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
-local lex = lexer.new('clojure')
-
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
+local lex = lexer.new(...)
 
 -- Keywords.
 lex:add_rule('keyword', token(lexer.KEYWORD, word_match{

diff --git a/lexers/coffeescript.lua b/lexers/coffeescript.lua
@@ -1,15 +1,12 @@
 -- Copyright 2006-2025 Mitchell. See LICENSE.
 -- CoffeeScript LPeg lexer.
 
-local lexer = require('lexer')
+local lexer = lexer
 local word_match = lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
 local lex = lexer.new('coffeescript', {fold_by_indentation = true})
 
--- Whitespace.
-lex:add_rule('whitespace', lex:tag(lexer.WHITESPACE, lexer.space^1))
-
 -- Keywords.
 lex:add_rule('keyword', lex:tag(lexer.KEYWORD, word_match{
 	'all', 'and', 'bind', 'break', 'by', 'case', 'catch', 'class', 'const', 'continue', 'default',

diff --git a/lexers/context.lua b/lexers/context.lua
@@ -1,19 +1,16 @@
 -- Copyright 2006-2025 Robert Gieseke, Lars Otter. See LICENSE.
 -- ConTeXt LPeg lexer.
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
-local lex = lexer.new('context')
+local lex = lexer.new(...)
 
 -- TeX and ConTeXt mkiv environment definitions.
 local beginend = (P('begin') + 'end')
 local startstop = (P('start') + 'stop')
 
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
-
 -- Comments.
 lex:add_rule('comment', token(lexer.COMMENT, lexer.to_eol('%')))
 

diff --git a/lexers/crystal.lua b/lexers/crystal.lua
@@ -2,14 +2,11 @@
 -- Copyright 2017 Michel Martens.
 -- Crystal LPeg lexer (based on Ruby).
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
-local lex = lexer.new('crystal')
-
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
+local lex = lexer.new(...)
 
 -- Keywords.
 lex:add_rule('keyword', token(lexer.KEYWORD, word_match{

diff --git a/lexers/csharp.lua b/lexers/csharp.lua
@@ -1,14 +1,11 @@
 -- Copyright 2006-2025 Mitchell. See LICENSE.
 -- C# LPeg lexer.
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
-local lex = lexer.new('csharp')
-
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
+local lex = lexer.new(...)
 
 -- Keywords.
 lex:add_rule('keyword', token(lexer.KEYWORD, word_match{

diff --git a/lexers/dart.lua b/lexers/dart.lua
@@ -2,14 +2,11 @@
 -- Dart LPeg lexer.
 -- Written by Brian Schott (@Hackerpilot on Github).
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
-local lex = lexer.new('dart')
-
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
+local lex = lexer.new(...)
 
 -- Keywords.
 lex:add_rule('keyword', token(lexer.KEYWORD, word_match{

diff --git a/lexers/dot.lua b/lexers/dot.lua
@@ -2,14 +2,11 @@
 -- Dot LPeg lexer.
 -- Based off of lexer code by Mitchell.
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
-local lex = lexer.new('dot')
-
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
+local lex = lexer.new(...)
 
 -- Keywords.
 lex:add_rule('keyword', token(lexer.KEYWORD, word_match{

diff --git a/lexers/eiffel.lua b/lexers/eiffel.lua
@@ -1,14 +1,11 @@
 -- Copyright 2006-2025 Mitchell. See LICENSE.
 -- Eiffel LPeg lexer.
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
-local lex = lexer.new('eiffel')
-
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
+local lex = lexer.new(...)
 
 -- Keywords.
 lex:add_rule('keyword', token(lexer.KEYWORD, word_match{

diff --git a/lexers/elixir.lua b/lexers/elixir.lua
@@ -2,15 +2,12 @@
 -- Contributed by Richard Philips.
 -- Elixir LPeg lexer.
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local B, P, S = lpeg.B, lpeg.P, lpeg.S
 
 local lex = lexer.new('elixir', {fold_by_indentation = true})
 
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
-
 -- Sigils.
 local sigil11 = '~' * S('CRSW') * lexer.range('<', '>')
 local sigil12 = '~' * S('CRSW') * lexer.range('{', '}')

diff --git a/lexers/elm.lua b/lexers/elm.lua
@@ -2,15 +2,12 @@
 -- Elm LPeg lexer
 -- Adapted from Haskell LPeg lexer by Karl Schultheisz.
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
 local lex = lexer.new('elm', {fold_by_indentation = true})
 
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
-
 -- Keywords.
 lex:add_rule('keyword', token(lexer.KEYWORD, word_match(
 	'if then else case of let in module import as exposing type alias port')))

diff --git a/lexers/erlang.lua b/lexers/erlang.lua
@@ -1,14 +1,11 @@
 -- Copyright 2006-2025 Mitchell. See LICENSE.
 -- Erlang LPeg lexer.
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
-local lex = lexer.new('erlang')
-
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
+local lex = lexer.new(...)
 
 -- Keywords.
 lex:add_rule('keyword', token(lexer.KEYWORD, word_match{

diff --git a/lexers/fantom.lua b/lexers/fantom.lua
@@ -2,15 +2,11 @@
 -- Fantom LPeg lexer.
 -- Based on Java LPeg lexer by Mitchell and Vim's Fantom syntax.
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
-local lex = lexer.new('fantom')
-
--- Whitespace.
-local ws = token(lexer.WHITESPACE, lexer.space^1)
-lex:add_rule('whitespace', ws)
+local lex = lexer.new(...)
 
 -- Classes.
 local type = token(lexer.TYPE, lexer.word)

diff --git a/lexers/faust.lua b/lexers/faust.lua
@@ -1,14 +1,11 @@
 -- Copyright 2015-2025 David B. Lamkins <[email protected]>. See LICENSE.
 -- Faust LPeg lexer, see http://faust.grame.fr/
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
-local lex = lexer.new('faust')
-
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
+local lex = lexer.new(...)
 
 -- Keywords.
 lex:add_rule('keyword', token(lexer.KEYWORD, word_match{

diff --git a/lexers/fennel.lua b/lexers/fennel.lua
@@ -2,15 +2,12 @@
 -- Fennel LPeg lexer.
 -- Contributed by Momohime Honda.
 
-local lexer = require('lexer')
+local lexer = lexer
 local token, word_match = lexer.token, lexer.word_match
 local P, S = lpeg.P, lpeg.S
 
 local lex = lexer.new('fennel', {inherit = lexer.load('lua')})
 
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
-
 -- Keywords.
 lex:modify_rule('keyword', token(lexer.KEYWORD, word_match{
 	'#', '%', '*', '+', '-', '->>', '->', '-?>>', '-?>', '..', '.', '//', '/', ':', '<=', '<', '=',