compile: fix continue in with block

ncw · ncw · commit 1d7e5283a3ad · 2015-05-25T15:23:53.000+01:00
diff --git a/compile/compile.go b/compile/compile.go
@@ -659,6 +659,7 @@ func (c *compiler) with(node *ast.With, pos int) {
 	c.Jump(vm.SETUP_WITH, finally)
 
 	/* SETUP_WITH pushes a finally block. */
+	c.loops.Push(loop{Type: finallyTryLoop})
 	if item.OptionalVars != nil {
 		c.Expr(item.OptionalVars)
 	} else {
@@ -676,6 +677,7 @@ func (c *compiler) with(node *ast.With, pos int) {
 
 	/* End of try block; start the finally block */
 	c.Op(vm.POP_BLOCK)
+	c.loops.Pop()
 	c.LoadConst(py.None)
 
 	/* Finally block starts; context.__exit__ is on the stack under
diff --git a/compile/compile_data_test.go b/compile/compile_data_test.go
@@ -5633,6 +5633,23 @@ var compileTestData = []struct {
 	}, nil, ""},
 	{"while truth():\n    try:\n        f()\n    finally:\n        continue\n    ", "exec", nil, py.SyntaxError, "'continue' not supported inside 'finally' clause"},
 	{"while truth():\n    try:\n        f()\n    finally:\n        try:\n            continue\n        except:\n             pass\n    ", "exec", nil, py.SyntaxError, "'continue' not supported inside 'finally' clause"},
+	{"while x:\n    with c:\n        continue\n    ", "exec", &py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      8,
+		Flags:          64,
+		Code:           "\x78\x1a\x00\x65\x00\x00\x72\x1c\x00\x65\x01\x00\x8f\x08\x00\x01\x77\x03\x00\x57\x64\x00\x00\x51\x58\x71\x03\x00\x57\x64\x00\x00\x53",
+		Consts:         []py.Object{py.None},
+		Names:          []string{"x", "c"},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "\x09\x01\x07\x01",
+	}, nil, ""},
 	{"print(\"hello world!\")\n", "single", &py.Code{
 		Argcount:       0,
 		Kwonlyargcount: 0,
diff --git a/compile/make_compile_test.py b/compile/make_compile_test.py
@@ -592,6 +592,11 @@ def f():
         except:
              pass
     ''', "exec", SyntaxError),
+    ('''\
+while x:
+    with c:
+        continue
+    ''', "exec"),
     # interactive
     ('''print("hello world!")\n''', "single"),
     # FIXME ('''if True:\n "hello world!"\n''', "single"),
