[pypy-svn] r38230 - pypy/dist/pypy/translator/cli

antocuni at codespeak.net antocuni at codespeak.net
Fri Feb 9 10:42:26 CET 2007


Author: antocuni
Date: Fri Feb  9 10:42:25 2007
New Revision: 38230

Modified:
   pypy/dist/pypy/translator/cli/class_.py
Log:
Fix both test_overridden_classattr_as_defaults and the translation on
windows.



Modified: pypy/dist/pypy/translator/cli/class_.py
==============================================================================
--- pypy/dist/pypy/translator/cli/class_.py	(original)
+++ pypy/dist/pypy/translator/cli/class_.py	Fri Feb  9 10:42:25 2007
@@ -134,9 +134,10 @@
             cts_type = self.cts.lltype_to_cts(F_TYPE)
             f_name = self.cts.escape_name(f_name)
             if cts_type != 'void':
+                INSTANCE_DEF, _ = self.INSTANCE._lookup_field(f_name)
                 self.ilasm.opcode('ldarg.0')
                 push_constant(self.db, F_TYPE, f_default, self.gen)
-                class_name = self.db.class_name(self.INSTANCE)
+                class_name = self.db.class_name(INSTANCE_DEF)
                 self.ilasm.set_field((cts_type, class_name, f_name))
 
         self.ilasm.opcode('ret')



More information about the Pypy-commit mailing list