vm: fix continue

Author: ncw

vm/eval.go

@@ -1,6 +1,10 @@
 // Evaluate opcodes
 package vm
 
+// FIXME vm.result -> retval
+// vm.exit -> vm.why
+// why codes
+
 // FIXME make opcode its own type so can stringer
 
 // FIXME use LocalVars instead of storing everything in the Locals dict
@@ -485,28 +489,15 @@ func do_PRINT_EXPR(vm *Vm, arg int32) {
 // Terminates a loop due to a break statement.
 func do_BREAK_LOOP(vm *Vm, arg int32) {
 	defer vm.CheckException()
-	// Jump
-	vm.frame.Lasti = vm.frame.Block.Handler
-	// Reset the stack (FIXME?)
-	vm.frame.Stack = vm.frame.Stack[:vm.frame.Block.Level]
-	vm.frame.PopBlock()
+	vm.exit = exitBreak
 }
 
 // Continues a loop due to a continue statement. target is the address
 // to jump to (which should be a FOR_ITER instruction).
 func do_CONTINUE_LOOP(vm *Vm, target int32) {
 	defer vm.CheckException()
-	switch vm.frame.Block.Type {
-	case SETUP_LOOP:
-	case SETUP_WITH:
-		vm.NotImplemented("CONTINUE_LOOP WITH", target)
-	case SETUP_EXCEPT:
-		vm.NotImplemented("CONTINUE_LOOP EXCEPT", target)
-	case SETUP_FINALLY:
-		vm.NotImplemented("CONTINUE_LOOP FINALLY", target)
-	default:
-	}
-	vm.frame.Lasti = vm.frame.Block.Handler
+	vm.result = py.Int(target)
+	vm.exit = exitContinue
 }
 
 // Iterate v argcnt times and store the results on the stack (via decreasing

vm/tests/loops.py

@@ -74,18 +74,17 @@
 assert a == 12
 
 doc="For continue in try/finally"
-# FIXME doesn't work yet!
-# ok = False
-# a = 0
-# for i in (1,2,3,4,5):
-#     if i == 3:
-#         try:
-#             continue
-#         finally:
-#             ok = True
-#     a += i
-# assert a == 12
-# assert ok
+ok = False
+a = 0
+for i in (1,2,3,4,5):
+    if i == 3:
+        try:
+            continue
+        finally:
+            ok = True
+    a += i
+assert a == 12
+assert ok
 
 # End with this
 doc="finished"