Remove πGlobals in favor of πF.Globals().

compiler/block.py

@@ -195,7 +195,7 @@ class Block(object):
   def _resolve_global(self, writer, name):
     result = self.alloc_temp()
     writer.write_checked_call2(
-        result, 'πg.ResolveGlobal(πF, πGlobals, {})', self.intern(name))
+        result, 'πg.ResolveGlobal(πF, πF.Globals(), {})', self.intern(name))
     return result
 
 
@@ -218,11 +218,12 @@ class ModuleBlock(Block):
 
   def bind_var(self, writer, name, value):
     writer.write_checked_call1(
-        'πGlobals.SetItem(πF, {}.ToObject(), {})',
+        'πF.Globals().SetItem(πF, {}.ToObject(), {})',
         self.intern(name), value)
 
   def del_var(self, writer, name):
-    writer.write_checked_call1('πg.DelVar(πF, πGlobals, {})', self.intern(name))
+    writer.write_checked_call1('πg.DelVar(πF, πF.Globals(), {})',
+                               self.intern(name))
 
   def resolve_name(self, writer, name):
     return self._resolve_global(writer, name)
@@ -263,7 +264,7 @@ class ClassBlock(Block):
         block = block.parent_block
     result = self.alloc_temp()
     writer.write_checked_call2(
-        result, 'πg.ResolveClass(πF, πClass, {}, πGlobals, {})',
+        result, 'πg.ResolveClass(πF, πClass, {}, πF.Globals(), {})',
         local, self.intern(name))
     return result
 

compiler/expr_visitor.py

@@ -431,7 +431,7 @@ class ExprVisitor(ast.NodeVisitor):
           self.writer.write_block(func_block, body)
           if func_block.is_generator:
             self.writer.write('return πg.NewGenerator('
-                              'πBlock, πGlobals).ToObject(), nil')
+                              'πBlock, πF.Globals()).ToObject(), nil')
           else:
             self.writer.write('return πBlock.Exec(πF)')
         else:
@@ -442,7 +442,7 @@ class ExprVisitor(ast.NodeVisitor):
           with self.writer.indent_block(-1):
             self.writer.write(body)
           self.writer.write('return πg.None, nil')
-      self.writer.write('}), πGlobals).ToObject()')
+      self.writer.write('}), πF.Globals()).ToObject()')
     return result
 
   def _visit_seq_elts(self, elts):

compiler/stmt.py

@@ -106,7 +106,7 @@ class StatementVisitor(ast.NodeVisitor):
           self.writer.write('{}[{}] = {}'.format(bases.expr, i, b.expr))
       self.writer.write('{} = πg.NewDict()'.format(cls.name))
       self.writer.write_checked_call2(
-          mod_name, 'πGlobals.GetItem(πF, {}.ToObject())',
+          mod_name, 'πF.Globals().GetItem(πF, {}.ToObject())',
           self.block.intern('__name__'))
       self.writer.write_checked_call1(
           '{}.SetItem(πF, {}.ToObject(), {})',
@@ -123,7 +123,7 @@ class StatementVisitor(ast.NodeVisitor):
                                 body_visitor.writer.out.getvalue())
       tmpl = textwrap.dedent("""\
           \treturn πBlock.Exec(πF)
-          }).Eval(πF, πGlobals, nil, nil)
+          }).Eval(πF, πF.Globals(), nil, nil)
           if πE != nil {
           \treturn nil, πE
           }

tools/grumpc

@@ -79,9 +79,6 @@ def main(args):
   with writer.indent_block():
     for s in sorted(mod_block.strings):
       writer.write('ß{} := πg.InternStr({})'.format(s, util.go_str(s)))
-    writer.write(textwrap.dedent("""\
-        πGlobals := πF.Globals()
-        _ = π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)