@abaplint/core 2.85.2 → 2.85.6

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

@@ -4,7 +4,7 @@ exports.SQLAliasField = void 0;
 const combi_1 = require("../combi");
 class SQLAliasField extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.regex)(/^\w+~\w+$/);
+        return (0, combi_1.regex)(/^(\/\w+\/)?\w+~\w+$/);
     }
 }
 exports.SQLAliasField = SQLAliasField;

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

@@ -10,7 +10,7 @@ class SQLSource extends combi_1.Expression {
         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.altPrio)(_1.SQLAliasField, _1.Source, at);
+        return (0, combi_1.alt)(_1.SQLAliasField, _1.Source, at);
     }
 }
 exports.SQLSource = SQLSource;

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

@@ -10,13 +10,14 @@ class Assign {
         const tableField = (0, combi_1.seq)("TABLE FIELD", (0, combi_1.alt)(expressions_1.Source, expressions_1.Dynamic));
         const arrow = (0, combi_1.alt)((0, combi_1.tok)(tokens_1.InstanceArrow), (0, combi_1.tok)(tokens_1.StaticArrow));
         const source = (0, combi_1.alt)((0, combi_1.seq)(expressions_1.Source, (0, combi_1.opt)((0, combi_1.seq)(arrow, expressions_1.Dynamic))), component, tableField, (0, combi_1.seq)(expressions_1.Dynamic, (0, combi_1.opt)((0, combi_1.seq)(arrow, (0, combi_1.alt)(expressions_1.Field, expressions_1.Dynamic)))));
-        const type = (0, combi_1.seq)("TYPE", (0, combi_1.alt)(expressions_1.Dynamic, expressions_1.Source));
+        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 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);
-        const casting = (0, combi_1.seq)((0, combi_1.opt)("CASTING"), (0, combi_1.opt)((0, combi_1.alt)(like, handle, (0, combi_1.per)(type, decimals))));
-        const ret = (0, combi_1.seq)("ASSIGN", (0, combi_1.opt)((0, combi_1.seq)(expressions_1.Target, "INCREMENT")), source, "TO", expressions_1.FSTarget, casting, (0, combi_1.opt)(range));
+        const casting = (0, combi_1.seq)("CASTING", (0, combi_1.opt)((0, combi_1.alt)(like, handle, (0, combi_1.per)(type, decimals))));
+        const obsoleteType = (0, combi_1.seq)("TYPE", expressions_1.Source, (0, combi_1.optPrio)(decimals));
+        const ret = (0, combi_1.seq)("ASSIGN", (0, combi_1.opt)((0, combi_1.seq)(expressions_1.Target, "INCREMENT")), source, "TO", expressions_1.FSTarget, (0, combi_1.opt)((0, combi_1.altPrio)(casting, obsoleteType)), (0, combi_1.opt)(range));
         return ret;
     }
 }

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

@@ -7,7 +7,7 @@ class ModifyInternal {
     getMatcher() {
         const index = (0, combi_1.seq)("INDEX", expressions_1.Source);
         const from = (0, combi_1.seq)("FROM", expressions_1.Source);
-        const transporting = (0, combi_1.seq)("TRANSPORTING", (0, combi_1.plus)((0, combi_1.alt)(expressions_1.FieldSub, expressions_1.Dynamic)));
+        const transporting = (0, combi_1.seq)("TRANSPORTING", (0, combi_1.plus)((0, combi_1.alt)(expressions_1.ComponentChainSimple, expressions_1.Dynamic)));
         const where = (0, combi_1.seq)("WHERE", expressions_1.ComponentCond);
         const assigning = (0, combi_1.seq)("ASSIGNING", expressions_1.FSTarget);
         const using = (0, combi_1.seq)("USING KEY", expressions_1.SimpleName);

package/build/src/abap/5_syntax/_object_oriented.js

@@ -43,6 +43,13 @@ class ObjectOriented {
                 }
             }
         }
+        const superName = classDefinition.getSuperClass();
+        if (superName !== undefined) {
+            const def = this.scope.findClassDefinition(superName);
+            if (def) {
+                this.addAliasedAttributes(def);
+            }
+        }
     }
     addAliasedTypes(aliases) {
         for (const alias of aliases.getAll()) {
@@ -195,13 +202,14 @@ class ObjectOriented {
         if (def === undefined || name === undefined) {
             return undefined;
         }
+        const upper = name.toUpperCase();
         for (const a of def.getAttributes().getConstants()) {
-            if (a.getName().toUpperCase() === name.toUpperCase()) {
+            if (a.getName().toUpperCase() === upper) {
                 return a;
             }
         }
         for (const a of def.getAliases().getAll()) {
-            if (a.getName().toUpperCase() === name.toUpperCase()) {
+            if (a.getName().toUpperCase() === upper) {
                 const comp = a.getComponent();
                 const res = this.searchConstantName(this.scope.findObjectDefinition(comp.split("~")[0]), comp.split("~")[1]);
                 if (res) {
@@ -209,6 +217,12 @@ class ObjectOriented {
                 }
             }
         }
+        if (name.includes("~")) {
+            const interfaceName = upper.split("~")[0];
+            if (def.getImplementing().some((a) => a.name.toUpperCase() === interfaceName)) {
+                return this.searchConstantName(this.scope.findInterfaceDefinition(interfaceName), name.split("~")[1]);
+            }
+        }
         const sup = def.getSuperClass();
         if (sup) {
             return this.searchConstantName(this.findSuperDefinition(sup), name);

package/build/src/registry.js

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

package/package.json

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