@abaplint/core 2.82.6 → 2.82.10

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

@@ -524,39 +524,52 @@ class BasicTypes {
         return foundType;
     }
     resolveConstantValue(expr) {
-        var _a;
+        var _a, _b;
         if (!(expr.get() instanceof Expressions.SimpleFieldChain)) {
             throw new Error("resolveConstantValue");
         }
-        const first = expr.getFirstChild();
-        if (first.get() instanceof Expressions.Field) {
-            const token = first.getFirstToken();
-            const name = token.getStr();
-            const found = this.scope.findVariable(name);
+        const firstNode = expr.getFirstChild();
+        const firstToken = firstNode.getFirstToken();
+        const firstName = firstToken.getStr();
+        if (firstNode.get() instanceof Expressions.Field) {
+            const found = this.scope.findVariable(firstName);
             const val = found === null || found === void 0 ? void 0 : found.getValue();
             if (typeof val === "string") {
-                this.scope.addReference(token, found, _reference_1.ReferenceType.DataReadReference, this.filename);
+                this.scope.addReference(firstToken, found, _reference_1.ReferenceType.DataReadReference, this.filename);
                 return val;
             }
             return undefined;
         }
-        else if (first.get() instanceof Expressions.ClassName) {
-            const name = first.getFirstToken().getStr();
-            const obj = this.scope.findObjectDefinition(name);
+        else if (firstNode.get() instanceof Expressions.ClassName
+            && firstName.toLowerCase() === this.scope.getName().toLowerCase()
+            && (this.scope.getType() === _scope_type_1.ScopeType.Interface
+                || this.scope.getType() === _scope_type_1.ScopeType.ClassDefinition)) {
+            const children = expr.getChildren();
+            const token = (_a = children[2]) === null || _a === void 0 ? void 0 : _a.getFirstToken();
+            const found = this.scope.findVariable(token.getStr());
+            const val = found === null || found === void 0 ? void 0 : found.getValue();
+            if (typeof val === "string") {
+                this.scope.addReference(firstToken, found, _reference_1.ReferenceType.DataReadReference, this.filename);
+                return val;
+            }
+            return undefined;
+        }
+        else if (firstNode.get() instanceof Expressions.ClassName) {
+            const obj = this.scope.findObjectDefinition(firstName);
             if (obj === undefined) {
-                if (this.scope.existsObject(name).found === true) {
+                if (this.scope.existsObject(firstName).found === true) {
                     return undefined;
                 }
-                else if (this.scope.getDDIC().inErrorNamespace(name) === true) {
-                    throw new Error("resolveConstantValue, not found: " + name);
+                else if (this.scope.getDDIC().inErrorNamespace(firstName) === true) {
+                    throw new Error("resolveConstantValue, not found: " + firstName);
                 }
                 else {
-                    this.scope.addReference(first.getFirstToken(), undefined, _reference_1.ReferenceType.ObjectOrientedVoidReference, this.filename, { ooName: name.toUpperCase() });
+                    this.scope.addReference(firstNode.getFirstToken(), undefined, _reference_1.ReferenceType.ObjectOrientedVoidReference, this.filename, { ooName: firstName.toUpperCase() });
                     return undefined;
                 }
             }
             const children = expr.getChildren();
-            const token = (_a = children[2]) === null || _a === void 0 ? void 0 : _a.getFirstToken();
+            const token = (_b = children[2]) === null || _b === void 0 ? void 0 : _b.getFirstToken();
             const attr = token.getStr();
             const c = new _object_oriented_1.ObjectOriented(this.scope).searchConstantName(obj, attr);
             if (c instanceof class_constant_1.ClassConstant) {

package/build/src/abap/5_syntax/global_definitions/find_global_definitions.js

@@ -60,7 +60,6 @@ class FindGlobalDefinitions {
         if (def === undefined) {
             return 1;
         }
-        // todo, count constants
         let count = 0;
         for (const t of def.getTypeDefinitions().getAll()) {
             count = count + this.count(t.type.getType());
@@ -68,6 +67,9 @@ class FindGlobalDefinitions {
         for (const a of def.getAttributes().getAll()) {
             count = count + this.count(a.getType());
         }
+        for (const a of def.getAttributes().getConstants()) {
+            count = count + this.count(a.getType());
+        }
         for (const m of def.getMethodDefinitions().getAll()) {
             for (const p of m.getParameters().getAll()) {
                 count = count + this.count(p.getType());

package/build/src/objects/table.js

@@ -146,6 +146,12 @@ class Table extends _abstract_object_1.AbstractObject {
                         type: new basic_1.DataReference(new basic_1.AnyType())
                     });
                 }
+                else if (field.ROLLNAME === "OBJECT") {
+                    components.push({
+                        name: field.FIELDNAME,
+                        type: new basic_1.GenericObjectReferenceType()
+                    });
+                }
                 else {
                     const lookup = ddic.lookupObject(field.ROLLNAME);
                     components.push({ name: field.FIELDNAME, type: lookup.type });

package/build/src/objects/table_type.js

@@ -4,6 +4,7 @@ exports.TableType = void 0;
 const _abstract_object_1 = require("./_abstract_object");
 const Types = require("../abap/types/basic");
 const ddic_1 = require("../ddic");
+const basic_1 = require("../abap/types/basic");
 class TableType extends _abstract_object_1.AbstractObject {
     constructor() {
         super(...arguments);
@@ -55,6 +56,9 @@ class TableType extends _abstract_object_1.AbstractObject {
                 references.push({ object: lookup.object });
             }
         }
+        else if (this.parsedXML.rowkind === "R" && this.parsedXML.rowtype === "OBJECT") {
+            type = new Types.TableType(new basic_1.GenericObjectReferenceType(), { withHeader: false }, this.getName());
+        }
         else if (this.parsedXML.rowkind === "R" && this.parsedXML.rowtype !== undefined) {
             const lookup = ddic.lookupObject(this.parsedXML.rowtype);
             type = new Types.TableType(lookup.type, { withHeader: false }, this.getName());

package/build/src/registry.js

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

package/package.json

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