[pypy-svn] r48854 - pypy/branch/new-genc-tests-wrapper/pypy/translator/c

[cfbolz at codespeak.net]

Author: cfbolz
Date: Tue Nov 20 18:07:52 2007
New Revision: 48854

Modified:
   pypy/branch/new-genc-tests-wrapper/pypy/translator/c/gc.py
   pypy/branch/new-genc-tests-wrapper/pypy/translator/c/node.py
Log:
(cfbolz, rxe): some small simplification in the GC policy


Modified: pypy/branch/new-genc-tests-wrapper/pypy/translator/c/gc.py
==============================================================================
--- pypy/branch/new-genc-tests-wrapper/pypy/translator/c/gc.py	(original)
+++ pypy/branch/new-genc-tests-wrapper/pypy/translator/c/gc.py	Tue Nov 20 18:07:52 2007
@@ -15,20 +15,20 @@
         self.db = db
         self.thread_enabled = thread_enabled
 
-    def common_gcheader_definition(self, defnode):
+    def common_gcheader_definition(self):
         return []
 
     def common_gcheader_initdata(self, defnode):
         return []
 
-    def struct_gcheader_definition(self, defnode):
-        return self.common_gcheader_definition(defnode)
+    def struct_gcheader_definition(self):
+        return self.common_gcheader_definition()
 
     def struct_gcheader_initdata(self, defnode):
         return self.common_gcheader_initdata(defnode)
 
-    def array_gcheader_definition(self, defnode):
-        return self.common_gcheader_definition(defnode)
+    def array_gcheader_definition(self):
+        return self.common_gcheader_definition()
 
     def array_gcheader_initdata(self, defnode):
         return self.common_gcheader_initdata(defnode)
@@ -79,9 +79,9 @@
 class RefcountingGcPolicy(BasicGcPolicy):
     transformerclass = refcounting.RefcountingGCTransformer
 
-    def common_gcheader_definition(self, defnode):
-        if defnode.db.gctransformer is not None:
-            HDR = defnode.db.gctransformer.HDR
+    def common_gcheader_definition(self):
+        if self.db.gctransformer is not None:
+            HDR = self.db.gctransformer.HDR
             return [(name, HDR._flds[name]) for name in HDR._names]
         else:
             return []
@@ -312,7 +312,7 @@
         args = [funcgen.expr(v) for v in op.args]
         return '%s = %s; /* for moving GCs */' % (args[1], args[0])
 
-    def common_gcheader_definition(self, defnode):
+    def common_gcheader_definition(self):
         return defnode.db.gctransformer.gc_fields()
 
     def common_gcheader_initdata(self, defnode):

Modified: pypy/branch/new-genc-tests-wrapper/pypy/translator/c/node.py
==============================================================================
--- pypy/branch/new-genc-tests-wrapper/pypy/translator/c/node.py	(original)
+++ pypy/branch/new-genc-tests-wrapper/pypy/translator/c/node.py	Tue Nov 20 18:07:52 2007
@@ -78,7 +78,7 @@
         STRUCT = self.STRUCT
         varlength = self.varlength
         if needs_gcheader(self.STRUCT):
-            for fname, T in db.gcpolicy.struct_gcheader_definition(self):
+            for fname, T in db.gcpolicy.struct_gcheader_definition():
                 self.fields.append((fname, db.gettype(T, who_asks=self)))
         for name in STRUCT._names:
             T = self.c_struct_field_type(name)
@@ -223,7 +223,7 @@
         ARRAY = self.ARRAY
         self.gcinfo    # force it to be computed
         if needs_gcheader(ARRAY):
-            for fname, T in db.gcpolicy.array_gcheader_definition(self):
+            for fname, T in db.gcpolicy.array_gcheader_definition():
                 self.gcfields.append((fname, db.gettype(T, who_asks=self)))
         self.itemtypename = db.gettype(ARRAY.OF, who_asks=self)