Remove unused globals param from Block.Exec().

compiler/expr_visitor.py

@@ -433,7 +433,7 @@ class ExprVisitor(ast.NodeVisitor):
             self.writer.write('return πg.NewGenerator('
                               'πBlock, πGlobals).ToObject(), nil')
           else:
-            self.writer.write('return πBlock.Exec(πF, πGlobals)')
+            self.writer.write('return πBlock.Exec(πF)')
         else:
           assert not func_block.is_generator
           self.writer.write('var πE *πg.BaseException\n_ = πE')

compiler/stmt.py

@@ -122,7 +122,7 @@ class StatementVisitor(ast.NodeVisitor):
         self.writer.write_block(body_visitor.block,
                                 body_visitor.writer.out.getvalue())
       tmpl = textwrap.dedent("""\
-          \treturn πBlock.Exec(πF, πGlobals)
+          \treturn πBlock.Exec(πF)
           }).Eval(πF, πGlobals, nil, nil)
           if πE != nil {
           \treturn nil, πE

runtime/block.go

@@ -28,7 +28,7 @@ func NewBlock(fn func(*Frame, *Object) (*Object, *BaseException)) *Block {
 }
 
 // Exec runs b in the context of a new child frame of back.
-func (b *Block) Exec(f *Frame, globals *Dict) (*Object, *BaseException) {
+func (b *Block) Exec(f *Frame) (*Object, *BaseException) {
 	return b.execInternal(f, nil)
 }
 

runtime/block_test.go

@@ -44,7 +44,7 @@ func TestBlockExecTryExcept(t *testing.T) {
 		args = append(args, blockArgs{f, e})
 		return None, nil
 	})
-	b.Exec(newFrame(nil), NewDict())
+	b.Exec(newFrame(nil))
 	wantExc := mustCreateException(RuntimeErrorType, "foo")
 	if len(args) != 2 {
 		t.Errorf("called %d times, want 2", len(args))
@@ -59,16 +59,15 @@ func TestBlockExecTryExcept(t *testing.T) {
 
 func TestBlockExecRaises(t *testing.T) {
 	var f1, f2 *Frame
-	globals := NewDict()
 	b1 := NewBlock(func(f *Frame, _ *Object) (*Object, *BaseException) {
 		f1 = f
 		return nil, f.RaiseType(ValueErrorType, "bar")
 	})
 	b2 := NewBlock(func(f *Frame, _ *Object) (*Object, *BaseException) {
 		f2 = f
-		return b1.Exec(f, globals)
+		return b1.Exec(f)
 	})
-	b2.Exec(newFrame(nil), NewDict())
+	b2.Exec(newFrame(nil))
 	e, tb := f1.ExcInfo()
 	wantExc := mustCreateException(ValueErrorType, "bar")
 	if !exceptionsAreEquivalent(e, wantExc) {

tools/grumpc

@@ -84,7 +84,7 @@ def main(args):
         _ = πGlobals"""))  # Suppress possible Go "declared and not used" error.
     writer.write_block(mod_block, visitor.writer.out.getvalue())
   writer.write(textwrap.dedent("""\
-      \treturn πBlock.Exec(πF, πGlobals)
+      \treturn πBlock.Exec(πF)
       }
       var Code *πg.Code"""))