add again freevars to BaseBytecode

MatthieuDartiailh · Feb 29, 2016 · 057a241 · 057a241
1 parent 8300835
commit 057a241
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/bytecode/bytecode.py b/bytecode/bytecode.py
@@ -18,6 +18,9 @@ def __init__(self):
         self.filename = '<string>'
         self.docstring = UNSET
         self.cellvars = []
+        # we cannot recreate freevars from instructions because of super()
+        # special-case
+        self.freevars = []
 
     def _copy_attr_from(self, bytecode):
         self.argcount = bytecode.argcount
@@ -29,6 +32,7 @@ def _copy_attr_from(self, bytecode):
         self.filename = bytecode.filename
         self.docstring = bytecode.docstring
         self.cellvars = list(bytecode.cellvars)
+        self.freevars = list(bytecode.freevars)
 
     def __eq__(self, other):
         if type(self) != type(other):
@@ -52,6 +56,8 @@ def __eq__(self, other):
             return False
         if self.cellvars != other.cellvars:
             return False
+        if self.freevars != other.freevars:
+            return False
 
         return True
 

diff --git a/bytecode/concrete.py b/bytecode/concrete.py
@@ -113,7 +113,6 @@ def __init__(self):
         self.consts = []
         self.names = []
         self.varnames = []
-        self.freevars = []
 
     def __repr__(self):
         return '<ConcreteBytecode instr#=%s>' % len(self)
@@ -131,8 +130,6 @@ def __eq__(self, other):
             return False
         if self.varnames != other.varnames:
             return False
-        if self.freevars != other.freevars:
-            return False
 
         return super().__eq__(other)
 
@@ -350,7 +347,6 @@ def __init__(self, code):
         self.consts = {}
         self.names = []
         self.varnames = []
-        self.freevars = []
 
     def add_const(self, value):
         key = const_key(value)
@@ -403,7 +399,7 @@ def concrete_instructions(self):
                     try:
                         arg = self.bytecode.cellvars.index(arg)
                     except ValueError:
-                        arg = self.add(self.freevars, arg)
+                        arg = self.bytecode.freevars.index(arg)
 
                 instr = ConcreteInstr(instr.name, arg, lineno=lineno)
                 if is_jump:
@@ -470,7 +466,6 @@ def to_concrete_bytecode(self):
         concrete.consts = consts
         concrete.names = self.names
         concrete.varnames = self.varnames
-        concrete.freevars = self.freevars
 
         # copy instructions
         concrete[:] = self.instructions

diff --git a/bytecode/tests/test_concrete.py b/bytecode/tests/test_concrete.py
@@ -481,6 +481,7 @@ def test_dont_merge_constants(self):
     def test_cellvars(self):
         code = Bytecode()
         code.cellvars = ['x']
+        code.freevars = ['y']
         code.extend([Instr('LOAD_DEREF', 'x', lineno=1),
                      Instr('LOAD_DEREF', 'y', lineno=1)])
         concrete = code.to_concrete_bytecode()