@abaplint/core 2.94.8 → 2.94.10

package/adhoc/lexer_performance.ts

@@ -10,8 +10,7 @@ for (let i = 0; i < 10; i++) {
   const before = Date.now();
   const result = new Lexer().run(file);
   const runtime = Date.now() - before;
-  console.log("Runtime: " + runtime + "ms");
+  console.log("Runtime: " + runtime + "ms, Tokens: " + result.tokens.length);
   total += runtime;
-  console.log("Tokens: " + result.tokens.length);
 }
-console.log("Total: " + total);
+console.log("Total: " + total + "ms");

package/adhoc/parser_performance.ts

@@ -0,0 +1,18 @@
+import {MemoryFile, Version} from "../src";
+import {Lexer} from "../src/abap/1_lexer/lexer";
+import * as fs from "fs";
+import {StatementParser} from "../src/abap/2_statements/statement_parser";
+
+console.log("========================");
+const file = new MemoryFile("abapgit.abap", fs.readFileSync("./lexer_performance.abap", "utf-8"));
+
+const lexerResult = new Lexer().run(file);
+
+let total = 0;
+for (let i = 0; i < 4; i++) {
+  const before = Date.now();
+  new StatementParser(Version.v702).run([lexerResult], []);
+  const runtime = Date.now() - before;
+  total += runtime;
+}
+console.log("Total: " + total + "ms");

package/build/adhoc/lexer_performance.js

@@ -10,9 +10,8 @@ for (let i = 0; i < 10; i++) {
     const before = Date.now();
     const result = new lexer_1.Lexer().run(file);
     const runtime = Date.now() - before;
-    console.log("Runtime: " + runtime + "ms");
+    console.log("Runtime: " + runtime + "ms, Tokens: " + result.tokens.length);
     total += runtime;
-    console.log("Tokens: " + result.tokens.length);
 }
-console.log("Total: " + total);
+console.log("Total: " + total + "ms");
 //# sourceMappingURL=lexer_performance.js.map

package/build/adhoc/parser_performance.d.ts

@@ -0,0 +1 @@
+export {};

package/build/adhoc/parser_performance.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const src_1 = require("../src");
+const lexer_1 = require("../src/abap/1_lexer/lexer");
+const fs = require("fs");
+const statement_parser_1 = require("../src/abap/2_statements/statement_parser");
+console.log("========================");
+const file = new src_1.MemoryFile("abapgit.abap", fs.readFileSync("./lexer_performance.abap", "utf-8"));
+const lexerResult = new lexer_1.Lexer().run(file);
+let total = 0;
+for (let i = 0; i < 4; i++) {
+    const before = Date.now();
+    new statement_parser_1.StatementParser(src_1.Version.v702).run([lexerResult], []);
+    const runtime = Date.now() - before;
+    total += runtime;
+}
+console.log("Total: " + total + "ms");
+//# sourceMappingURL=parser_performance.js.map

package/build/src/abap/1_lexer/lexer.js

@@ -9,6 +9,7 @@ class Buffer {
     }
     add(s) {
         this.buf = this.buf + s;
+        return this.buf;
     }
     get() {
         return this.buf;
@@ -300,39 +301,82 @@ class Lexer {
     process(raw) {
         this.stream = new Stream(raw.replace(/\r/g, ""));
         this.buffer = new Buffer();
+        const splits = {};
+        splits[" "] = true;
+        splits[":"] = true;
+        splits["."] = true;
+        splits[","] = true;
+        splits["-"] = true;
+        splits["+"] = true;
+        splits["("] = true;
+        splits[")"] = true;
+        splits["["] = true;
+        splits["]"] = true;
+        splits["\t"] = true;
+        splits["\n"] = true;
+        const bufs = {};
+        bufs["."] = true;
+        bufs[","] = true;
+        bufs[":"] = true;
+        bufs["("] = true;
+        bufs[")"] = true;
+        bufs["["] = true;
+        bufs["]"] = true;
+        bufs["+"] = true;
+        bufs["@"] = true;
         for (;;) {
             const current = this.stream.currentChar();
-            this.buffer.add(current);
-            const buf = this.buffer.get();
+            const buf = this.buffer.add(current);
             const ahead = this.stream.nextChar();
             const aahead = this.stream.nextNextChar();
-            const prev = this.stream.prevChar();
-            if (ahead === "'" && this.m === this.ModeNormal) {
-                // start string
-                this.add();
-                this.m = this.ModeStr;
-            }
-            else if ((ahead === "|" || ahead === "}")
-                && this.m === this.ModeNormal) {
-                // start template
-                this.add();
-                this.m = this.ModeTemplate;
-            }
-            else if (ahead === "`" && this.m === this.ModeNormal) {
-                // start ping
-                this.add();
-                this.m = this.ModePing;
-            }
-            else if (aahead === "##" && this.m === this.ModeNormal) {
-                // start pragma
-                this.add();
-                this.m = this.ModePragma;
-            }
-            else if ((ahead === "\"" || (ahead === "*" && current === "\n"))
-                && this.m === this.ModeNormal) {
-                // start comment
-                this.add();
-                this.m = this.ModeComment;
+            if (this.m === this.ModeNormal) {
+                if (ahead === "'") {
+                    // start string
+                    this.add();
+                    this.m = this.ModeStr;
+                }
+                else if (ahead === "|" || ahead === "}") {
+                    // start template
+                    this.add();
+                    this.m = this.ModeTemplate;
+                }
+                else if (ahead === "`") {
+                    // start ping
+                    this.add();
+                    this.m = this.ModePing;
+                }
+                else if (aahead === "##") {
+                    // start pragma
+                    this.add();
+                    this.m = this.ModePragma;
+                }
+                else if (ahead === "\""
+                    || (ahead === "*" && current === "\n")) {
+                    // start comment
+                    this.add();
+                    this.m = this.ModeComment;
+                }
+                else if (splits[ahead]) {
+                    this.add();
+                }
+                else if (ahead === "@" && buf.trim().length === 0) {
+                    this.add();
+                }
+                else if (aahead === "->"
+                    || aahead === "=>") {
+                    this.add();
+                }
+                else if (current === ">"
+                    && ahead !== " "
+                    && (this.stream.prevChar() === "-" || this.stream.prevChar() === "=")) {
+                    // arrows
+                    this.add();
+                }
+                else if (buf.length === 1
+                    && (bufs[buf]
+                        || (buf === "-" && ahead !== ">"))) {
+                    this.add();
+                }
             }
             else if (this.m === this.ModePragma && (ahead === "," || ahead === ":" || ahead === "." || ahead === " " || ahead === "\n")) {
                 // end of pragma
@@ -357,7 +401,7 @@ class Lexer {
             else if (this.m === this.ModeTemplate
                 && buf.length > 1
                 && (current === "|" || current === "{")
-                && (prev !== "\\" || this.stream.prevPrevChar() === "\\\\")) {
+                && (this.stream.prevChar() !== "\\" || this.stream.prevPrevChar() === "\\\\")) {
                 // end of template
                 this.add();
                 this.m = this.ModeNormal;
@@ -377,24 +421,6 @@ class Lexer {
                     this.m = this.ModeNormal;
                 }
             }
-            else if (this.m === this.ModeNormal
-                && (ahead === " "
-                    || ahead === ":"
-                    || ahead === "."
-                    || ahead === ","
-                    || ahead === "-"
-                    || ahead === "+"
-                    || ahead === "("
-                    || ahead === ")"
-                    || ahead === "["
-                    || ahead === "]"
-                    || (ahead === "@" && buf.trim().length === 0)
-                    || aahead === "->"
-                    || aahead === "=>"
-                    || ahead === "\t"
-                    || ahead === "\n")) {
-                this.add();
-            }
             else if (ahead === "\n" && this.m !== this.ModeTemplate) {
                 this.add();
                 this.m = this.ModeNormal;
@@ -402,26 +428,6 @@ class Lexer {
             else if (this.m === this.ModeTemplate && current === "\n") {
                 this.add();
             }
-            else if (current === ">"
-                && (prev === "-" || prev === "=")
-                && ahead !== " "
-                && this.m === this.ModeNormal) {
-                // arrows
-                this.add();
-            }
-            else if (this.m === this.ModeNormal
-                && (buf === "."
-                    || buf === ","
-                    || buf === ":"
-                    || buf === "("
-                    || buf === ")"
-                    || buf === "["
-                    || buf === "]"
-                    || buf === "+"
-                    || buf === "@"
-                    || (buf === "-" && ahead !== ">"))) {
-                this.add();
-            }
             if (!this.stream.advance()) {
                 break;
             }

package/build/src/abap/2_statements/combi.js

@@ -301,7 +301,7 @@ class Star {
         return [""];
     }
 }
-class StarPrioroity {
+class StarPriority {
     constructor(sta) {
         this.sta = sta;
     }
@@ -373,7 +373,7 @@ class Plus {
 class PlusPriority {
     constructor(plu) {
         this.plu = plu;
-        this.sub = new Sequence([this.plu, new StarPrioroity(this.plu)]);
+        this.sub = new Sequence([this.plu, new StarPriority(this.plu)]);
     }
     listKeywords() {
         return this.plu.listKeywords();
@@ -810,20 +810,24 @@ function tok(t) {
     return new Token(t.name);
 }
 exports.tok = tok;
-const singletons = {};
+const expressionSingletons = {};
+const stringSingletons = {};
 function map(s) {
     const type = typeof s;
     if (type === "string") {
-        return str(s);
+        if (stringSingletons[s] === undefined) {
+            stringSingletons[s] = str(s);
+        }
+        return stringSingletons[s];
     }
     else if (type === "function") {
         // @ts-ignore
         const name = s.name;
-        if (singletons[name] === undefined) {
+        if (expressionSingletons[name] === undefined) {
             // @ts-ignore
-            singletons[name] = new s();
+            expressionSingletons[name] = new s();
         }
-        return singletons[name];
+        return expressionSingletons[name];
     }
     else {
         return s;
@@ -866,7 +870,7 @@ function star(first) {
 }
 exports.star = star;
 function starPrio(first) {
-    return new StarPrioroity(map(first));
+    return new StarPriority(map(first));
 }
 exports.starPrio = starPrio;
 function plus(first) {

package/build/src/abap/2_statements/expressions/data_definition.js

@@ -6,8 +6,8 @@ const Expressions = require(".");
 class DataDefinition extends combi_1.Expression {
     getRunnable() {
         const simple = (0, combi_1.opt)((0, combi_1.per)("READ-ONLY", Expressions.Type, Expressions.Length, Expressions.Decimals, Expressions.Value));
-        const table = (0, combi_1.seq)(Expressions.TypeTable, (0, combi_1.opt)("READ-ONLY"));
-        return (0, combi_1.seq)(Expressions.DefinitionName, (0, combi_1.opt)(Expressions.ConstantFieldLength), (0, combi_1.alt)(simple, table));
+        const table = (0, combi_1.seq)(Expressions.TypeTable, (0, combi_1.optPrio)("READ-ONLY"));
+        return (0, combi_1.seq)(Expressions.DefinitionName, (0, combi_1.optPrio)(Expressions.ConstantFieldLength), (0, combi_1.alt)(simple, table));
     }
 }
 exports.DataDefinition = DataDefinition;

package/build/src/abap/2_statements/statement_parser.js

@@ -21,10 +21,10 @@ class StatementMap {
             }
             for (const first of f) {
                 if (this.map[first]) {
-                    this.map[first].push(stat);
+                    this.map[first].push({ statement: stat });
                 }
                 else {
-                    this.map[first] = [stat];
+                    this.map[first] = [{ statement: stat }];
                 }
             }
         }
@@ -34,6 +34,11 @@ class StatementMap {
         if (res === undefined) {
             return [];
         }
+        if (res[0].matcher === undefined) {
+            for (const r of res) {
+                r.matcher = r.statement.getMatcher();
+            }
+        }
         return res;
     }
 }
@@ -213,20 +218,20 @@ class StatementParser {
             return new nodes_1.StatementNode(new _statement_1.Empty()).setChildren(this.tokensToNodes(tokens));
         }
         for (const st of StatementParser.map.lookup(filtered[0].getStr())) {
-            const match = combi_1.Combi.run(st.getMatcher(), filtered, this.version);
+            const match = combi_1.Combi.run(st.matcher, filtered, this.version);
             if (match) {
                 const last = tokens[tokens.length - 1];
                 match.push(new nodes_1.TokenNode(last));
-                return new nodes_1.StatementNode(st, statement.getColon(), pragmas).setChildren(match);
+                return new nodes_1.StatementNode(st.statement, statement.getColon(), pragmas).setChildren(match);
             }
         }
         // next try the statements without specific keywords
         for (const st of StatementParser.map.lookup("")) {
-            const match = combi_1.Combi.run(st.getMatcher(), filtered, this.version);
+            const match = combi_1.Combi.run(st.matcher, filtered, this.version);
             if (match) {
                 const last = tokens[tokens.length - 1];
                 match.push(new nodes_1.TokenNode(last));
-                return new nodes_1.StatementNode(st, statement.getColon(), pragmas).setChildren(match);
+                return new nodes_1.StatementNode(st.statement, statement.getColon(), pragmas).setChildren(match);
             }
         }
         return statement;
@@ -245,24 +250,26 @@ class StatementParser {
             }
             add.push(token);
             const str = token.getStr();
-            if (str === ".") {
-                wa.addUnknown(pre, add, colon);
-                add = [];
-                pre = [];
-                colon = undefined;
-            }
-            else if (str === "," && pre.length > 0) {
-                wa.addUnknown(pre, add, colon);
-                add = [];
-            }
-            else if (str === ":" && colon === undefined) {
-                colon = token;
-                add.pop(); // do not add colon token to statement
-                pre.push(...add);
-                add = [];
-            }
-            else if (str === ":") {
-                add.pop(); // do not add colon token to statement
+            if (str.length === 1) {
+                if (str === ".") {
+                    wa.addUnknown(pre, add, colon);
+                    add = [];
+                    pre = [];
+                    colon = undefined;
+                }
+                else if (str === "," && pre.length > 0) {
+                    wa.addUnknown(pre, add, colon);
+                    add = [];
+                }
+                else if (str === ":" && colon === undefined) {
+                    colon = token;
+                    add.pop(); // do not add colon token to statement
+                    pre.push(...add);
+                    add = [];
+                }
+                else if (str === ":") {
+                    add.pop(); // do not add colon token to statement
+                }
             }
         }
         if (add.length > 0) {

package/build/src/abap/2_statements/statements/assign.js

@@ -5,8 +5,8 @@ const combi_1 = require("../combi");
 const expressions_1 = require("../expressions");
 class Assign {
     getMatcher() {
-        const type = (0, combi_1.seq)("TYPE", (0, combi_1.alt)(expressions_1.Dynamic, expressions_1.TypeName));
-        const like = (0, combi_1.seq)("LIKE", (0, combi_1.alt)(expressions_1.Dynamic, expressions_1.Source));
+        const type = (0, combi_1.seq)("TYPE", (0, combi_1.altPrio)(expressions_1.Dynamic, expressions_1.TypeName));
+        const like = (0, combi_1.seq)("LIKE", (0, combi_1.altPrio)(expressions_1.Dynamic, expressions_1.Source));
         const handle = (0, combi_1.seq)("TYPE HANDLE", expressions_1.Source);
         const range = (0, combi_1.seq)("RANGE", expressions_1.Source);
         const decimals = (0, combi_1.seq)("DECIMALS", expressions_1.Source);

package/build/src/abap/2_statements/statements/break.js

@@ -7,7 +7,7 @@ const version_1 = require("../../../version");
 class Break {
     getMatcher() {
         const next = (0, combi_1.str)("AT NEXT APPLICATION STATEMENT");
-        const ret = (0, combi_1.alt)((0, combi_1.seq)("BREAK-POINT", (0, combi_1.opt)((0, combi_1.alt)(next, expressions_1.Source))), (0, combi_1.seq)("BREAK", expressions_1.FieldSub));
+        const ret = (0, combi_1.altPrio)((0, combi_1.seq)("BREAK-POINT", (0, combi_1.optPrio)((0, combi_1.altPrio)(next, expressions_1.Source))), (0, combi_1.seq)("BREAK", expressions_1.FieldSub));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }

package/build/src/abap/2_statements/statements/call_function.js

@@ -9,14 +9,14 @@ class CallFunction {
         const starting = (0, combi_1.seq)("STARTING NEW TASK", expressions_1.SimpleSource2);
         const update = (0, combi_1.str)("IN UPDATE TASK");
         const unit = (0, combi_1.seq)("UNIT", expressions_1.Source);
-        const background = (0, combi_1.verNot)(version_1.Version.Cloud, (0, combi_1.seq)("IN BACKGROUND", (0, combi_1.alt)("TASK", unit)));
+        const background = (0, combi_1.verNot)(version_1.Version.Cloud, (0, combi_1.seq)("IN BACKGROUND", (0, combi_1.altPrio)("TASK", unit)));
         const calling = (0, combi_1.seq)("CALLING", expressions_1.MethodName, "ON END OF TASK");
         const performing = (0, combi_1.seq)("PERFORMING", expressions_1.FormName, "ON END OF TASK");
         const separate = (0, combi_1.str)("AS SEPARATE UNIT");
         const keeping = (0, combi_1.str)("KEEPING LOGICAL UNIT OF WORK");
         const options = (0, combi_1.per)(starting, update, background, expressions_1.Destination, calling, performing, separate, keeping);
         const dynamic = (0, combi_1.seq)("PARAMETER-TABLE", expressions_1.Source, (0, combi_1.opt)((0, combi_1.seq)("EXCEPTION-TABLE", expressions_1.Source)));
-        const call = (0, combi_1.seq)("CALL", (0, combi_1.alt)("FUNCTION", (0, combi_1.verNot)(version_1.Version.Cloud, "CUSTOMER-FUNCTION")), expressions_1.FunctionName, (0, combi_1.opt)(options), (0, combi_1.alt)(expressions_1.FunctionParameters, dynamic));
+        const call = (0, combi_1.seq)("CALL", (0, combi_1.altPrio)("FUNCTION", (0, combi_1.verNot)(version_1.Version.Cloud, "CUSTOMER-FUNCTION")), expressions_1.FunctionName, (0, combi_1.opt)(options), (0, combi_1.alt)(expressions_1.FunctionParameters, dynamic));
         return call;
     }
 }

package/build/src/abap/2_statements/statements/class_data_begin.js

@@ -6,7 +6,7 @@ const expressions_1 = require("../expressions");
 class ClassDataBegin {
     getMatcher() {
         const occurs = (0, combi_1.seq)("OCCURS", expressions_1.Integer);
-        const structure = (0, combi_1.seq)("BEGIN OF", (0, combi_1.opt)("COMMON PART"), expressions_1.NamespaceSimpleName, (0, combi_1.opt)("READ-ONLY"), (0, combi_1.opt)(occurs));
+        const structure = (0, combi_1.seq)("BEGIN OF", (0, combi_1.optPrio)("COMMON PART"), expressions_1.NamespaceSimpleName, (0, combi_1.optPrio)("READ-ONLY"), (0, combi_1.optPrio)(occurs));
         return (0, combi_1.seq)("CLASS-DATA", structure);
     }
 }

package/build/src/abap/2_statements/statements/class_data_end.js

@@ -6,7 +6,7 @@ const expressions_1 = require("../expressions");
 class ClassDataEnd {
     getMatcher() {
         const common = (0, combi_1.seq)("COMMON PART", (0, combi_1.optPrio)(expressions_1.NamespaceSimpleName));
-        const structure = (0, combi_1.seq)("END OF", (0, combi_1.alt)(common, expressions_1.NamespaceSimpleName));
+        const structure = (0, combi_1.seq)("END OF", (0, combi_1.altPrio)(common, expressions_1.NamespaceSimpleName));
         return (0, combi_1.seq)("CLASS-DATA", structure);
     }
 }

package/build/src/abap/2_statements/statements/class_deferred.js

@@ -5,8 +5,7 @@ const combi_1 = require("../combi");
 const expressions_1 = require("../expressions");
 class ClassDeferred {
     getMatcher() {
-        const def = (0, combi_1.seq)("DEFERRED", (0, combi_1.opt)("PUBLIC"));
-        return (0, combi_1.seq)("CLASS", expressions_1.ClassName, (0, combi_1.str)("DEFINITION"), def);
+        return (0, combi_1.seq)("CLASS", expressions_1.ClassName, "DEFINITION DEFERRED", (0, combi_1.optPrio)("PUBLIC"));
     }
 }
 exports.ClassDeferred = ClassDeferred;

package/build/src/abap/2_statements/statements/class_definition.js

@@ -6,13 +6,13 @@ const expressions_1 = require("../expressions");
 const version_1 = require("../../../version");
 class ClassDefinition {
     getMatcher() {
-        const create = (0, combi_1.seq)("CREATE", (0, combi_1.alt)("PUBLIC", "PROTECTED", "PRIVATE"));
-        const level = (0, combi_1.alt)("CRITICAL", "HARMLESS", "DANGEROUS");
+        const create = (0, combi_1.seq)("CREATE", (0, combi_1.altPrio)("PUBLIC", "PROTECTED", "PRIVATE"));
+        const level = (0, combi_1.altPrio)("CRITICAL", "HARMLESS", "DANGEROUS");
         const risk = (0, combi_1.seq)("RISK LEVEL", level);
-        const time = (0, combi_1.alt)("LONG", "MEDIUM", "SHORT");
+        const time = (0, combi_1.altPrio)("LONG", "MEDIUM", "SHORT");
         const duration = (0, combi_1.seq)("DURATION", time);
         const blah = (0, combi_1.per)(expressions_1.ClassGlobal, expressions_1.ClassFinal, "ABSTRACT", (0, combi_1.seq)("INHERITING FROM", expressions_1.SuperClassName), create, "FOR TESTING", risk, "SHARED MEMORY ENABLED", duration, (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("FOR BEHAVIOR OF", expressions_1.NamespaceSimpleName)), expressions_1.ClassFriends);
-        const def = (0, combi_1.seq)("DEFINITION", (0, combi_1.opt)(blah));
+        const def = (0, combi_1.seq)("DEFINITION", (0, combi_1.optPrio)(blah));
         return (0, combi_1.seq)("CLASS", expressions_1.ClassName, def);
     }
 }

package/build/src/abap/2_statements/statements/class_local_friends.js

@@ -5,8 +5,7 @@ const combi_1 = require("../combi");
 const expressions_1 = require("../expressions");
 class ClassLocalFriends {
     getMatcher() {
-        const local = (0, combi_1.seq)("LOCAL FRIENDS", (0, combi_1.plus)(expressions_1.ClassName));
-        return (0, combi_1.seq)("CLASS", expressions_1.ClassName, "DEFINITION", local);
+        return (0, combi_1.seq)("CLASS", expressions_1.ClassName, "DEFINITION LOCAL FRIENDS", (0, combi_1.plusPrio)(expressions_1.ClassName));
     }
 }
 exports.ClassLocalFriends = ClassLocalFriends;

package/build/src/abap/2_statements/statements/clear.js

@@ -6,8 +6,8 @@ const expressions_1 = require("../expressions");
 class Clear {
     getMatcher() {
         const wit = (0, combi_1.seq)("WITH", expressions_1.Source);
-        const mode = (0, combi_1.alt)("IN CHARACTER MODE", "IN BYTE MODE");
-        return (0, combi_1.seq)("CLEAR", expressions_1.Target, (0, combi_1.opt)(wit), (0, combi_1.opt)(mode));
+        const mode = (0, combi_1.altPrio)("IN CHARACTER MODE", "IN BYTE MODE");
+        return (0, combi_1.seq)("CLEAR", expressions_1.Target, (0, combi_1.optPrio)(wit), (0, combi_1.optPrio)(mode));
     }
 }
 exports.Clear = Clear;

package/build/src/abap/2_statements/statements/concatenate.js

@@ -5,7 +5,7 @@ const combi_1 = require("../combi");
 const expressions_1 = require("../expressions");
 class Concatenate {
     getMatcher() {
-        const mode = (0, combi_1.seq)("IN", (0, combi_1.alt)("BYTE", "CHARACTER"), "MODE");
+        const mode = (0, combi_1.seq)("IN", (0, combi_1.altPrio)("BYTE", "CHARACTER"), "MODE");
         const blanks = (0, combi_1.str)("RESPECTING BLANKS");
         const sep = (0, combi_1.seq)("SEPARATED BY", expressions_1.Source);
         const options = (0, combi_1.per)(mode, blanks, sep);

package/build/src/abap/2_statements/statements/data_end.js

@@ -6,7 +6,7 @@ const expressions_1 = require("../expressions");
 class DataEnd {
     getMatcher() {
         const common = (0, combi_1.seq)("COMMON PART", (0, combi_1.optPrio)(expressions_1.DefinitionName));
-        const structure = (0, combi_1.seq)("END OF", (0, combi_1.alt)(common, expressions_1.DefinitionName));
+        const structure = (0, combi_1.seq)("END OF", (0, combi_1.altPrio)(common, expressions_1.DefinitionName));
         const valid = (0, combi_1.seq)("VALID BETWEEN", expressions_1.ComponentName, "AND", expressions_1.ComponentName);
         return (0, combi_1.seq)("DATA", structure, (0, combi_1.optPrio)(valid));
     }

package/build/src/abap/2_statements/statements/delete_database.js

@@ -6,10 +6,10 @@ const expressions_1 = require("../expressions");
 const sql_client_1 = require("../expressions/sql_client");
 class DeleteDatabase {
     getMatcher() {
-        const where = (0, combi_1.seq)("WHERE", (0, combi_1.alt)(expressions_1.SQLCond, expressions_1.Dynamic));
+        const where = (0, combi_1.seq)("WHERE", (0, combi_1.altPrio)(expressions_1.SQLCond, expressions_1.Dynamic));
         const from = (0, combi_1.seq)("FROM", expressions_1.DatabaseTable, (0, combi_1.optPrio)(sql_client_1.SQLClient), (0, combi_1.optPrio)(expressions_1.DatabaseConnection), (0, combi_1.opt)(where));
-        const table = (0, combi_1.seq)(expressions_1.DatabaseTable, (0, combi_1.optPrio)(sql_client_1.SQLClient), (0, combi_1.opt)(expressions_1.DatabaseConnection), "FROM", (0, combi_1.opt)("TABLE"), expressions_1.SQLSourceSimple);
-        const ret = (0, combi_1.seq)("DELETE", (0, combi_1.alt)(from, table));
+        const table = (0, combi_1.seq)(expressions_1.DatabaseTable, (0, combi_1.optPrio)(sql_client_1.SQLClient), (0, combi_1.optPrio)(expressions_1.DatabaseConnection), "FROM", (0, combi_1.opt)("TABLE"), expressions_1.SQLSourceSimple);
+        const ret = (0, combi_1.seq)("DELETE", (0, combi_1.altPrio)(from, table));
         return ret;
     }
 }

package/build/src/abap/2_statements/statements/events.js

@@ -6,7 +6,7 @@ const expressions_1 = require("../expressions");
 class Events {
     getMatcher() {
         const exporting = (0, combi_1.seq)("EXPORTING", (0, combi_1.plus)(expressions_1.MethodParamOptional));
-        return (0, combi_1.seq)((0, combi_1.alt)("CLASS-EVENTS", "EVENTS"), expressions_1.EventName, (0, combi_1.opt)(exporting));
+        return (0, combi_1.seq)((0, combi_1.altPrio)("CLASS-EVENTS", "EVENTS"), expressions_1.EventName, (0, combi_1.optPrio)(exporting));
     }
 }
 exports.Events = Events;

package/build/src/abap/2_statements/statements/find.js

@@ -8,8 +8,8 @@ class Find {
         // SUBMATCHES handling is a workaround
         const options = (0, combi_1.per)("IGNORING CASE", "RESPECTING CASE", "IN BYTE MODE", "IN CHARACTER MODE", (0, combi_1.seq)("OF", expressions_1.Source), (0, combi_1.seq)("FROM", expressions_1.Source), (0, combi_1.seq)("TO", expressions_1.Source), (0, combi_1.seq)("MATCH OFFSET", expressions_1.Target), (0, combi_1.seq)("MATCH LINE", expressions_1.Target), (0, combi_1.seq)("MATCH COUNT", expressions_1.Target), (0, combi_1.seq)("MATCH LENGTH", expressions_1.Target), (0, combi_1.seq)("LENGTH", expressions_1.Source), (0, combi_1.seq)("RESULTS", expressions_1.Target), (0, combi_1.seq)("SUBMATCHES", expressions_1.Target), (0, combi_1.seq)("SUBMATCHES", expressions_1.Target, expressions_1.Target), (0, combi_1.seq)("SUBMATCHES", (0, combi_1.plus)(expressions_1.Target)));
         const sectionLength = (0, combi_1.seq)("SECTION LENGTH", expressions_1.Source, "OF");
-        const before = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.alt)("TABLE", "SECTION OFFSET", sectionLength)), expressions_1.Source);
-        const ret = (0, combi_1.seq)("FIND", (0, combi_1.opt)((0, combi_1.alt)("FIRST OCCURRENCE OF", "ALL OCCURRENCES OF")), expressions_1.FindType, expressions_1.Source, "IN", before, (0, combi_1.opt)(options));
+        const before = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("TABLE", "SECTION OFFSET", sectionLength)), expressions_1.Source);
+        const ret = (0, combi_1.seq)("FIND", (0, combi_1.opt)((0, combi_1.altPrio)("FIRST OCCURRENCE OF", "ALL OCCURRENCES OF")), expressions_1.FindType, expressions_1.Source, "IN", before, (0, combi_1.opt)(options));
         return ret;
     }
 }

package/build/src/abap/2_statements/statements/modify_line.js

@@ -18,7 +18,7 @@ class ModifyLine {
         const onOff = (0, combi_1.alt)("ON", "OFF");
         const intensified = (0, combi_1.seq)("INTENSIFIED", onOff);
         const options = (0, combi_1.per)(index, value, format, page, lineFormat, lineValue, ocp, intensified, expressions_1.Color);
-        const ret = (0, combi_1.seq)("MODIFY", (0, combi_1.alt)("CURRENT LINE", (0, combi_1.seq)("LINE", expressions_1.Source)), (0, combi_1.opt)(options));
+        const ret = (0, combi_1.seq)("MODIFY", (0, combi_1.altPrio)("CURRENT LINE", (0, combi_1.seq)("LINE", expressions_1.Source)), (0, combi_1.opt)(options));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }

package/build/src/abap/2_statements/statements/raise.js

@@ -10,7 +10,7 @@ class Raise {
         const messid = (0, combi_1.seq)("MESSAGE ID", expressions_1.Source, "NUMBER", (0, combi_1.altPrio)(expressions_1.MessageNumber, expressions_1.Source), (0, combi_1.optPrio)(expressions_1.RaiseWith));
         const exporting = (0, combi_1.seq)("EXPORTING", expressions_1.ParameterListS);
         const from = (0, combi_1.seq)("TYPE", expressions_1.ClassName, (0, combi_1.opt)((0, combi_1.alt)((0, combi_1.ver)(version_1.Version.v750, (0, combi_1.alt)(mess, messid)), (0, combi_1.ver)(version_1.Version.v752, "USING MESSAGE"))), (0, combi_1.optPrio)(exporting));
-        const pre = (0, combi_1.alt)((0, combi_1.seq)((0, combi_1.optPrio)("RESUMABLE"), "EXCEPTION"), "SHORTDUMP");
+        const pre = (0, combi_1.altPrio)((0, combi_1.seq)((0, combi_1.optPrio)("RESUMABLE"), "EXCEPTION"), "SHORTDUMP");
         const clas = (0, combi_1.seq)(pre, (0, combi_1.altPrio)(from, (0, combi_1.ver)(version_1.Version.v752, expressions_1.Source), expressions_1.SimpleSource2));
         const ret = (0, combi_1.seq)("RAISE", (0, combi_1.altPrio)(clas, expressions_1.ExceptionName));
         return ret;

package/build/src/abap/2_statements/statements/replace.js

@@ -9,12 +9,12 @@ class Replace {
         const offset = (0, combi_1.seq)("OFFSET", expressions_1.Source);
         const section = (0, combi_1.seq)((0, combi_1.opt)("IN"), "SECTION", (0, combi_1.per)(offset, length), "OF", expressions_1.Target);
         const source = (0, combi_1.seq)((0, combi_1.opt)("OF"), expressions_1.FindType, expressions_1.Source);
-        const cas = (0, combi_1.alt)("IGNORING CASE", "RESPECTING CASE");
+        const cas = (0, combi_1.altPrio)("IGNORING CASE", "RESPECTING CASE");
         const repl = (0, combi_1.seq)("REPLACEMENT COUNT", expressions_1.Target);
         const replo = (0, combi_1.seq)("REPLACEMENT OFFSET", expressions_1.Target);
         const repll = (0, combi_1.seq)("REPLACEMENT LENGTH", expressions_1.Target);
         const repli = (0, combi_1.seq)("REPLACEMENT LINE", expressions_1.Target);
-        const occ = (0, combi_1.alt)("ALL OCCURRENCES", "ALL OCCURENCES", "FIRST OCCURENCE", "FIRST OCCURRENCE");
+        const occ = (0, combi_1.altPrio)("ALL OCCURRENCES", "ALL OCCURENCES", "FIRST OCCURENCE", "FIRST OCCURRENCE");
         const mode = (0, combi_1.alt)("IN CHARACTER MODE", "IN BYTE MODE");
         const wit = (0, combi_1.seq)("WITH", expressions_1.Source);
         const into = (0, combi_1.seq)("INTO", expressions_1.Target);

package/build/src/abap/2_statements/statements/search.js

@@ -9,7 +9,7 @@ class Search {
         const starting = (0, combi_1.seq)("STARTING AT", expressions_1.Source);
         const ending = (0, combi_1.seq)("ENDING AT", expressions_1.Source);
         const mark = (0, combi_1.str)("AND MARK");
-        const mode = (0, combi_1.alt)("IN BYTE MODE", "IN CHARACTER MODE");
+        const mode = (0, combi_1.altPrio)("IN BYTE MODE", "IN CHARACTER MODE");
         const ret = (0, combi_1.seq)("SEARCH", expressions_1.Source, "FOR", expressions_1.Source, (0, combi_1.opt)((0, combi_1.per)(mode, starting, ending, mark)));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }

package/build/src/abap/2_statements/statements/sort.js

@@ -11,7 +11,7 @@ class Sort {
         const fields = (0, combi_1.plus)((0, combi_1.seq)(sel, (0, combi_1.optPrio)(text), (0, combi_1.optPrio)(order), (0, combi_1.optPrio)(text)));
         const by = (0, combi_1.seq)("BY", fields);
         const normal = (0, combi_1.seq)(expressions_1.Target, (0, combi_1.opt)((0, combi_1.per)(order, by, "STABLE", text)));
-        const target = (0, combi_1.alt)(normal, text);
+        const target = (0, combi_1.altPrio)(text, normal);
         return (0, combi_1.seq)("SORT", target);
     }
 }

package/build/src/abap/2_statements/statements/translate.js

@@ -5,9 +5,9 @@ const combi_1 = require("../combi");
 const expressions_1 = require("../expressions");
 class Translate {
     getMatcher() {
-        const cas = (0, combi_1.seq)("TO", (0, combi_1.alt)("UPPER", "LOWER"), "CASE");
+        const cas = (0, combi_1.seq)("TO", (0, combi_1.altPrio)("UPPER", "LOWER"), "CASE");
         const using = (0, combi_1.seq)("USING", expressions_1.Source);
-        return (0, combi_1.seq)("TRANSLATE", expressions_1.Target, (0, combi_1.alt)(cas, using));
+        return (0, combi_1.seq)("TRANSLATE", expressions_1.Target, (0, combi_1.altPrio)(cas, using));
     }
 }
 exports.Translate = Translate;

package/build/src/registry.js

@@ -63,7 +63,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.94.8";
+        return "2.94.10";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/unused_variables.js

@@ -103,7 +103,7 @@ Unused variables are not reported if the object contains syntax errors. Errors f
         const top = syntax.spaghetti.getTop();
         this.buildWorkarea(top, obj);
         if (this.workarea.count() === 0) {
-            return this.buildIssues(obj); // exit early if all types are used
+            return this.buildIssues(obj); // exit early if all variables are used
         }
         this.findUses(top, obj);
         for (const o of this.reg.getObjects()) {
@@ -117,7 +117,7 @@ Unused variables are not reported if the object contains syntax errors. Errors f
                 const syntax = new syntax_1.SyntaxLogic(this.reg, o).run();
                 this.findUses(syntax.spaghetti.getTop(), o);
                 if (this.workarea.count() === 0) {
-                    return this.buildIssues(obj); // exit early if all types are used
+                    return this.buildIssues(obj); // exit early if all variables are used
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.94.8",
+    "version": "2.94.10",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -12,7 +12,8 @@
         "test:only": "npm run compile && mocha",
         "test:parallel": "npm run compile && mocha --timeout 1000 --parallel --reporter dot",
         "coverage": "npm run compile && c8 mocha && c8 report --reporter=html",
-        "lexer_performance": "tsc && curl -o lexer_performance.abap https://raw.githubusercontent.com/abapGit/build/main/zabapgit.abap && node build/adhoc/lexer_performance.js",
+        "lexer_performance": "tsc && curl -o lexer_performance.abap https://raw.githubusercontent.com/abapGit/build/main/zabapgit_standalone.prog.abap && node build/adhoc/lexer_performance.js",
+        "parser_performance": "tsc && curl -o lexer_performance.abap https://raw.githubusercontent.com/abapGit/build/main/zabapgit_standalone.prog.abap && node build/adhoc/parser_performance.js",
         "schema": "node scripts/schema.js > scripts/schema.ts && ts-json-schema-generator --tsconfig tsconfig_schema.json --jsDoc extended --path scripts/schema.ts > scripts/schema.json && node scripts/schema_post.js",
         "publish:minor": "npm --no-git-tag-version version minor && rm -rf build && npm install && npm run test && npm publish --access public",
         "publish:patch": "npm --no-git-tag-version version patch && rm -rf build && npm install && npm run test && npm publish --access public"
@@ -49,7 +50,7 @@
         "@microsoft/api-extractor": "^7.33.7",
         "@types/chai": "^4.3.4",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^18.11.17",
+        "@types/node": "^18.11.18",
         "chai": "^4.3.7",
         "eslint": "^8.30.0",
         "mocha": "^10.2.0",