@abaplint/core 2.91.33 → 2.91.34

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fail = exports.verNot = exports.ver = exports.plusPrio = exports.plus = exports.starPrio = exports.star = exports.per = exports.optPrio = exports.opt = exports.altPrio = exports.alt = exports.seq = exports.tok = exports.regex = exports.str = exports.Combi = exports.Expression = void 0;
+exports.failStar = exports.failCombinator = exports.verNot = exports.ver = exports.plusPrio = exports.plus = exports.starPrio = exports.star = exports.per = exports.optPrio = exports.opt = exports.altPrio = exports.alt = exports.seq = exports.tok = exports.regex = exports.str = exports.Combi = exports.Expression = void 0;
 const Tokens = require("../1_lexer/tokens");
 const nodes_1 = require("../nodes");
 const version_1 = require("../../version");
@@ -270,15 +270,23 @@ class Star {
     }
     run(r) {
         const result = r;
-        let res = r;
-        let input = [];
-        for (;;) {
-            input = res;
-            res = this.sta.run(input);
-            if (res.length === 0) {
-                break;
+        try {
+            let res = r;
+            let input = [];
+            for (;;) {
+                input = res;
+                res = this.sta.run(input);
+                if (res.length === 0) {
+                    break;
+                }
+                result.push(...res);
             }
-            result.push(...res);
+        }
+        catch (err) {
+            if (err instanceof FailStarError) {
+                return result;
+            }
+            throw err;
         }
         //    console.dir(result);
         return result;
@@ -572,9 +580,32 @@ class Permutation {
         return [""];
     }
 }
-class FailCombinator extends Error {
+class FailCombinatorError extends Error {
+}
+class FailStarError extends Error {
+}
+class FailCombinator {
+    listKeywords() {
+        return [];
+    }
+    getUsing() {
+        return [];
+    }
+    run(_r) {
+        throw new FailCombinatorError();
+    }
+    railroad() {
+        return "Railroad.Terminal('!FailCombinator')";
+    }
+    toStr() {
+        return "fail()";
+    }
+    first() {
+        return [];
+    }
 }
-class Fail {
+// Note that Plus is implemented with Star
+class FailStar {
     listKeywords() {
         return [];
     }
@@ -582,10 +613,10 @@ class Fail {
         return [];
     }
     run(_r) {
-        throw new FailCombinator();
+        throw new FailStarError();
     }
     railroad() {
-        return "Railroad.Terminal('!Fail')";
+        return "Railroad.Terminal('!FailStar')";
     }
     toStr() {
         return "fail()";
@@ -749,7 +780,7 @@ class Combi {
             }
         }
         catch (err) {
-            if (err instanceof FailCombinator) {
+            if (err instanceof FailCombinatorError) {
                 return undefined;
             }
             throw err;
@@ -854,8 +885,12 @@ function verNot(version, first) {
     return new VersNot(version, map(first));
 }
 exports.verNot = verNot;
-function fail() {
-    return new Fail();
+function failCombinator() {
+    return new FailCombinator();
+}
+exports.failCombinator = failCombinator;
+function failStar() {
+    return new FailStar();
 }
-exports.fail = fail;
+exports.failStar = failStar;
 //# sourceMappingURL=combi.js.map

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

@@ -14,6 +14,8 @@ class TypeTable extends combi_1.Expression {
         const likeType = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("STANDARD", "HASHED", "INDEX", "SORTED", "ANY")), "TABLE OF", (0, combi_1.optPrio)("REF TO"), (0, combi_1.opt)(field_chain_1.FieldChain), (0, combi_1.opt)((0, combi_1.per)(header, initial, (0, combi_1.plusPrio)(type_table_key_1.TypeTableKey))));
         const rangeType = (0, combi_1.seq)("RANGE OF", _1.TypeName, (0, combi_1.opt)(header), (0, combi_1.opt)(initial));
         const rangeLike = (0, combi_1.seq)("RANGE OF", _1.SimpleFieldChain, (0, combi_1.opt)(header), (0, combi_1.opt)(initial));
+        // a maximum of 15 secondary table keys can be defined
+        // "WITH" is not allowed as a field name in keys
         const typetable = (0, combi_1.seq)(normal1, (0, combi_1.alt)((0, combi_1.opt)((0, combi_1.per)(header, initial, (0, combi_1.plusPrio)(type_table_key_1.TypeTableKey))), (0, combi_1.seq)((0, combi_1.plus)(type_table_key_1.TypeTableKey), (0, combi_1.optPrio)(initial))));
         const occurs = (0, combi_1.seq)("OCCURS", _1.Integer);
         const derived = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("TABLE FOR", (0, combi_1.altPrio)("CREATE", "FAILED", "LOCK", "ACTION IMPORT", "UPDATE", "READ RESULT", "ACTION RESULT"), _1.TypeName));

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

@@ -9,7 +9,8 @@ class TypeTableKey extends combi_1.Expression {
         const uniqueness = (0, combi_1.alt)("NON-UNIQUE", "UNIQUE");
         const defaultKey = "DEFAULT KEY";
         const emptyKey = (0, combi_1.ver)(version_1.Version.v740sp02, "EMPTY KEY");
-        const key = (0, combi_1.seq)("WITH", (0, combi_1.opt)(uniqueness), (0, combi_1.altPrio)(defaultKey, emptyKey, (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("SORTED", "HASHED")), "KEY", (0, combi_1.alt)((0, combi_1.seq)(_1.Field, "COMPONENTS", (0, combi_1.plus)(_1.FieldSub)), (0, combi_1.plus)(_1.FieldSub)))), (0, combi_1.optPrio)("READ-ONLY"));
+        const components = (0, combi_1.plus)((0, combi_1.alt)((0, combi_1.seq)("WITH", (0, combi_1.failStar)()), _1.FieldSub));
+        const key = (0, combi_1.seq)("WITH", (0, combi_1.opt)(uniqueness), (0, combi_1.altPrio)(defaultKey, emptyKey, (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("SORTED", "HASHED")), "KEY", (0, combi_1.alt)((0, combi_1.seq)(_1.Field, "COMPONENTS", components), components))), (0, combi_1.optPrio)("READ-ONLY"));
         return key;
     }
 }

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

@@ -14,7 +14,7 @@ class Loop {
         const to = (0, combi_1.seq)("TO", expressions_1.Source);
         const usingKey = (0, combi_1.seq)("USING KEY", (0, combi_1.altPrio)(expressions_1.SimpleName, expressions_1.Dynamic));
         const options = (0, combi_1.per)(expressions_1.LoopTarget, from, to, where, usingKey, group);
-        const at = (0, combi_1.seq)("AT", (0, combi_1.opt)((0, combi_1.seq)("SCREEN", (0, combi_1.fail)())), (0, combi_1.opt)((0, combi_1.ver)(version_1.Version.v740sp08, "GROUP")), (0, combi_1.alt)(simple_source2_1.SimpleSource2, (0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source)), (0, combi_1.opt)(options));
+        const at = (0, combi_1.seq)("AT", (0, combi_1.opt)((0, combi_1.seq)("SCREEN", (0, combi_1.failCombinator)())), (0, combi_1.opt)((0, combi_1.ver)(version_1.Version.v740sp08, "GROUP")), (0, combi_1.alt)(simple_source2_1.SimpleSource2, (0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source)), (0, combi_1.opt)(options));
         return (0, combi_1.seq)("LOOP", (0, combi_1.opt)(at));
     }
 }

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

@@ -12,7 +12,8 @@ class ReadTable {
         const key = (0, combi_1.seq)((0, combi_1.altPrio)("WITH KEY", "WITH TABLE KEY"), (0, combi_1.alt)(expressions_1.ComponentCompareSimple, components, (0, combi_1.seq)((0, combi_1.optPrio)("="), expressions_1.Source)));
         const using = (0, combi_1.seq)("USING KEY", (0, combi_1.alt)(expressions_1.Field, expressions_1.Dynamic));
         const from = (0, combi_1.seq)("FROM", expressions_1.Source);
-        const perm = (0, combi_1.per)((0, combi_1.alt)(index, key, from), expressions_1.ReadTableTarget, using, comparing, "CASTING", "TRANSPORTING ALL FIELDS", (0, combi_1.seq)("TRANSPORTING", (0, combi_1.altPrio)(expressions_1.Dynamic, (0, combi_1.plus)(expressions_1.Field))), "BINARY SEARCH");
+        const fields = (0, combi_1.plus)((0, combi_1.alt)((0, combi_1.seq)("INTO", (0, combi_1.failStar)()), expressions_1.FieldSub));
+        const perm = (0, combi_1.per)((0, combi_1.alt)(index, key, from), expressions_1.ReadTableTarget, using, comparing, "CASTING", "TRANSPORTING ALL FIELDS", (0, combi_1.seq)("TRANSPORTING", (0, combi_1.altPrio)(expressions_1.Dynamic, fields)), "BINARY SEARCH");
         return (0, combi_1.seq)("READ TABLE", (0, combi_1.alt)((0, combi_1.ver)(version_1.Version.v740sp02, expressions_1.Source), expressions_1.SimpleSource2), (0, combi_1.opt)(perm));
     }
 }

package/build/src/abap/5_syntax/expressions/type_table_key.js

@@ -9,7 +9,7 @@ class TypeTableKey {
             const rowType = type.getRowType();
             if (rowType instanceof basic_1.StructureType) {
                 for (const c of node.findAllExpressions(Expressions.FieldSub)) {
-                    const concat = c.concatTokens();
+                    const concat = c.concatTokens().replace(/^!/, "");
                     if (concat.includes("-") === false // todo, properly check sub fields
                         && rowType.getComponentByName(concat) === undefined
                         && concat.toUpperCase() !== "TABLE_LINE") {

package/build/src/cds/expressions/cds_condition.js

@@ -6,7 +6,7 @@ const combi_1 = require("../../abap/2_statements/combi");
 class CDSCondition extends combi_1.Expression {
     getRunnable() {
         const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", (0, combi_1.alt)(_1.CDSName, _1.CDSString))));
-        const eq = (0, combi_1.seq)(name, (0, combi_1.alt)("=", "<>", "<", ">", ">=", "<=", "LIKE"), (0, combi_1.alt)(name, _1.CDSFunction, _1.CDSString));
+        const eq = (0, combi_1.seq)(name, (0, combi_1.alt)("=", "<>", "<", ">", ">=", "<=", "LIKE", "NOT LIKE"), (0, combi_1.alt)(name, _1.CDSFunction, _1.CDSString));
         const isInitial = (0, combi_1.seq)(name, "IS INITIAL");
         const isNotInitial = (0, combi_1.seq)(name, "IS NOT INITIAL");
         const isNull = (0, combi_1.seq)(name, "IS NULL");

package/build/src/registry.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.91.33",
+    "version": "2.91.34",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",