@abaplint/core 2.89.10 → 2.89.13

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

@@ -34,7 +34,7 @@ class Cast {
                 throw new Error("Type \"" + typeName + "\" not found in scope, Cast");
             }
             else {
-                tt = new basic_1.ObjectReferenceType(found);
+                tt = new basic_1.ObjectReferenceType(found, typeName);
             }
         }
         new source_1.Source().addIfInferred(node, scope, filename, tt);

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

@@ -8,11 +8,17 @@ const inline_field_definition_1 = require("./inline_field_definition");
 const unknown_type_1 = require("../../types/basic/unknown_type");
 const _scope_type_1 = require("../_scope_type");
 const reduce_next_1 = require("./reduce_next");
+const let_1 = require("./let");
 class ReduceBody {
     runSyntax(node, scope, filename) {
         if (node === undefined) {
             return;
         }
+        let scoped = false;
+        const letNode = node.findDirectExpression(Expressions.Let);
+        if (letNode) {
+            scoped = new let_1.Let().runSyntax(letNode, scope, filename);
+        }
         for (const i of node.findDirectExpressions(Expressions.InlineFieldDefinition)) {
             new inline_field_definition_1.InlineFieldDefinition().runSyntax(i, scope, filename);
         }
@@ -25,6 +31,9 @@ class ReduceBody {
         for (const s of node.findDirectExpressions(Expressions.ReduceNext)) {
             new reduce_next_1.ReduceNext().runSyntax(s, scope, filename);
         }
+        if (scoped === true) {
+            scope.pop(node.getLastToken().getEnd());
+        }
         while (scope.getType() === _scope_type_1.ScopeType.For) {
             scope.pop(node.getLastToken().getEnd());
         }

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

@@ -124,6 +124,9 @@ class Source {
                         if (foundType === undefined || foundType.isGeneric()) {
                             this.addIfInferred(node, scope, filename, bodyType);
                         }
+                        else {
+                            this.addIfInferred(node, scope, filename, foundType);
+                        }
                         return foundType ? foundType : bodyType;
                     }
                 default:

package/build/src/abap/5_syntax/structures/type_enum.js

@@ -8,6 +8,7 @@ const basic_1 = require("../../types/basic");
 const _typed_identifier_1 = require("../../types/_typed_identifier");
 const _reference_1 = require("../_reference");
 const enum_type_1 = require("../../types/basic/enum_type");
+const _scope_type_1 = require("../_scope_type");
 class TypeEnum {
     runSyntax(node, scope, filename) {
         var _a;
@@ -48,7 +49,12 @@ class TypeEnum {
         }
         const name = begin.findFirstExpression(Expressions.NamespaceSimpleName);
         if (name) {
-            const id = new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), filename, new enum_type_1.EnumType(), ["enum" /* Enum */]);
+            let qualifiedName = name.concatTokens();
+            if (scope.getType() === _scope_type_1.ScopeType.ClassDefinition
+                || scope.getType() === _scope_type_1.ScopeType.Interface) {
+                qualifiedName = scope.getName() + "=>" + qualifiedName;
+            }
+            const id = new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), filename, new enum_type_1.EnumType(qualifiedName), ["enum" /* Enum */]);
             scope.addType(id);
             types.push(id);
         }

package/build/src/abap/types/basic/enum_type.js

@@ -10,7 +10,7 @@ class EnumType extends _abstract_type_1.AbstractType {
         return false;
     }
     toABAP() {
-        return "enum";
+        return this.getQualifiedName() || "enum";
     }
     containsVoid() {
         return false;

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -1305,7 +1305,7 @@ ${indentation}    output = ${topTarget}.`;
         }
         return ret;
     }
-    findType(i, lowFile, highSyntax) {
+    findType(i, lowFile, highSyntax, ref = false) {
         var _a;
         const expr = i.findDirectExpression(Expressions.TypeNameOrInfer);
         if (expr === undefined) {
@@ -1314,7 +1314,7 @@ ${indentation}    output = ${topTarget}.`;
         const firstToken = expr.getFirstToken();
         const concat = expr.concatTokens().toLowerCase();
         if (concat !== "#") {
-            return concat;
+            return ref ? "REF TO " + concat : concat;
         }
         const spag = highSyntax.spaghetti.lookupPosition(firstToken.getStart(), lowFile.getFilename());
         if (spag === undefined) {
@@ -1333,7 +1333,12 @@ ${indentation}    output = ${topTarget}.`;
         if (inferred === undefined) {
             return undefined;
         }
-        return (_a = inferred.getType().getQualifiedName()) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+        if (inferred.getType() instanceof basic_1.ObjectReferenceType) {
+            return inferred.getType().toABAP();
+        }
+        else {
+            return (_a = inferred.getType().getQualifiedName()) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+        }
     }
     outlineFS(node, lowFile, highSyntax) {
         var _a, _b;
@@ -1519,9 +1524,9 @@ ${indentation}    output = ${topTarget}.`;
         var _a;
         for (const i of node.findAllExpressionsRecursive(Expressions.Cast)) {
             const uniqueName = this.uniqueName(i.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
-            const type = this.findType(i, lowFile, highSyntax);
+            const type = this.findType(i, lowFile, highSyntax, true);
             const body = (_a = i.findDirectExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.concatTokens();
-            const abap = `DATA ${uniqueName} TYPE REF TO ${type}.\n` +
+            const abap = `DATA ${uniqueName} TYPE ${type}.\n` +
                 " ".repeat(node.getFirstToken().getStart().getCol() - 1) +
                 `${uniqueName} ?= ${body}.\n` +
                 " ".repeat(node.getFirstToken().getStart().getCol() - 1);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.89.10",
+    "version": "2.89.13",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -48,14 +48,14 @@
         "@microsoft/api-extractor": "^7.23.0",
         "@types/chai": "^4.3.1",
         "@types/mocha": "^9.1.1",
-        "@types/node": "^17.0.27",
+        "@types/node": "^17.0.30",
         "chai": "^4.3.6",
         "eslint": "^8.14.0",
         "mocha": "^9.2.2",
         "c8": "^7.11.2",
         "source-map-support": "^0.5.21",
         "ts-json-schema-generator": "^1.0.0",
-        "typescript": "^4.6.3"
+        "typescript": "^4.6.4"
     },
     "dependencies": {
         "fast-xml-parser": "^4.0.7",