Merge pull request #609 from RevengerWizard/develop

Close upvalues after `continue` and `break` statements
dictu-lang · Mar 7, 2023 · 1eae67a · 1eae67a
2 parents 6bb92ba + 7a84bd3
commit 1eae67a
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/src/vm/compiler.c b/src/vm/compiler.c
@@ -2259,7 +2259,14 @@ static void breakStatement(Compiler *compiler) {
     for (int i = compiler->localCount - 1;
          i >= 0 && compiler->locals[i].depth > compiler->loop->scopeDepth;
          i--) {
-        emitByte(compiler, OP_POP);
+        if(compiler->locals[i].isUpvalue)
+        {
+            emitByte(compiler, OP_CLOSE_UPVALUE);
+        }
+        else
+        {
+            emitByte(compiler, OP_POP);
+        }
     }
 
     emitJump(compiler, OP_BREAK);
@@ -2276,7 +2283,14 @@ static void continueStatement(Compiler *compiler) {
     for (int i = compiler->localCount - 1;
          i >= 0 && compiler->locals[i].depth > compiler->loop->scopeDepth;
          i--) {
-        emitByte(compiler, OP_POP);
+        if(compiler->locals[i].isUpvalue)
+        {
+            emitByte(compiler, OP_CLOSE_UPVALUE);
+        }
+        else
+        {
+            emitByte(compiler, OP_POP);
+        }
     }
 
     // Jump to top of current innermost loop.