@abaplint/core 2.112.4 → 2.112.6

package/build/abaplint.d.ts

@@ -346,9 +346,11 @@ declare class Attributes implements IAttributes {
     private readonly types;
     private readonly tlist;
     private readonly filename;
+    private readonly aliases;
     constructor(node: StructureNode, input: SyntaxInput);
     getTypes(): TypeDefinitions;
     getStatic(): ClassAttribute[];
+    getAliases(): Alias[];
     getAll(): readonly ClassAttribute[];
     getStaticsByVisibility(visibility: Visibility): ClassAttribute[];
     getInstance(): ClassAttribute[];
@@ -358,6 +360,7 @@ declare class Attributes implements IAttributes {
     findByName(name: string): ClassAttribute | ClassConstant | undefined;
     private parse;
     private parseSection;
+    private parseAlias;
     private parseAttribute;
 }
 
@@ -1029,7 +1032,7 @@ declare class ClassDefinition_3 extends Identifier implements IClassDefinition {
     private readonly finalValue;
     private readonly globalValue;
     private readonly sharedMemory;
-    private aliases;
+    private readonly aliases;
     constructor(node: StructureNode, input: SyntaxInput);
     getFriends(): string[];
     getEvents(): IEventDefinition[];
@@ -1040,7 +1043,7 @@ declare class ClassDefinition_3 extends Identifier implements IClassDefinition {
     isGlobal(): boolean;
     isFinal(): boolean;
     getImplementing(): readonly IImplementing[];
-    getAliases(): IAliases;
+    getAliases(): Alias[];
     isForTesting(): boolean;
     isAbstract(): boolean;
     isSharedMemory(): boolean;
@@ -2892,10 +2895,6 @@ declare class IACTemplate extends AbstractObject {
     getDescription(): string | undefined;
 }
 
-declare interface IAliases {
-    getAll(): readonly Alias[];
-}
-
 declare interface IAllowedNaming {
     maxLength: number;
     allowNamespace: boolean;
@@ -2925,6 +2924,7 @@ declare interface IAttributes {
     findByName(name: string): ClassAttribute | ClassConstant | undefined;
     getConstants(): readonly ClassConstant[];
     getAll(): readonly ClassAttribute[];
+    getAliases(): readonly Alias[];
     getTypes(): ITypeDefinitions;
 }
 
@@ -3188,7 +3188,7 @@ export declare interface IInterfaceDefinition extends Identifier {
     getEvents(): readonly IEventDefinition[];
     isGlobal(): boolean;
     getSuperClass(): string | undefined;
-    getAliases(): IAliases;
+    getAliases(): readonly Alias[];
     getImplementing(): readonly IImplementing[];
 }
 
@@ -3579,13 +3579,14 @@ declare class InterfaceDefinition extends Identifier implements IInterfaceDefini
     constructor(node: StructureNode, input: SyntaxInput);
     getSuperClass(): undefined;
     getImplementing(): readonly IImplementing[];
-    getAliases(): IAliases;
+    getAliases(): readonly Alias[];
     getEvents(): IEventDefinition[];
     getAttributes(): IAttributes;
     getTypeDefinitions(): ITypeDefinitions;
     isLocal(): boolean;
     isGlobal(): boolean;
     getMethodDefinitions(): IMethodDefinitions;
+    private checkInterfacesExists;
     private parse;
 }
 

package/build/src/abap/2_statements/statement_parser.js

@@ -121,7 +121,7 @@ class StatementParser {
                             continue; // probably punctuation
                         }
                         const s = this.categorizeStatement(new nodes_1.StatementNode(new _statement_1.Unknown()).setChildren(this.tokensToNodes(second)));
-                        if (!(s.get() instanceof _statement_1.Unknown)) {
+                        if (!(s.get() instanceof _statement_1.Unknown) && !(s.get() instanceof _statement_1.Empty)) {
                             result.push(new nodes_1.StatementNode(new _statement_1.Unknown()).setChildren(this.tokensToNodes(first)));
                             statement = s;
                             break;

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

@@ -113,6 +113,7 @@ class CurrentScope {
         }
         const upper = name.toUpperCase();
         if (this.current.getData().vars[upper] !== undefined) {
+            // console.dir(new Error().stack);
             throw new Error(`Variable name "${name}" already defined`);
         }
         else if (this.isOO() && this.current.getData().types[upper] !== undefined) {

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

@@ -34,7 +34,7 @@ class ObjectOriented {
         return ret;
     }
     addAliasedAttributes(classDefinition) {
-        for (const alias of classDefinition.getAliases().getAll()) {
+        for (const alias of classDefinition.getAliases()) {
             const comp = alias.getComponent();
             const idef = this.scope.findInterfaceDefinition(comp.split("~")[0]);
             if (idef) {
@@ -52,18 +52,6 @@ class ObjectOriented {
             }
         }
     }
-    addAliasedTypes(aliases) {
-        for (const alias of aliases.getAll()) {
-            const comp = alias.getComponent();
-            const idef = this.scope.findInterfaceDefinition(comp.split("~")[0]);
-            if (idef) {
-                const found = idef.getTypeDefinitions().getByName(comp.split("~")[1]);
-                if (found) {
-                    this.scope.addTypeNamed(alias.getName(), found);
-                }
-            }
-        }
-    }
     findMethodInInterface(interfaceName, methodName) {
         const idef = this.scope.findInterfaceDefinition(interfaceName);
         if (idef) {
@@ -78,7 +66,7 @@ class ObjectOriented {
         return undefined;
     }
     findMethodViaAlias(methodName, def) {
-        for (const a of def.getAliases().getAll()) {
+        for (const a of def.getAliases()) {
             if (a.getName().toUpperCase() === methodName.toUpperCase()) {
                 const comp = a.getComponent();
                 const res = this.findMethodInInterface(comp.split("~")[0], comp.split("~")[1]);
@@ -121,7 +109,6 @@ class ObjectOriented {
         return ret;
     }
     searchEvent(def, name) {
-        var _a;
         if (def === undefined || name === undefined) {
             return undefined;
         }
@@ -129,7 +116,7 @@ class ObjectOriented {
         if (found) {
             return found;
         }
-        for (const a of ((_a = def.getAliases()) === null || _a === void 0 ? void 0 : _a.getAll()) || []) {
+        for (const a of def.getAliases() || []) {
             if (a.getName().toUpperCase() === name.toUpperCase()) {
                 const comp = a.getComponent();
                 const res = this.searchEvent(this.scope.findObjectDefinition(comp.split("~")[0]), comp.split("~")[1]);
@@ -146,7 +133,6 @@ class ObjectOriented {
     }
     // search in via super class, interfaces and aliases
     searchAttributeName(def, name) {
-        var _a;
         if (def === undefined || name === undefined) {
             return undefined;
         }
@@ -156,7 +142,7 @@ class ObjectOriented {
                 return a;
             }
         }
-        for (const a of ((_a = def.getAliases()) === null || _a === void 0 ? void 0 : _a.getAll()) || []) {
+        for (const a of def.getAliases() || []) {
             if (a.getName().toUpperCase() === upper) {
                 const comp = a.getComponent();
                 const res = this.searchAttributeName(this.scope.findObjectDefinition(comp.split("~")[0]), comp.split("~")[1]);
@@ -209,7 +195,7 @@ class ObjectOriented {
                 return a;
             }
         }
-        for (const a of def.getAliases().getAll()) {
+        for (const a of def.getAliases()) {
             if (a.getName().toUpperCase() === upper) {
                 const comp = a.getComponent();
                 const res = this.searchConstantName(this.scope.findObjectDefinition(comp.split("~")[0]), comp.split("~")[1]);

package/build/src/abap/types/class_attributes.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Attributes = void 0;
 const Structures = require("../3_structures/structures");
 const Statements = require("../2_statements/statements");
+const Expressions = require("../2_statements/expressions");
 const class_attribute_1 = require("./class_attribute");
 const class_constant_1 = require("./class_constant");
 const nodes_1 = require("../nodes");
@@ -17,13 +18,16 @@ const constants_1 = require("../5_syntax/structures/constants");
 const type_definitions_1 = require("./type_definitions");
 const types_1 = require("../5_syntax/structures/types");
 const type_1 = require("../5_syntax/statements/type");
+const _reference_1 = require("../5_syntax/_reference");
+const alias_1 = require("./alias");
 class Attributes {
     constructor(node, input) {
         this.static = [];
         this.instance = [];
         this.constants = [];
-        this.filename = input.filename;
+        this.aliases = [];
         this.tlist = [];
+        this.filename = input.filename;
         this.parse(node, input);
         this.types = new type_definitions_1.TypeDefinitions(this.tlist);
     }
@@ -33,6 +37,9 @@ class Attributes {
     getStatic() {
         return this.static;
     }
+    getAliases() {
+        return this.aliases;
+    }
     getAll() {
         let res = [];
         res = res.concat(this.static);
@@ -171,6 +178,9 @@ class Attributes {
                 else if (ctyp instanceof Statements.ClassData) {
                     this.static.push(this.parseAttribute(c, visibility, input));
                 }
+                else if (ctyp instanceof Statements.Aliases) {
+                    this.parseAlias(c, visibility, input);
+                }
                 else if (ctyp instanceof Statements.Constant) {
                     const found = new constant_1.Constant().runSyntax(c, input);
                     if (found) {
@@ -189,6 +199,27 @@ class Attributes {
             }
         }
     }
+    parseAlias(node, visibility, input) {
+        const aliasName = node.findFirstExpression(Expressions.SimpleName).getFirstToken();
+        const compToken = node.findFirstExpression(Expressions.Field).getFirstToken();
+        const compName = compToken.getStr();
+        this.aliases.push(new alias_1.Alias(aliasName, visibility, compName, this.filename));
+        if (compName.includes("~")) {
+            const name = compName.split("~")[0];
+            const idef = input.scope.findInterfaceDefinition(name);
+            if (idef) {
+                input.scope.addReference(compToken, idef, _reference_1.ReferenceType.ObjectOrientedReference, input.filename, { ooName: name.toUpperCase(), ooType: "INTF" });
+                const foundType = idef.getTypeDefinitions().getByName(compName.split("~")[1]);
+                if (foundType) {
+                    input.scope.addTypeNamed(aliasName.getStr(), foundType);
+                }
+                const foundAttribute = idef.getAttributes().findByName(compName.split("~")[1]);
+                if (foundAttribute) {
+                    input.scope.addNamedIdentifier(aliasName.getStr(), foundAttribute);
+                }
+            }
+        }
+    }
     parseAttribute(node, visibility, input) {
         let found = undefined;
         const s = node.get();

package/build/src/abap/types/class_definition.js

@@ -8,7 +8,6 @@ const Structures = require("../3_structures/structures");
 const Expressions = require("../2_statements/expressions");
 const class_attributes_1 = require("./class_attributes");
 const _identifier_1 = require("../4_file_information/_identifier");
-const aliases_1 = require("./aliases");
 const _scope_type_1 = require("../5_syntax/_scope_type");
 const event_definition_1 = require("./event_definition");
 const visibility_1 = require("../4_file_information/visibility");
@@ -33,9 +32,9 @@ class ClassDefinition extends _identifier_1.Identifier {
         this.parse(input, node);
         const helper = new _object_oriented_1.ObjectOriented(input.scope);
         helper.fromSuperClassesAndInterfaces(this);
-        helper.addAliasedTypes(this.aliases);
         this.attributes = new class_attributes_1.Attributes(node, input);
         this.types = this.attributes.getTypes();
+        this.aliases = this.attributes.getAliases();
         const events = node.findAllStatements(Statements.Events);
         for (const e of events) {
             this.events.push(new event_definition_1.EventDefinition(e, visibility_1.Visibility.Public, input)); // todo, all these are not Public
@@ -116,7 +115,7 @@ class ClassDefinition extends _identifier_1.Identifier {
                 }
                 names.add(name);
             }
-            for (const a of (cdef === null || cdef === void 0 ? void 0 : cdef.getAliases().getAll()) || []) {
+            for (const a of (cdef === null || cdef === void 0 ? void 0 : cdef.getAliases()) || []) {
                 names.add(a.getName().toUpperCase());
             }
             sup = cdef === null || cdef === void 0 ? void 0 : cdef.getSuperClass();
@@ -171,7 +170,6 @@ class ClassDefinition extends _identifier_1.Identifier {
                 input.scope.addReference(token, undefined, _reference_1.ReferenceType.ObjectOrientedUnknownReference, input.filename, { ooName: name.toUpperCase(), ooType: "INTF" });
             }
         }
-        this.aliases = new aliases_1.Aliases(inputNode, this.filename, input.scope);
     }
 }
 exports.ClassDefinition = ClassDefinition;

package/build/src/abap/types/interface_definition.js

@@ -10,11 +10,7 @@ const visibility_1 = require("../4_file_information/visibility");
 const _scope_type_1 = require("../5_syntax/_scope_type");
 const event_definition_1 = require("./event_definition");
 const method_definitions_1 = require("./method_definitions");
-const aliases_1 = require("./aliases");
 const _reference_1 = require("../5_syntax/_reference");
-const class_constant_1 = require("./class_constant");
-const _typed_identifier_1 = require("./_typed_identifier");
-const tokens_1 = require("../1_lexer/tokens");
 class InterfaceDefinition extends _identifier_1.Identifier {
     constructor(node, input) {
         if (!(node.get() instanceof Structures.Interface)) {
@@ -58,37 +54,8 @@ class InterfaceDefinition extends _identifier_1.Identifier {
         return this.methodDefinitions;
     }
     /////////////////
-    parse(input, node) {
+    checkInterfacesExists(input, node) {
         var _a;
-        // todo, proper sequencing, the statements should be processed line by line
-        this.attributes = new class_attributes_1.Attributes(node, input);
-        this.typeDefinitions = this.attributes.getTypes();
-        this.aliases = new aliases_1.Aliases(node, this.filename, input.scope);
-        // todo, cleanup aliases, vs "object_oriented.ts" vs "class_implementation.ts"
-        // this adds the aliased types to scope?
-        for (const a of this.aliases.getAll()) {
-            const [objName, fieldName] = a.getComponent().split("~");
-            const idef = input.scope.findInterfaceDefinition(objName);
-            if (idef) {
-                const foundType = idef.getTypeDefinitions().getByName(fieldName);
-                if (foundType) {
-                    input.scope.addTypeNamed(a.getName(), foundType);
-                }
-                else {
-                    const foundField = idef.getAttributes().findByName(fieldName);
-                    if (foundField && foundField instanceof class_constant_1.ClassConstant) {
-                        const token = new tokens_1.Identifier(a.getStart(), a.getName());
-                        const id = new _typed_identifier_1.TypedIdentifier(token, input.filename, foundField.getType());
-                        const constant = new class_constant_1.ClassConstant(id, visibility_1.Visibility.Public, foundField.getValue());
-                        input.scope.addIdentifier(constant);
-                    }
-                }
-            }
-        }
-        const events = node.findAllStatements(Statements.Events);
-        for (const e of events) {
-            this.events.push(new event_definition_1.EventDefinition(e, visibility_1.Visibility.Public, input));
-        }
         for (const i of node.findAllStatements(Statements.InterfaceDef)) {
             const token = (_a = i.findDirectExpression(Expressions.InterfaceName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
             const name = token === null || token === void 0 ? void 0 : token.getStr();
@@ -106,6 +73,39 @@ class InterfaceDefinition extends _identifier_1.Identifier {
                 }
             }
         }
+    }
+    parse(input, node) {
+        this.checkInterfacesExists(input, node);
+        // todo, proper sequencing, the statements should be processed line by line
+        this.attributes = new class_attributes_1.Attributes(node, input);
+        this.typeDefinitions = this.attributes.getTypes();
+        this.aliases = this.attributes.getAliases();
+        // todo, cleanup aliases, vs "object_oriented.ts" vs "class_implementation.ts"
+        // this adds the aliased types to scope?
+        /*
+        for (const a of this.aliases) {
+          const [objName, fieldName] = a.getComponent().split("~");
+          const idef = input.scope.findInterfaceDefinition(objName);
+          if (idef) {
+            const foundType = idef.getTypeDefinitions().getByName(fieldName);
+            if (foundType) {
+              input.scope.addTypeNamed(a.getName(), foundType);
+            } else {
+              const foundField = idef.getAttributes().findByName(fieldName);
+              if (foundField && foundField instanceof ClassConstant) {
+                const token = new TokenIdentifier(a.getStart(), a.getName());
+                const id = new TypedIdentifier(token, input.filename, foundField.getType());
+                const constant = new ClassConstant(id, Visibility.Public, foundField.getValue());
+                input.scope.addIdentifier(constant);
+              }
+            }
+          }
+        }
+        */
+        const events = node.findAllStatements(Statements.Events);
+        for (const e of events) {
+            this.events.push(new event_definition_1.EventDefinition(e, visibility_1.Visibility.Public, input));
+        }
         this.methodDefinitions = new method_definitions_1.MethodDefinitions(node, input);
         if (this.methodDefinitions.getByName("CONSTRUCTOR") !== undefined) {
             throw new Error("Interfaces cannot have constructor methods");

package/build/src/registry.js

@@ -67,7 +67,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.112.4";
+        return "2.112.6";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

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

package/build/src/abap/types/_aliases.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=_aliases.js.map

package/build/src/abap/types/aliases.js

@@ -1,61 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Aliases = void 0;
-const alias_1 = require("./alias");
-const Structures = require("../3_structures/structures");
-const Statements = require("../2_statements/statements");
-const Expressions = require("../2_statements/expressions");
-const visibility_1 = require("../4_file_information/visibility");
-const _reference_1 = require("../5_syntax/_reference");
-class Aliases {
-    constructor(node, filename, scope) {
-        this.aliases = [];
-        this.filename = filename;
-        this.parse(node, scope, filename);
-    }
-    getAll() {
-        return this.aliases;
-    }
-    getByName(name) {
-        for (const a of this.aliases) {
-            if (a.getName().toLowerCase() === name.toLowerCase()) {
-                return a;
-            }
-        }
-        return undefined;
-    }
-    /////////////////////////
-    parse(node, scope, filename) {
-        const cdef = node.findFirstStructure(Structures.ClassDefinition);
-        if (cdef) {
-            this.parseSection(cdef.findFirstStructure(Structures.PublicSection), visibility_1.Visibility.Public, scope, filename);
-            this.parseSection(cdef.findFirstStructure(Structures.PrivateSection), visibility_1.Visibility.Private, scope, filename);
-            this.parseSection(cdef.findFirstStructure(Structures.ProtectedSection), visibility_1.Visibility.Protected, scope, filename);
-        }
-        const idef = node.findFirstStructure(Structures.Interface);
-        if (idef) {
-            this.parseSection(idef, visibility_1.Visibility.Public, scope, filename);
-        }
-    }
-    parseSection(node, visibility, scope, filename) {
-        if (!node) {
-            return;
-        }
-        const list = node.findAllStatements(Statements.Aliases);
-        for (const a of list) {
-            const name = a.findFirstExpression(Expressions.SimpleName).getFirstToken();
-            const compToken = a.findFirstExpression(Expressions.Field).getFirstToken();
-            const compName = compToken.getStr();
-            this.aliases.push(new alias_1.Alias(name, visibility, compName, this.filename));
-            if (compName.includes("~")) {
-                const name = compName.split("~")[0];
-                const idef = scope.findInterfaceDefinition(name);
-                if (idef) {
-                    scope.addReference(compToken, idef, _reference_1.ReferenceType.ObjectOrientedReference, filename, { ooName: name.toUpperCase(), ooType: "INTF" });
-                }
-            }
-        }
-    }
-}
-exports.Aliases = Aliases;
-//# sourceMappingURL=aliases.js.map