Update APL lexer to cope with current Dyalog APL

* Names can start with underscore * Missing APL primitive ops: ⍥@⌺⌶⍢ * Missing APL primitive funcs: ⊆⍸
alecthomas · Aug 19, 2021 · 2eba3ce · 2eba3ce
1 parent b71f4c6
commit 2eba3ce
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lexers/a/apl.go b/lexers/a/apl.go
@@ -26,10 +26,10 @@ func aplRules() Rules {
 			{`[⋄◇()]`, Punctuation, nil},
 			{`[\[\];]`, LiteralStringRegex, nil},
 			{`⎕[A-Za-zΔ∆⍙][A-Za-zΔ∆⍙_¯0-9]*`, NameFunction, nil},
-			{`[A-Za-zΔ∆⍙][A-Za-zΔ∆⍙_¯0-9]*`, NameVariable, nil},
+			{`[A-Za-zΔ∆⍙_][A-Za-zΔ∆⍙_¯0-9]*`, NameVariable, nil},
 			{`¯?(0[Xx][0-9A-Fa-f]+|[0-9]*\.?[0-9]+([Ee][+¯]?[0-9]+)?|¯|∞)([Jj]¯?(0[Xx][0-9A-Fa-f]+|[0-9]*\.?[0-9]+([Ee][+¯]?[0-9]+)?|¯|∞))?`, LiteralNumber, nil},
-			{`[\.\\/⌿⍀¨⍣⍨⍠⍤∘]`, NameAttribute, nil},
-			{`[+\-×÷⌈⌊∣|⍳?*⍟○!⌹<≤=>≥≠≡≢∊⍷∪∩~∨∧⍱⍲⍴,⍪⌽⊖⍉↑↓⊂⊃⌷⍋⍒⊤⊥⍕⍎⊣⊢⍁⍂≈⌸⍯↗]`, Operator, nil},
+			{`[\.\\/⌿⍀¨⍣⍨⍠⍤∘⍥@⌺⌶⍢]`, NameAttribute, nil},
+			{`[+\-×÷⌈⌊∣|⍳?*⍟○!⌹<≤=>≥≠≡≢∊⍷∪∩~∨∧⍱⍲⍴,⍪⌽⊖⍉↑↓⊂⊃⌷⍋⍒⊤⊥⍕⍎⊣⊢⍁⍂≈⌸⍯↗⊆⍸]`, Operator, nil},
 			{`⍬`, NameConstant, nil},
 			{`[⎕⍞]`, NameVariableGlobal, nil},
 			{`[←→]`, KeywordDeclaration, nil},