cashc 0.13.1 → 0.13.2

package/dist/generation/GenerateTargetTraversal.d.ts

@@ -42,7 +42,9 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     visitDoWhile(node: DoWhileNode): Node;
     visitWhile(node: WhileNode): Node;
     visitFor(node: ForNode): Node;
+    private emitLoopCondition;
     removeScopedVariables(depthBeforeScope: number, node: Node): void;
+    private tagScopeCleanup;
     visitCast(node: CastNode): Node;
     visitFunctionCall(node: FunctionCallNode): Node;
     visitMultiSig(node: FunctionCallNode): Node;

package/dist/generation/GenerateTargetTraversal.js

@@ -151,11 +151,13 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     }
     cleanStack(functionBodyNode) {
         // Keep final verification value, OP_NIP the other stack values
+        const tagStartIndex = this.output.length;
         const stackSize = this.stack.length;
         for (let i = 0; i < stackSize - 1; i += 1) {
             this.emit(Op.OP_NIP, { location: functionBodyNode.location, positionHint: PositionHint.END });
             this.nipFromStack();
         }
+        this.tagScopeCleanup(tagStartIndex);
     }
     enforceFunctionParameterTypes(node) {
         node.parameters.forEach((parameter) => this.enforceFunctionParameterType(parameter));
@@ -349,12 +351,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
         const bodyStackDepth = this.stack.length;
         node.block = this.visit(node.block);
         this.removeScopedVariables(bodyStackDepth, node.block);
-        this.emit(Op.OP_ENDIF, { location: node.block.location, positionHint: PositionHint.END });
-        this.emit(Op.OP_FROMALTSTACK, { location: node.block.location, positionHint: PositionHint.END });
-        this.pushToStack('(value)');
-        this.emit(Op.OP_NOT, { location: node.location, positionHint: PositionHint.END });
-        this.emit(Op.OP_UNTIL, { location: node.location, positionHint: PositionHint.END });
-        this.popFromStack();
+        this.emitLoopCondition(node);
         this.scopeDepth -= 1;
         return node;
     }
@@ -377,22 +374,46 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
         const updateEndIndex = this.output.length - 1;
         this.sourceTags.push({ startIndex: updateStartIndex, endIndex: updateEndIndex, kind: SourceTagKind.FOR_UPDATE });
         this.removeScopedVariables(bodyStackDepth, node.block);
+        this.emitLoopCondition(node);
+        this.scopeDepth -= 1;
+        this.removeScopedVariables(forScopeStackDepth, node);
+        return node;
+    }
+    // Emits the loop-back epilogue shared by while- and for-loops: OP_ENDIF closes the body branch,
+    // then OP_FROMALTSTACK OP_NOT OP_UNTIL re-checks the saved condition and jumps back. These are
+    // compiler-injected and map to the closing brace; tag them so the debug reconstruction renders a
+    // ">>> loop condition check" annotation line (and the following loop-variable cleanup) before the brace.
+    emitLoopCondition(node) {
+        const tagStartIndex = this.output.length;
         this.emit(Op.OP_ENDIF, { location: node.block.location, positionHint: PositionHint.END });
         this.emit(Op.OP_FROMALTSTACK, { location: node.block.location, positionHint: PositionHint.END });
         this.pushToStack('(value)');
         this.emit(Op.OP_NOT, { location: node.location, positionHint: PositionHint.END });
         this.emit(Op.OP_UNTIL, { location: node.location, positionHint: PositionHint.END });
         this.popFromStack();
-        this.scopeDepth -= 1;
-        this.removeScopedVariables(forScopeStackDepth, node);
-        return node;
+        this.sourceTags.push({
+            startIndex: tagStartIndex,
+            endIndex: this.output.length - 1,
+            kind: SourceTagKind.LOOP_CONDITION,
+        });
     }
     removeScopedVariables(depthBeforeScope, node) {
+        const tagStartIndex = this.output.length;
         const dropCount = this.stack.length - depthBeforeScope;
         for (let i = 0; i < dropCount; i += 1) {
             this.emit(Op.OP_DROP, { location: node.location, positionHint: PositionHint.END });
             this.popFromStack();
         }
+        this.tagScopeCleanup(tagStartIndex);
+    }
+    tagScopeCleanup(tagStartIndex) {
+        if (this.output.length <= tagStartIndex)
+            return;
+        this.sourceTags.push({
+            startIndex: tagStartIndex,
+            endIndex: this.output.length - 1,
+            kind: SourceTagKind.SCOPE_CLEANUP,
+        });
     }
     visitCast(node) {
         node.expression = this.visit(node.expression);

package/dist/index.d.ts

@@ -3,4 +3,4 @@ export * as utils from '@cashscript/utils';
 export { compileFile, compileString, type CompileOptions } from './compiler.js';
 export * from './ast/Location.js';
 export * from './ast/error-listeners.js';
-export declare const version = "0.13.1";
+export declare const version = "0.13.2";

package/dist/index.js

@@ -3,5 +3,5 @@ export * as utils from '@cashscript/utils';
 export { compileFile, compileString } from './compiler.js';
 export * from './ast/Location.js';
 export * from './ast/error-listeners.js';
-export const version = '0.13.1';
+export const version = '0.13.2';
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cashc",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "description": "Compile Bitcoin Cash contracts to Bitcoin Cash Script or artifacts",
   "keywords": [
     "bitcoin",
@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^3.1.0-next.8",
-    "@cashscript/utils": "^0.13.1",
+    "@cashscript/utils": "^0.13.2",
     "antlr4": "^4.13.2",
     "commander": "^14.0.0",
     "semver": "^7.7.2"
@@ -64,5 +64,5 @@
     "typescript": "^5.9.2",
     "vitest": "^4.0.15"
   },
-  "gitHead": "b5248b51a2ef93d750dcf916743eac9b79f62b5b"
+  "gitHead": "a4f112abb0d035ecf018ebc694e2b081f25b3409"
 }