@abaplint/core 2.84.2 → 2.84.3

package/build/abaplint.d.ts

@@ -1155,6 +1155,7 @@ export declare class CurrentScope {
     getType(): ScopeType;
     push(stype: ScopeType, sname: string, start: Position, filename: string): void;
     isOO(): boolean;
+    isTypePool(): boolean;
     setAllowHeaderUse(name: string): void;
     isAllowHeaderUse(name: string): boolean;
     pop(end: Position): SpaghettiScope;
@@ -1286,7 +1287,7 @@ declare class DataEnd implements IStatement {
 
 declare class DataReference extends AbstractType {
     private readonly type;
-    constructor(type: AbstractType, name?: string);
+    constructor(type: AbstractType, qualifiedName?: string);
     toText(level: number): string;
     getType(): AbstractType;
     toABAP(): string;
@@ -1307,7 +1308,7 @@ declare class DDIC {
     private readonly reg;
     constructor(reg: IRegistry);
     isException(def: InfoClassDefinition | undefined, _obj: ABAPObject): boolean;
-    lookupBuiltinType(name: string, length?: number, decimals?: number): AbstractType | undefined;
+    lookupBuiltinType(name: string, length?: number, decimals?: number, qualifiedName?: string): AbstractType | undefined;
     inErrorNamespace(name: string | undefined): boolean;
     lookupObject(name: string): ILookupResult;
     lookupNoVoid(name: string): ILookupResult | undefined;
@@ -4531,6 +4532,7 @@ export declare enum ScopeType {
     Dummy = "_dummy",
     Global = "_global",
     Program = "_program",
+    TypePool = "_type_pool",
     FunctionGroup = "_function_group",
     ClassDefinition = "class_definition",
     Interface = "interface",

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

@@ -206,6 +206,7 @@ class CurrentScope {
         return undefined;
     }
     findTypePoolConstant(name) {
+        var _a;
         if (name === undefined || name.includes("_") === undefined) {
             return undefined;
         }
@@ -214,12 +215,12 @@ class CurrentScope {
         if (typePool === undefined) {
             return undefined;
         }
-        const spag = new syntax_1.SyntaxLogic(this.reg, typePool).run().spaghetti.getFirstChild();
+        const spag = (_a = new syntax_1.SyntaxLogic(this.reg, typePool).run().spaghetti.getFirstChild()) === null || _a === void 0 ? void 0 : _a.getFirstChild();
         const found = spag === null || spag === void 0 ? void 0 : spag.findVariable(name);
         return found;
     }
     findTypePoolType(name) {
-        var _a;
+        var _a, _b;
         if (name.includes("_") === undefined) {
             return undefined;
         }
@@ -228,8 +229,8 @@ class CurrentScope {
         if (typePool === undefined) {
             return undefined;
         }
-        const spag = new syntax_1.SyntaxLogic(this.reg, typePool).run().spaghetti.getFirstChild();
-        const found = (_a = spag === null || spag === void 0 ? void 0 : spag.findType(name)) === null || _a === void 0 ? void 0 : _a.getType();
+        const spag = (_a = new syntax_1.SyntaxLogic(this.reg, typePool).run().spaghetti.getFirstChild()) === null || _a === void 0 ? void 0 : _a.getFirstChild();
+        const found = (_b = spag === null || spag === void 0 ? void 0 : spag.findType(name)) === null || _b === void 0 ? void 0 : _b.getType();
         return found;
     }
     /** Lookup interface in local and global scope */
@@ -321,6 +322,10 @@ class CurrentScope {
         }
         return false;
     }
+    isTypePool() {
+        var _a;
+        return ((_a = this.current) === null || _a === void 0 ? void 0 : _a.getIdentifier().filename.endsWith(".type.abap")) === true || false;
+    }
     setAllowHeaderUse(name) {
         // workaround for SELECT FOR ALL ENTRIES
         this.allowHeaderUse = name;

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

@@ -7,6 +7,7 @@ var ScopeType;
     ScopeType["Dummy"] = "_dummy";
     ScopeType["Global"] = "_global";
     ScopeType["Program"] = "_program";
+    ScopeType["TypePool"] = "_type_pool";
     ScopeType["FunctionGroup"] = "_function_group";
     ScopeType["ClassDefinition"] = "class_definition";
     ScopeType["Interface"] = "interface";

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

@@ -140,7 +140,7 @@ class BasicTypes {
         }
         return type;
     }
-    resolveTypeName(typeName, length, decimals) {
+    resolveTypeName(typeName, length, decimals, name) {
         if (typeName === undefined) {
             return undefined;
         }
@@ -149,7 +149,7 @@ class BasicTypes {
             return chain;
         }
         const chainText = typeName.concatTokens().toUpperCase();
-        const f = this.scope.getDDIC().lookupBuiltinType(chainText, length, decimals);
+        const f = this.scope.getDDIC().lookupBuiltinType(chainText, length, decimals, name);
         if (f !== undefined) {
             return f;
         }
@@ -196,7 +196,7 @@ class BasicTypes {
         if (nameExpr.countTokens() > 1) { // workaround for names with dashes
             name = new identifier_1.Identifier(name.getStart(), nameExpr.concatTokens());
         }
-        const found = this.parseType(node);
+        const found = this.parseType(node, this.scope.isTypePool() ? name.getStr() : undefined);
         if (found) {
             return new _typed_identifier_1.TypedIdentifier(name, this.filename, found);
         }
@@ -344,7 +344,7 @@ class BasicTypes {
             if (type === undefined) {
                 return new Types.UnknownType("Type error, could not resolve \"" + name + "\", parseType");
             }
-            return new Types.DataReference(type);
+            return new Types.DataReference(type, name);
         }
         else if (text === "TYPE STANDARD TABLE"
             || text === "TYPE SORTED TABLE"
@@ -392,7 +392,7 @@ class BasicTypes {
             found = this.resolveTypeRef(typename);
         }
         else if (text.startsWith("TYPE")) {
-            found = this.resolveTypeName(typename, this.findLength(node), this.findDecimals(node));
+            found = this.resolveTypeName(typename, this.findLength(node), this.findDecimals(node), name);
             const concat = node.concatTokens().toUpperCase();
             if (found && concat.includes(" OCCURS ")) {
                 found = new Types.TableType(found, { withHeader: concat.includes("WITH HEADER LINE") }, name);

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

@@ -297,6 +297,12 @@ class SyntaxLogic {
                 this.scope.push(stype, this.object.getName(), new position_1.Position(1, 1), main.getFilename());
             }
         }
+        else if (this.object instanceof objects_1.TypePool) {
+            const main = this.object.getMainABAPFile();
+            if (main !== undefined) {
+                this.scope.push(_scope_type_1.ScopeType.TypePool, this.object.getName(), new position_1.Position(1, 1), main.getFilename());
+            }
+        }
         for (const file of traversal) {
             this.currentFile = file;
             const structure = this.currentFile.getStructure();

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

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataReference = void 0;
 const _abstract_type_1 = require("./_abstract_type");
 class DataReference extends _abstract_type_1.AbstractType {
-    constructor(type, name) {
-        super(name);
+    constructor(type, qualifiedName) {
+        super(qualifiedName);
         this.type = type;
     }
     toText(level) {

package/build/src/ddic.js

@@ -43,7 +43,7 @@ class DDIC {
         const isException = ((superClassName === null || superClassName === void 0 ? void 0 : superClassName.match(/^.?cx_.*$/i)) || (superClassName === null || superClassName === void 0 ? void 0 : superClassName.match(/^\/.+\/cx_.*$/i))) ? true : false;
         return isException;
     }
-    lookupBuiltinType(name, length, decimals) {
+    lookupBuiltinType(name, length, decimals, qualifiedName) {
         switch (name) {
             case "STRING":
                 return new Types.StringType(name);
@@ -54,31 +54,31 @@ class DDIC {
             case "T":
                 return new Types.TimeType(name);
             case "XSEQUENCE":
-                return new Types.XSequenceType();
+                return new Types.XSequenceType(qualifiedName);
             case "CLIKE":
-                return new Types.CLikeType();
+                return new Types.CLikeType(qualifiedName);
             case "DECFLOAT":
-                return new Types.DecFloatType();
+                return new Types.DecFloatType(qualifiedName);
             case "ANY":
-                return new Types.AnyType();
+                return new Types.AnyType(qualifiedName);
             case "SIMPLE":
-                return new Types.SimpleType();
+                return new Types.SimpleType(qualifiedName);
             case "%_C_POINTER":
-                return new Types.HexType(8);
+                return new Types.HexType(8, qualifiedName);
             case "TABLE":
                 return new Types.TableType(new Types.AnyType(), { withHeader: false });
             case "DATA":
-                return new Types.AnyType();
+                return new Types.AnyType(qualifiedName);
             case "NUMERIC":
-                return new Types.NumericGenericType();
+                return new Types.NumericGenericType(qualifiedName);
             case "UTCLONG": // todo, take version into account
-                return new Types.UTCLongType();
+                return new Types.UTCLongType(qualifiedName);
             case "DECFLOAT16":
-                return new Types.DecFloat16Type();
+                return new Types.DecFloat16Type(qualifiedName);
             case "DECFLOAT34":
-                return new Types.DecFloat34Type();
+                return new Types.DecFloat34Type(qualifiedName);
             case "CSEQUENCE":
-                return new Types.CSequenceType();
+                return new Types.CSequenceType(qualifiedName);
             case "I":
             case "INT8": // todo, take version into account
                 return new Types.IntegerType(name);
@@ -86,34 +86,34 @@ class DDIC {
                 return new Types.FloatType(name);
             case "P":
                 if (length && decimals) {
-                    return new Types.PackedType(length, decimals);
+                    return new Types.PackedType(length, decimals, qualifiedName);
                 }
                 else if (length) {
-                    return new Types.PackedType(length, 0);
+                    return new Types.PackedType(length, 0, qualifiedName);
                 }
                 else {
-                    return new Types.PackedType(1, 0);
+                    return new Types.PackedType(1, 0, qualifiedName);
                 }
             case "C":
                 if (length) {
-                    return new Types.CharacterType(length);
+                    return new Types.CharacterType(length, qualifiedName);
                 }
                 else {
-                    return new Types.CharacterType(1);
+                    return new Types.CharacterType(1, qualifiedName);
                 }
             case "X":
                 if (length) {
-                    return new Types.HexType(length);
+                    return new Types.HexType(length, qualifiedName);
                 }
                 else {
-                    return new Types.HexType(1);
+                    return new Types.HexType(1, qualifiedName);
                 }
             case "N":
                 if (length) {
-                    return new Types.NumericType(length);
+                    return new Types.NumericType(length, qualifiedName);
                 }
                 else {
-                    return new Types.NumericType(1);
+                    return new Types.NumericType(1, qualifiedName);
                 }
         }
         return undefined;

package/build/src/registry.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.84.2",
+    "version": "2.84.3",
     "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.0.0",
-        "@types/node": "^17.0.9",
+        "@types/node": "^17.0.10",
         "chai": "^4.3.4",
         "eslint": "^8.7.0",
         "mocha": "^9.1.4",