@abaplint/transpiler 2.14.2 → 2.14.3

package/build/src/traversal.d.ts

@@ -107,6 +107,8 @@ export declare class Traversal {
     findCurrentDoOrWhileIndexBackup(node: abaplint.Nodes.StatementNode): string | undefined;
     registerClassOrInterface(def: abaplint.IClassDefinition | abaplint.IInterfaceDefinition | undefined): string;
     setValues(identifier: abaplint.TypedIdentifier, name: string): string;
+    /** position of an enumerated value in its TYPES BEGIN OF ENUM, counting from 0 */
+    private findEnumValueIndex;
     static setValues(identifier: abaplint.TypedIdentifier, name: string): string;
     buildInternalName(name: string, def: abaplint.IClassDefinition | abaplint.IInterfaceDefinition | undefined): string;
     lookupClassOrInterface(name: string | undefined, token: abaplint.Token | undefined, directGlobal?: boolean): string;

package/build/src/traversal.js

@@ -629,13 +629,20 @@ class Traversal {
         if (ref === undefined) {
             return undefined;
         }
-        // local
+        // local, also when the interface is declared in another include of the same object,
+        // eg. a local interface in the locals_imp of a class, used in its test classes
         if (ref.getFilename() === this.getFilename()) {
             const scope = this.findCurrentScopeByToken(ref.getToken());
             if (scope?.getIdentifier().stype === abaplint.ScopeType.Interface) {
                 return scope?.getIdentifier().sname;
             }
         }
+        else if (this.getCurrentObject().getABAPFileByName(ref.getFilename()) !== undefined) {
+            const scope = this.spaghetti.lookupPosition(ref.getStart(), ref.getFilename());
+            if (scope?.getIdentifier().stype === abaplint.ScopeType.Interface) {
+                return scope?.getIdentifier().sname;
+            }
+        }
         // global
         for (const obj of this.reg.getObjectsByType("INTF")) {
             if (obj.getFiles().some(f => f.getFilename() === ref.getFilename())) {
@@ -1000,8 +1007,33 @@ this.INTERNAL_ID = abap.internalIdCounter++;\n`;
         return `abap.Classes['${name}'] = ${Traversal.escapeNamespace(def.getName().toLowerCase())};`;
     }
     setValues(identifier, name) {
+        // an enumerated value of a class or interface, declared without STRUCTURE: number the
+        // values in the order they are declared, like the STRUCTURE components in setValues below
+        if (identifier.getValue() === "novalueClassAttributeEnum"
+            && !(identifier.getType() instanceof abaplint.BasicTypes.StructureType)) {
+            const index = this.findEnumValueIndex(identifier);
+            return index === undefined ? "" : Traversal.prefixVariable(name) + ".set(" + index + ");\n";
+        }
         return Traversal.setValues(identifier, name);
     }
+    /** position of an enumerated value in its TYPES BEGIN OF ENUM, counting from 0 */
+    findEnumValueIndex(identifier) {
+        // the enum can be declared in another object, eg. a global interface the class implements
+        const filename = identifier.getFilename();
+        const raw = this.reg.getFileByName(filename);
+        const obj = raw === undefined ? undefined : this.reg.findObjectForFile(raw);
+        const file = obj instanceof abaplint.ABAPObject ? obj.getABAPFileByName(filename) : undefined;
+        for (const enumeration of file?.getStructure()?.findAllStructures(abaplint.Structures.TypeEnum) || []) {
+            const values = enumeration.getChildren().filter(c => c instanceof abaplint.Nodes.StatementNode
+                && (c.get() instanceof abaplint.Statements.Type || c.get() instanceof abaplint.Statements.TypeEnum));
+            const index = values.findIndex(v => v
+                .findFirstExpression(abaplint.Expressions.NamespaceSimpleName)?.getFirstToken().getStart().equals(identifier.getStart()));
+            if (index >= 0) {
+                return index;
+            }
+        }
+        return undefined;
+    }
     static setValues(identifier, name) {
         const val = identifier.getValue();
         let ret = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.14.2",
+  "version": "2.14.3",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -29,7 +29,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.120.71",
+    "@abaplint/core": "^2.120.72",
     "source-map": "^0.8.0"
   },
   "devDependencies": {