@abaplint/core 2.94.9 → 2.94.10

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

@@ -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;

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/registry.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.94.9",
+    "version": "2.94.10",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,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",