@abaplint/transpiler-cli 2.13.98 → 2.13.99

package/build/bundle.js

@@ -17464,7 +17464,9 @@ class ModifyLine {
         const ocp = (0, combi_1.str)("OF CURRENT PAGE");
         const intensified = (0, combi_1.seq)("INTENSIFIED", onOff);
         const intensifiedOpt = (0, combi_1.seq)("INTENSIFIED", (0, combi_1.opt)(onOff));
-        const lineFormat = (0, combi_1.seq)("LINE FORMAT", (0, combi_1.per)("INPUT OFF", "INVERSE", "RESET", intensifiedOpt, expressions_1.Color));
+        const inputOpt = (0, combi_1.seq)("INPUT", (0, combi_1.opt)((0, combi_1.alt)(eq, onOff)));
+        const inverseOpt = (0, combi_1.seq)("INVERSE", (0, combi_1.opt)((0, combi_1.alt)(eq, onOff)));
+        const lineFormat = (0, combi_1.seq)("LINE FORMAT", (0, combi_1.per)(inputOpt, inverseOpt, "RESET", intensifiedOpt, expressions_1.Color));
         const options = (0, combi_1.per)(index, value, format, page, lineFormat, lineValue, ocp, intensified, expressions_1.Color);
         const ret = (0, combi_1.seq)("MODIFY", (0, combi_1.altPrio)("CURRENT LINE", (0, combi_1.seq)("LINE", expressions_1.Source)), (0, combi_1.opt)(options));
         return (0, combi_1.verNotLang)(version_1.LanguageVersion.Cloud, ret);
@@ -27023,6 +27025,7 @@ class CurrentScope {
         if (name === undefined) {
             return undefined;
         }
+        name = name.replace(/^!/, "");
         const found = (_a = this.current) === null || _a === void 0 ? void 0 : _a.findVariable(name);
         if (found) {
             return found;
@@ -27128,6 +27131,17 @@ class CurrentScope {
         var _a;
         return ((_a = this.localFriends.get(className.toUpperCase())) === null || _a === void 0 ? void 0 : _a.includes(friendName.toUpperCase())) === true;
     }
+    getEnclosingMethodName() {
+        let curr = this.current;
+        while (curr !== undefined) {
+            const stype = curr.getIdentifier().stype;
+            if (stype === _scope_type_1.ScopeType.Method || stype === _scope_type_1.ScopeType.MethodInstance) {
+                return curr.getIdentifier().sname;
+            }
+            curr = curr.getParent();
+        }
+        return undefined;
+    }
     getEnclosingClassName() {
         let curr = this.current;
         while (curr !== undefined) {
@@ -27352,6 +27366,97 @@ class ObjectOriented {
     }
     // does the supplied class have friendship with "friendName"?
     // note that interfaces of the friend, and subclasses of the friend also have friendship
+    // returns the visibility as text if a member declared in foundDef, reached via def, cannot be accessed from enclosing
+    memberNotVisible(visibility, def, foundDef, enclosing) {
+        var _a, _b;
+        if (visibility === visibility_1.Visibility.Public || foundDef === undefined) {
+            return undefined;
+        }
+        else if (!(foundDef instanceof types_1.ClassDefinition)) {
+            // interface members are always public
+            return undefined;
+        }
+        const name = foundDef.getName().toUpperCase();
+        enclosing = enclosing === null || enclosing === void 0 ? void 0 : enclosing.toUpperCase();
+        if (enclosing === undefined || enclosing === name) {
+            return undefined;
+        }
+        // friendship with the class used at the call site also gives access to inherited members
+        const visited = [];
+        let current = def instanceof types_1.ClassDefinition ? def : foundDef;
+        while (current !== undefined && visited.includes(current.getName().toUpperCase()) === false) {
+            visited.push(current.getName().toUpperCase());
+            if (this.hasFriendship(current, enclosing)) {
+                return undefined;
+            }
+            const sup = current.getSuperClass();
+            current = sup === undefined ? undefined : this.scope.findClassDefinition(sup);
+        }
+        if (visibility === visibility_1.Visibility.Protected) {
+            // subclasses can access protected members
+            let sup = (_a = this.scope.findClassDefinition(enclosing)) === null || _a === void 0 ? void 0 : _a.getSuperClass();
+            while (sup !== undefined) {
+                if (sup.toUpperCase() === name) {
+                    return undefined;
+                }
+                sup = (_b = this.scope.findClassDefinition(sup)) === null || _b === void 0 ? void 0 : _b.getSuperClass();
+            }
+            return "protected";
+        }
+        return "private";
+    }
+    // the fixture methods of a test class are called by ABAP Unit only, returns the message otherwise
+    checkSpecialTestMethodCall(method, foundDef) {
+        if (method === undefined
+            || !(foundDef instanceof types_1.ClassDefinition)
+            || foundDef.isForTesting() === false) {
+            return undefined;
+        }
+        const name = method.getName().toUpperCase();
+        if (["SETUP", "TEARDOWN", "CLASS_SETUP", "CLASS_TEARDOWN"].includes(name) === false) {
+            return undefined;
+        }
+        return `The special method "${name}" cannot be called directly`;
+    }
+    // SUPER-> can only call the previous implementation of the method it is used in, returns the message otherwise
+    // both names are resolved in the super class, so an alias and the method it stands for are the same
+    checkSuperCall(superDef, methodName) {
+        const enclosing = this.scope.getEnclosingMethodName();
+        if (methodName === undefined
+            || enclosing === undefined
+            || methodName.toUpperCase() === enclosing.toUpperCase()) {
+            return undefined;
+        }
+        const message = "SUPER-> can only be used to call the previous implementation of the same method";
+        // a method that is not a redefinition has no previous implementation
+        const enclosingClass = this.scope.findClassDefinition(this.scope.getEnclosingClassName());
+        const ownDefinition = enclosingClass === null || enclosingClass === void 0 ? void 0 : enclosingClass.getMethodDefinitions().getByName(enclosing);
+        if (ownDefinition !== undefined && ownDefinition.isRedefinition() === false) {
+            return message;
+        }
+        const called = this.searchMethodName(superDef, methodName).method;
+        const own = this.searchMethodName(superDef, enclosing).method;
+        if (called === undefined || own === undefined || called === own) {
+            return undefined;
+        }
+        return message;
+    }
+    // the class declaring the attribute or constant, searched from def up through the super classes
+    findAttributeOwner(def, found) {
+        const visited = [];
+        let current = def;
+        while (current instanceof types_1.ClassDefinition && visited.includes(current.getName().toUpperCase()) === false) {
+            visited.push(current.getName().toUpperCase());
+            const attributes = current.getAttributes();
+            if (attributes.getAll().includes(found)
+                || attributes.getConstants().includes(found)) {
+                return current;
+            }
+            const sup = current.getSuperClass();
+            current = sup === undefined ? undefined : this.findSuperDefinition(sup);
+        }
+        return undefined;
+    }
     hasFriendship(cd, friendName) {
         var _a;
         const friends = cd.getFriends().map(f => f.toUpperCase());
@@ -30328,6 +30433,8 @@ const _object_oriented_1 = __webpack_require__(/*! ../_object_oriented */ "./nod
 const data_reference_type_1 = __webpack_require__(/*! ../../types/basic/data_reference_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/data_reference_type.js");
 const _reference_1 = __webpack_require__(/*! ../_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.js");
 const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
+const class_attribute_1 = __webpack_require__(/*! ../../types/class_attribute */ "./node_modules/@abaplint/core/build/src/abap/types/class_attribute.js");
+const class_constant_1 = __webpack_require__(/*! ../../types/class_constant */ "./node_modules/@abaplint/core/build/src/abap/types/class_constant.js");
 const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
 class AttributeName {
     static runSyntax(context, node, input, type, error = true) {
@@ -30356,6 +30463,15 @@ class AttributeName {
                 }
                 return void_type_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
             }
+            if (found instanceof class_attribute_1.ClassAttribute || found instanceof class_constant_1.ClassConstant) {
+                const owner = helper.findAttributeOwner(def, found);
+                const notVisible = helper.memberNotVisible(found.getVisibility(), def, owner, input.scope.getEnclosingClassName());
+                if (notVisible !== undefined) {
+                    const message = `Attribute "${name}" is ${notVisible} and cannot be accessed`;
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, token, message));
+                    return void_type_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                }
+            }
             if (type) {
                 input.scope.addReference(token, found, type, input.filename);
             }
@@ -33294,8 +33410,6 @@ const _reference_1 = __webpack_require__(/*! ../_reference */ "./node_modules/@a
 const component_name_1 = __webpack_require__(/*! ./component_name */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/component_name.js");
 const attribute_name_1 = __webpack_require__(/*! ./attribute_name */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/attribute_name.js");
 const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
-const visibility_1 = __webpack_require__(/*! ../../4_file_information/visibility */ "./node_modules/@abaplint/core/build/src/abap/4_file_information/visibility.js");
-const class_definition_1 = __webpack_require__(/*! ../../types/class_definition */ "./node_modules/@abaplint/core/build/src/abap/types/class_definition.js");
 class MethodCallChain {
     static runSyntax(node, input, targetType) {
         var _a, _b;
@@ -33325,6 +33439,14 @@ class MethodCallChain {
                 const methodToken = (_a = current.findDirectExpression(Expressions.MethodName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
                 const methodName = methodToken === null || methodToken === void 0 ? void 0 : methodToken.getStr();
                 const def = input.scope.findObjectDefinition(className);
+                const isSuper = current === children[2]
+                    && first.get() instanceof Expressions.FieldChain
+                    && first.concatTokens().toUpperCase() === "SUPER";
+                const superMessage = isSuper ? helper.checkSuperCall(def, methodName) : undefined;
+                if (superMessage !== undefined) {
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, methodToken, superMessage));
+                    return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                }
                 // eslint-disable-next-line prefer-const
                 let { method, def: foundDef } = helper.searchMethodName(def, methodName);
                 if (method === undefined && current === first) {
@@ -33344,12 +33466,19 @@ class MethodCallChain {
                         input.issues.push((0, _syntax_input_1.syntaxIssue)(input, methodToken, message));
                         return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
                     }
-                    const notVisible = method ? this.checkVisibility(method, def, foundDef, input) : undefined;
+                    const notVisible = method
+                        ? helper.memberNotVisible(method.getVisibility(), def, foundDef, input.scope.getEnclosingClassName())
+                        : undefined;
                     if (notVisible !== undefined) {
                         const message = `Method "${methodName}" is ${notVisible} and cannot be accessed`;
                         input.issues.push((0, _syntax_input_1.syntaxIssue)(input, methodToken, message));
                         return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
                     }
+                    const specialMessage = isSuper ? undefined : helper.checkSpecialTestMethodCall(method, foundDef);
+                    if (specialMessage !== undefined) {
+                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, methodToken, specialMessage));
+                        return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                    }
                     const voidedName = context instanceof basic_1.VoidType ? context.getVoided() : undefined;
                     const extra = helper.methodReferenceExtras(foundDef, className || voidedName);
                     input.scope.addReference(methodToken, method, _reference_1.ReferenceType.MethodReference, input.filename, extra);
@@ -33392,47 +33521,6 @@ class MethodCallChain {
         return context;
     }
     //////////////////////////////////////
-    // returns the visibility as text if the method cannot be accessed from the current scope
-    static checkVisibility(method, def, foundDef, input) {
-        var _a, _b, _c;
-        const visibility = method.getVisibility();
-        if (visibility === visibility_1.Visibility.Public || foundDef === undefined) {
-            return undefined;
-        }
-        else if (!(foundDef instanceof class_definition_1.ClassDefinition)) {
-            // interface members are always public
-            return undefined;
-        }
-        const name = foundDef.getName().toUpperCase();
-        const enclosing = (_a = input.scope.getEnclosingClassName()) === null || _a === void 0 ? void 0 : _a.toUpperCase();
-        if (enclosing === undefined || enclosing === name) {
-            return undefined;
-        }
-        // friendship with the class used at the call site also gives access to inherited members
-        const helper = new _object_oriented_1.ObjectOriented(input.scope);
-        const visited = [];
-        let current = def instanceof class_definition_1.ClassDefinition ? def : foundDef;
-        while (current !== undefined && visited.includes(current.getName().toUpperCase()) === false) {
-            visited.push(current.getName().toUpperCase());
-            if (helper.hasFriendship(current, enclosing)) {
-                return undefined;
-            }
-            const sup = current.getSuperClass();
-            current = sup === undefined ? undefined : input.scope.findClassDefinition(sup);
-        }
-        if (visibility === visibility_1.Visibility.Protected) {
-            // subclasses can access protected members
-            let sup = (_b = input.scope.findClassDefinition(enclosing)) === null || _b === void 0 ? void 0 : _b.getSuperClass();
-            while (sup !== undefined) {
-                if (sup.toUpperCase() === name) {
-                    return undefined;
-                }
-                sup = (_c = input.scope.findClassDefinition(sup)) === null || _c === void 0 ? void 0 : _c.getSuperClass();
-            }
-            return "protected";
-        }
-        return "private";
-    }
     static findTop(first, input, targetType) {
         var _a;
         if (first.get() instanceof Expressions.ClassName) {
@@ -34254,6 +34342,14 @@ class MethodSource {
                 const methodToken = current.getFirstToken();
                 const methodName = methodToken === null || methodToken === void 0 ? void 0 : methodToken.getStr();
                 const def = input.scope.findObjectDefinition(className);
+                const isSuper = implicitMe === false
+                    && first.get() instanceof Expressions.SourceField
+                    && first.concatTokens().toUpperCase() === "SUPER";
+                const superMessage = isSuper ? helper.checkSuperCall(def, methodName) : undefined;
+                if (superMessage !== undefined) {
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, methodToken, superMessage));
+                    return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                }
                 // eslint-disable-next-line prefer-const
                 let { method, def: foundDef } = helper.searchMethodName(def, methodName);
                 if (implicitMe && current === first && (method === null || method === void 0 ? void 0 : method.isStatic()) === false && input.scope.isInStaticMethod() === true) {
@@ -34270,6 +34366,11 @@ class MethodSource {
                     return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
                 }
                 else if (method) {
+                    const specialMessage = isSuper ? undefined : helper.checkSpecialTestMethodCall(method, foundDef);
+                    if (specialMessage !== undefined) {
+                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, methodToken, specialMessage));
+                        return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                    }
                     const extra = helper.methodReferenceExtras(foundDef, className);
                     input.scope.addReference(methodToken, method, _reference_1.ReferenceType.MethodReference, input.filename, extra);
                     context = method;
@@ -35368,6 +35469,7 @@ const corresponding_body_1 = __webpack_require__(/*! ./corresponding_body */ "./
 const _builtin_1 = __webpack_require__(/*! ../_builtin */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_builtin.js");
 const attribute_chain_1 = __webpack_require__(/*! ./attribute_chain */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/attribute_chain.js");
 const dereference_1 = __webpack_require__(/*! ./dereference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/dereference.js");
+const cast_1 = __webpack_require__(/*! ./cast */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/cast.js");
 const _typed_identifier_1 = __webpack_require__(/*! ../../types/_typed_identifier */ "./node_modules/@abaplint/core/build/src/abap/types/_typed_identifier.js");
 const _type_utils_1 = __webpack_require__(/*! ../_type_utils */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_type_utils.js");
 const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
@@ -35591,6 +35693,10 @@ class Source {
                         return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
                     }
                 }
+                else if (get instanceof Expressions.Cast) {
+                    const found = cast_1.Cast.runSyntax(first, input, targetType);
+                    context = arithmetic === true ? this.infer(context, found, true) : found;
+                }
                 else if (get instanceof Expressions.FieldChain) {
                     const found = field_chain_1.FieldChain.runSyntax(first, input, type, allowGenericDeference);
                     context = arithmetic === true ? this.infer(context, found, true) : found;
@@ -35607,6 +35713,11 @@ class Source {
                     context = this.infer(context, found, arithmetic);
                 }
                 else if (get instanceof Expressions.Dereference) {
+                    if (this.isNewObjectDereference(node, first)) {
+                        const message = "NEW cannot be dereferenced directly";
+                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, first.getFirstToken(), message));
+                        return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                    }
                     context = dereference_1.Dereference.runSyntax(first, context, input);
                 }
                 else if (get instanceof Expressions.ComponentChain) {
@@ -35794,6 +35905,16 @@ class Source {
         }
         return targetType;
     }
+    // "NEW ty( )->*" is a syntax error, also in releases where a method call can be dereferenced
+    static isNewObjectDereference(node, deref) {
+        var _a;
+        const children = node.getChildren();
+        const before = children[children.indexOf(deref) - 1];
+        return before instanceof nodes_1.ExpressionNode
+            && before.get() instanceof Expressions.MethodCallChain
+            && before.getChildren().length === 1
+            && ((_a = before.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.NewObject;
+    }
 }
 exports.Source = Source;
 //# sourceMappingURL=source.js.map
@@ -36761,6 +36882,7 @@ const expressions_1 = __webpack_require__(/*! ../../2_statements/expressions */
 const field_length_1 = __webpack_require__(/*! ./field_length */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/field_length.js");
 const cast_1 = __webpack_require__(/*! ./cast */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/cast.js");
 const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class Target {
     static runSyntax(node, input) {
         const concat = node.concatTokens();
@@ -36826,6 +36948,12 @@ class Target {
                 if (!(context instanceof basic_1.VoidType)) {
                     context = context.getType();
                 }
+                if ((context === null || context === void 0 ? void 0 : context.isGeneric()) === true
+                    && !(0, version_1.releaseAtLeast)(input.scope.getRelease(), version_1.Release.v756)
+                    && input.scope.getLanguageVersion() !== version_1.LanguageVersion.Cloud
+                    && !input.scope.getOpenABAP()) {
+                    throw new Error("A generic reference cannot be dereferenced");
+                }
             }
             else if (current.get() instanceof Expressions.ComponentName) {
                 context = component_name_1.ComponentName.runSyntax(context, current, input);
@@ -70615,6 +70743,7 @@ class Indent {
                 || type instanceof Statements.ProcessBeforeOutput
                 || type instanceof Statements.ProcessOnValueRequest
                 || type instanceof Statements.TopOfPage
+                || type instanceof Statements.EndOfPage
                 || type instanceof Statements.Get
                 || type instanceof Statements.EndOfSelection
                 || type instanceof Statements.LoadOfProgram) {
@@ -70710,6 +70839,7 @@ class Indent {
                 || type instanceof Statements.Initialization
                 || type instanceof Statements.AtUserCommand
                 || type instanceof Statements.TopOfPage
+                || type instanceof Statements.EndOfPage
                 || type instanceof Statements.EndOfSelection
                 || type instanceof Statements.Public
                 || type instanceof Statements.Protected
@@ -70907,7 +71037,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.120.66";
+        return "2.120.68";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -125598,6 +125728,10 @@ class Traversal {
     doOrWhileIndexBackups = new Map();
     statementsInsideLoop = new WeakSet();
     enclosingDoOrWhile = new WeakMap();
+    /** DATA, CONSTANTS and FIELD-SYMBOLS nested in blocks, already declared in front of the block */
+    declaredEarly = new WeakSet();
+    emittingEarly = false;
+    blockDepth = 0;
     reg;
     options;
     constructor(spaghetti, file, obj, reg, options) {
@@ -126436,17 +126570,15 @@ this.INTERNAL_ID = abap.internalIdCounter++;\n`;
             }
             else if (c.get() instanceof abaplint.Expressions.AttributeName
                 && context instanceof abaplint.BasicTypes.ObjectReferenceType) {
-                const id = context.getIdentifier();
-                if (id instanceof abaplint.Types.ClassDefinition || id instanceof abaplint.Types.InterfaceDefinition) {
-                    const concat = c.concatTokens();
-                    if (concat.includes("~")) {
-                        const [iname, aname] = concat.split("~");
-                        const intf = this.findInterfaceDefinition(iname, scope);
-                        context = intf?.getAttributes().findByName(aname)?.getType();
-                    }
-                    else {
-                        context = id.getAttributes().findByName(concat)?.getType();
-                    }
+                const concat = c.concatTokens();
+                if (concat.includes("~")) {
+                    const [iname, aname] = concat.split("~");
+                    const intf = this.findInterfaceDefinition(iname, scope);
+                    context = intf?.getAttributes().findByName(aname)?.getType();
+                }
+                else {
+                    // Global references can carry an identifier rather than a class definition.
+                    context = this.narrowContextAttribute(context, concat, scope);
                 }
             }
             else if (c.get() instanceof abaplint.Expressions.AttributeName
@@ -126460,7 +126592,7 @@ this.INTERNAL_ID = abap.internalIdCounter++;\n`;
         return context;
     }
     isInsideLoop(node) {
-        return this.statementsInsideLoop.has(node);
+        return this.statementsInsideLoop.has(node) && !this.declaredEarly.has(node);
     }
     isInsideDoOrWhile(node) {
         return this.findCurrentDoOrWhileIndexBackup(node) !== undefined;
@@ -126555,7 +126687,87 @@ this.INTERNAL_ID = abap.internalIdCounter++;\n`;
         return this.obj.getType() + "-" + this.obj.getName() + "-";
     }
     ////////////////////////////
+    /** In ABAP, DATA, CONSTANTS and FIELD-SYMBOLS are visible in the whole method/form/program, but a
+     * javascript "let" inside the block of an IF, LOOP, TRY etc. is not. So before each block on
+     * method/form/program level the declarations nested in it are output, in source order, and
+     * skipped inside the block. They then exist after the block even if the branch did not run,
+     * and are initialized once, also when the block is a loop */
+    traverseProcedureLevel(node) {
+        const ret = new chunk_1.Chunk();
+        for (const c of node.getChildren()) {
+            if (c instanceof abaplint.Nodes.StructureNode && Traversal.isDeclaration(c) === false) {
+                ret.appendChunk(this.declareNestedEarly(c));
+                this.blockDepth++;
+                try {
+                    ret.appendChunk(this.traverseStructure(c));
+                }
+                finally {
+                    this.blockDepth--;
+                }
+            }
+            else {
+                ret.appendChunk(this.traverse(c));
+            }
+        }
+        return ret;
+    }
+    declareNestedEarly(block) {
+        const found = [];
+        Traversal.findNestedDeclarations(block, found);
+        for (const node of found) {
+            this.declaredEarly.add(node);
+            if (node instanceof abaplint.Nodes.StructureNode) {
+                for (const statement of node.findAllStatementNodes()) {
+                    this.declaredEarly.add(statement);
+                }
+            }
+        }
+        const ret = new chunk_1.Chunk();
+        this.emittingEarly = true;
+        try {
+            for (const node of found) {
+                ret.appendChunk(this.traverse(node));
+            }
+        }
+        finally {
+            this.emittingEarly = false;
+        }
+        return ret;
+    }
+    static isDeclaration(node) {
+        const get = node.get();
+        return get instanceof abaplint.Structures.Data
+            || get instanceof abaplint.Structures.Constants
+            || get instanceof abaplint.Structures.Types;
+    }
+    static findNestedDeclarations(node, found) {
+        for (const c of node.getChildren()) {
+            if (c instanceof abaplint.Nodes.StatementNode) {
+                const get = c.get();
+                if (get instanceof abaplint.Statements.Data
+                    || get instanceof abaplint.Statements.Constant
+                    || get instanceof abaplint.Statements.FieldSymbol) {
+                    found.push(c);
+                }
+            }
+            else if (c instanceof abaplint.Nodes.StructureNode) {
+                const get = c.get();
+                if (get instanceof abaplint.Structures.Data || get instanceof abaplint.Structures.Constants) {
+                    found.push(c);
+                }
+                else {
+                    Traversal.findNestedDeclarations(c, found);
+                }
+            }
+        }
+    }
     traverseStructure(node) {
+        if (this.declaredEarly.has(node) && this.emittingEarly === false) {
+            return new chunk_1.Chunk();
+        }
+        else if (this.blockDepth === 0 && node.get() instanceof abaplint.Structures.Normal) {
+            return this.traverseProcedureLevel(node);
+        }
         const list = StructureTranspilers;
         const ret = new chunk_1.Chunk();
         const search = node.get().constructor.name + "Transpiler";
@@ -126578,6 +126790,9 @@ this.INTERNAL_ID = abap.internalIdCounter++;\n`;
         return ret;
     }
     traverseStatement(node) {
+        if (this.declaredEarly.has(node) && this.emittingEarly === false) {
+            return new chunk_1.Chunk();
+        }
         const list = StatementTranspilers;
         const search = node.get().constructor.name + "Transpiler";
         if (list[search]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.13.98",
+  "version": "2.13.99",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -27,8 +27,8 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/core": "^2.120.66",
-    "@abaplint/transpiler": "^2.13.98",
+    "@abaplint/core": "^2.120.68",
+    "@abaplint/transpiler": "^2.13.99",
     "@types/glob": "^9.0.0",
     "@types/node": "^26.6.2",
     "@types/progress": "^2.0.7",