@abaplint/core 2.85.8 → 2.85.9

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

@@ -313,13 +313,19 @@ class StarPrioroity {
             res = this.sta.run(res);
             if (res.length === 0) {
                 if (prev !== undefined) {
-                    result = prev;
+                    //          console.log("star length: " + prev.length);
+                    let best = Number.MAX_SAFE_INTEGER;
+                    for (const p of prev) {
+                        if (p.remainingLength() < best) {
+                            result = [p];
+                            best = p.remainingLength();
+                        }
+                    }
                 }
                 break;
             }
             prev = res;
         }
-        //    console.dir(result);
         return result;
     }
     railroad() {
@@ -401,13 +407,17 @@ class Sequence {
         const result = [];
         for (const input of r) {
             let temp = [input];
+            let match = true;
             for (const sequence of this.list) {
                 temp = sequence.run(temp);
                 if (temp.length === 0) {
+                    match = false;
                     break;
                 }
             }
-            result.push(...temp);
+            if (match === true) {
+                result.push(...temp);
+            }
         }
         return result;
     }
@@ -702,7 +712,13 @@ class Combi {
         this.ver = version;
         const input = new result_1.Result(tokens, 0);
         const result = runnable.run([input]);
-        //    console.log("res: " + result.length);
+        /*
+            console.log("res: " + result.length);
+            for (const res of result) {
+              console.dir(res.getNodes().map(n => n.get().constructor.name));
+              console.dir(res.getNodes().map(n => n.concatTokens()));
+            }
+        */
         for (const res of result) {
             if (res.remainingLength() === 0) {
                 return res.getNodes();

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

@@ -5,7 +5,7 @@ const combi_1 = require("../combi");
 const _1 = require(".");
 class SimpleSource3 extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.alt)(_1.Constant, _1.TextElement, _1.FieldChain);
+        return (0, combi_1.altPrio)(_1.Constant, _1.TextElement, _1.FieldChain);
     }
 }
 exports.SimpleSource3 = SimpleSource3;

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

@@ -8,7 +8,7 @@ const field_chain_1 = require("./field_chain");
 class SQLCDSParameters extends combi_1.Expression {
     getRunnable() {
         const param = (0, combi_1.seq)(_1.Field, "=", (0, combi_1.alt)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), field_chain_1.FieldChain), _1.Constant));
-        return (0, combi_1.seq)("(", param, (0, combi_1.star)((0, combi_1.seq)(",", param)), ")");
+        return (0, combi_1.seq)("(", param, (0, combi_1.starPrio)((0, combi_1.seq)(",", param)), ")");
     }
 }
 exports.SQLCDSParameters = SQLCDSParameters;

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

@@ -10,15 +10,15 @@ class SQLCompare extends combi_1.Expression {
         const val = new _1.SQLSource();
         const list = (0, combi_1.seq)((0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenLeft), (0, combi_1.tok)(tokens_1.WParenLeftW)), val, (0, combi_1.starPrio)((0, combi_1.seq)(",", val)), ")");
         const subSelect = (0, combi_1.seq)("(", _1.Select, ")");
-        const inn = (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), "IN", (0, combi_1.altPrio)(_1.SQLSource, list, subSelect));
-        const between = (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), "BETWEEN", _1.SQLSource, "AND", _1.SQLSource);
-        const like = (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), "LIKE", _1.SQLSource, (0, combi_1.optPrio)((0, combi_1.seq)("ESCAPE", _1.SQLSource)));
-        const nul = (0, combi_1.seq)("IS", (0, combi_1.optPrio)("NOT"), (0, combi_1.alt)("NULL", (0, combi_1.ver)(version_1.Version.v753, "INITIAL")));
+        const inn = (0, combi_1.seq)("IN", (0, combi_1.altPrio)(_1.SQLSource, list, subSelect));
+        const between = (0, combi_1.seq)("BETWEEN", _1.SQLSource, "AND", _1.SQLSource);
+        const like = (0, combi_1.seq)("LIKE", _1.SQLSource, (0, combi_1.optPrio)((0, combi_1.seq)("ESCAPE", _1.SQLSource)));
+        const nul = (0, combi_1.seq)("IS", (0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)("NULL", (0, combi_1.ver)(version_1.Version.v753, "INITIAL")));
         const source = new _1.SQLSource();
         const sub = (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("ALL", "ANY", "SOME")), subSelect);
-        const builtin = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)((0, combi_1.alt)("lower", "upper"), (0, combi_1.tok)(tokens_1.ParenLeftW), _1.SQLFieldName, (0, combi_1.tok)(tokens_1.WParenRightW)));
-        const arith = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)(_1.SQLFieldName, (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/"), _1.SQLFieldName))));
-        const rett = (0, combi_1.seq)((0, combi_1.altPrio)(builtin, arith, _1.SQLFieldName), (0, combi_1.altPrio)((0, combi_1.seq)(_1.SQLCompareOperator, (0, combi_1.altPrio)(sub, source)), inn, like, between, nul));
+        const builtin = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)((0, combi_1.altPrio)("lower", "upper"), (0, combi_1.tok)(tokens_1.ParenLeftW), _1.SQLFieldName, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const arith = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.plusPrio)((0, combi_1.seq)((0, combi_1.altPrio)("+", "-", "*", "/"), _1.SQLFieldName)));
+        const rett = (0, combi_1.seq)((0, combi_1.altPrio)(builtin, (0, combi_1.seq)(_1.SQLFieldName, (0, combi_1.optPrio)(arith))), (0, combi_1.altPrio)((0, combi_1.seq)(_1.SQLCompareOperator, (0, combi_1.altPrio)(sub, source)), (0, combi_1.seq)((0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)(inn, like, between)), nul));
         const exists = (0, combi_1.seq)("EXISTS", subSelect);
         return (0, combi_1.altPrio)(exists, _1.Dynamic, rett);
     }

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

@@ -11,7 +11,7 @@ class SQLFromSource extends combi_1.Expression {
         // https://help.sap.com/doc/abapdocu_752_index_htm/7.52/en-US/abennews-752-open_sql.htm#!ABAP_MODIFICATION_1@1@
         const tab = (0, combi_1.ver)(version_1.Version.v752, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), _1.FieldChain));
         const aas = (0, combi_1.seq)("AS", _1.SQLAsName);
-        return (0, combi_1.seq)((0, combi_1.altPrio)(_1.Dynamic, with_name_1.WithName, (0, combi_1.seq)(_1.DatabaseTable, (0, combi_1.optPrio)(_1.SQLCDSParameters)), tab), (0, combi_1.optPrio)((0, combi_1.ver)(version_1.Version.v752, "WITH PRIVILEGED ACCESS")), (0, combi_1.optPrio)(aas));
+        return (0, combi_1.seq)((0, combi_1.altPrio)(with_name_1.WithName, (0, combi_1.seq)(_1.DatabaseTable, (0, combi_1.optPrio)(_1.SQLCDSParameters)), tab), (0, combi_1.optPrio)((0, combi_1.ver)(version_1.Version.v752, "WITH PRIVILEGED ACCESS")), (0, combi_1.optPrio)(aas));
     }
 }
 exports.SQLFromSource = SQLFromSource;

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

@@ -8,9 +8,8 @@ const _1 = require(".");
 class SQLSource extends combi_1.Expression {
     getRunnable() {
         const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), _1.Source, (0, combi_1.tok)(tokens_1.WParenRightW));
-        // todo, this Source must be a simple field?
-        const at = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), (0, combi_1.altPrio)(_1.Source, paren)));
-        return (0, combi_1.alt)(_1.SQLAliasField, _1.Source, at);
+        const at = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), (0, combi_1.altPrio)(_1.SimpleSource3, paren)));
+        return (0, combi_1.alt)(_1.SQLAliasField, _1.SimpleSource3, at);
     }
 }
 exports.SQLSource = SQLSource;

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

@@ -5,12 +5,12 @@ const combi_1 = require("../combi");
 const version_1 = require("../../../version");
 const tokens_1 = require("../../1_lexer/tokens");
 const _1 = require(".");
-const constant_string_1 = require("./constant_string");
+// todo, delete this expression, its the same as SQLSource?
 class SQLSourceSimple extends combi_1.Expression {
     getRunnable() {
         const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), _1.Source, (0, combi_1.tok)(tokens_1.WParenRightW));
-        const at = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), (0, combi_1.alt)(_1.FieldChain, paren)));
-        return (0, combi_1.alt)(_1.FieldChain, at, constant_string_1.ConstantString);
+        const at = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), (0, combi_1.alt)(_1.SimpleSource3, paren)));
+        return (0, combi_1.alt)(_1.SimpleSource3, at);
     }
 }
 exports.SQLSourceSimple = SQLSourceSimple;

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

@@ -45,6 +45,9 @@ class Select {
         for (const s of node.findAllExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }
+        for (const s of node.findAllExpressions(Expressions.SimpleSource3)) {
+            new source_1.Source().runSyntax(s, scope, filename);
+        }
         if (scope.getType() === _scope_type_1.ScopeType.OpenSQL) {
             scope.pop(node.getLastToken().getEnd());
         }

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

@@ -6,7 +6,10 @@ const source_1 = require("./source");
 const basic_1 = require("../../types/basic");
 class SQLForAllEntries {
     runSyntax(node, scope, filename) {
-        const s = node.findFirstExpression(Expressions.Source);
+        let s = node.findFirstExpression(Expressions.Source);
+        if (s === undefined) {
+            s = node.findFirstExpression(Expressions.SimpleSource3);
+        }
         if (s) {
             const type = new source_1.Source().runSyntax(s, scope, filename);
             if (type instanceof basic_1.VoidType) {

package/build/src/abap/5_syntax/statements/create_data.js

@@ -5,6 +5,7 @@ const Expressions = require("../../2_statements/expressions");
 const target_1 = require("../expressions/target");
 const source_1 = require("../expressions/source");
 const dynamic_1 = require("../expressions/dynamic");
+const basic_types_1 = require("../basic_types");
 class CreateData {
     runSyntax(node, scope, filename) {
         for (const s of node.findDirectExpressions(Expressions.Source)) {
@@ -16,6 +17,10 @@ class CreateData {
         for (const t of node.findDirectExpressions(Expressions.Dynamic)) {
             new dynamic_1.Dynamic().runSyntax(t, scope, filename);
         }
+        const type = node.findDirectExpression(Expressions.TypeName);
+        if (type) {
+            new basic_types_1.BasicTypes(filename, scope).resolveTypeName(type);
+        }
     }
 }
 exports.CreateData = CreateData;

package/build/src/abap/5_syntax/statements/delete_database.js

@@ -10,6 +10,9 @@ class DeleteDatabase {
         for (const s of node.findAllExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }
+        for (const s of node.findAllExpressions(Expressions.SimpleSource3)) {
+            new source_1.Source().runSyntax(s, scope, filename);
+        }
         for (const d of node.findAllExpressions(Expressions.Dynamic)) {
             new dynamic_1.Dynamic().runSyntax(d, scope, filename);
         }

package/build/src/abap/5_syntax/statements/insert_database.js

@@ -10,6 +10,9 @@ class InsertDatabase {
         for (const s of node.findAllExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }
+        for (const s of node.findAllExpressions(Expressions.SimpleSource3)) {
+            new source_1.Source().runSyntax(s, scope, filename);
+        }
         for (const d of node.findAllExpressions(Expressions.Dynamic)) {
             new dynamic_1.Dynamic().runSyntax(d, scope, filename);
         }

package/build/src/abap/5_syntax/statements/modify_database.js

@@ -4,6 +4,7 @@ exports.ModifyDatabase = void 0;
 const Expressions = require("../../2_statements/expressions");
 const dynamic_1 = require("../expressions/dynamic");
 const database_table_1 = require("../expressions/database_table");
+const source_1 = require("../expressions/source");
 class ModifyDatabase {
     runSyntax(node, scope, filename) {
         for (const d of node.findAllExpressions(Expressions.Dynamic)) {
@@ -13,6 +14,12 @@ class ModifyDatabase {
         if (dbtab !== undefined) {
             new database_table_1.DatabaseTable().runSyntax(dbtab, scope, filename);
         }
+        for (const s of node.findAllExpressions(Expressions.Source)) {
+            new source_1.Source().runSyntax(s, scope, filename);
+        }
+        for (const s of node.findAllExpressions(Expressions.SimpleSource3)) {
+            new source_1.Source().runSyntax(s, scope, filename);
+        }
     }
 }
 exports.ModifyDatabase = ModifyDatabase;

package/build/src/abap/5_syntax/statements/update_database.js

@@ -32,6 +32,9 @@ class UpdateDatabase {
         for (const s of node.findAllExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }
+        for (const s of node.findAllExpressions(Expressions.SimpleSource3)) {
+            new source_1.Source().runSyntax(s, scope, filename);
+        }
         for (const d of node.findAllExpressions(Expressions.Dynamic)) {
             new dynamic_1.Dynamic().runSyntax(d, scope, filename);
         }

package/build/src/registry.js

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

package/build/src/rules/sql_escape_host_variables.js

@@ -73,7 +73,8 @@ class SQLEscapeHostVariables extends _abap_rule_1.ABAPRule {
                 }
                 for (const o of s.findAllExpressions(Expressions.SQLSource)) {
                     const first = o.getFirstChild();
-                    if ((first === null || first === void 0 ? void 0 : first.get()) instanceof Expressions.Source && first.getChildren()[0].get() instanceof Expressions.FieldChain) {
+                    if (((first === null || first === void 0 ? void 0 : first.get()) instanceof Expressions.Source && first.getChildren()[0].get() instanceof Expressions.FieldChain)
+                        || ((first === null || first === void 0 ? void 0 : first.get()) instanceof Expressions.SimpleSource3 && first.getChildren()[0].get() instanceof Expressions.FieldChain)) {
                         const message = "Escape SQL host variables";
                         const issue = issue_1.Issue.atToken(file, first.getFirstToken(), message, this.getMetadata().key, this.conf.severity);
                         issues.push(issue);

package/package.json

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