@abaplint/core 2.85.4 → 2.85.8

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

@@ -8,9 +8,10 @@ class MethodSource extends combi_1.Expression {
     getRunnable() {
         const mname = (0, combi_1.alt)(_1.MethodName, _1.Dynamic);
         const cname = (0, combi_1.alt)(_1.FieldChain, _1.MethodCallChain, _1.Dynamic);
-        const stati = (0, combi_1.seq)(_1.ClassName, (0, combi_1.tok)(tokens_1.StaticArrow));
+        // this is a bit tricky, this part is required as FieldChain takes a AttributeName
+        const stati = (0, combi_1.seq)(_1.ClassName, (0, combi_1.tok)(tokens_1.StaticArrow), mname);
         const part1 = (0, combi_1.seq)(cname, (0, combi_1.alt)((0, combi_1.tok)(tokens_1.InstanceArrow), (0, combi_1.tok)(tokens_1.StaticArrow)));
-        return (0, combi_1.seq)((0, combi_1.optPrio)(stati), (0, combi_1.starPrio)(part1), mname);
+        return (0, combi_1.alt)(stati, (0, combi_1.seq)((0, combi_1.starPrio)(part1), mname));
     }
 }
 exports.MethodSource = MethodSource;

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()) {

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

@@ -53,8 +53,8 @@ class TypeUtils {
     }
     static isAssignable(source, target) {
         /*
-            console.dir(source);
-            console.dir(target);
+        console.dir(source);
+        console.dir(target);
         */
         if (target instanceof basic_1.TableType) {
             if (target.isWithHeader()) {
@@ -103,7 +103,8 @@ class TypeUtils {
             }
             return false;
         }
-        else if (target instanceof basic_1.IntegerType) {
+        else if (target instanceof basic_1.IntegerType
+            || target instanceof basic_1.StringType) {
             if (source instanceof basic_1.DataReference
                 || source instanceof basic_1.ObjectReferenceType
                 || source instanceof basic_1.GenericObjectReferenceType

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

@@ -70,6 +70,9 @@ class FieldChain {
                 context = new dereference_1.Dereference().runSyntax(context);
             }
             else if (current.get() instanceof Expressions.ComponentName) {
+                if (context instanceof basic_1.TableType && context.isWithHeader()) {
+                    context = context.getRowType();
+                }
                 context = new component_name_1.ComponentName().runSyntax(context, current);
             }
             else if (current instanceof nodes_1.ExpressionNode

package/build/src/registry.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.85.4",
+    "version": "2.85.8",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -48,7 +48,7 @@
         "@microsoft/api-extractor": "^7.19.4",
         "@types/chai": "^4.3.0",
         "@types/mocha": "^9.1.0",
-        "@types/node": "^17.0.13",
+        "@types/node": "^17.0.14",
         "chai": "^4.3.6",
         "eslint": "^8.8.0",
         "mocha": "^9.2.0",