[pypy-svn] r22776 - in pypy/branch/genc-gc-refactoring: . test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Sat Jan 28 13:03:48 2006
New Revision: 22776

Added:
   pypy/branch/genc-gc-refactoring/funcgen.py
      - copied unchanged from r22772, pypy/branch/genc-gc-refactoring/newfuncgen.py
   pypy/branch/genc-gc-refactoring/gc.py
      - copied unchanged from r22772, pypy/branch/genc-gc-refactoring/newgc.py
Removed:
   pypy/branch/genc-gc-refactoring/newfuncgen.py
   pypy/branch/genc-gc-refactoring/newgc.py
Modified:
   pypy/branch/genc-gc-refactoring/genc.py
   pypy/branch/genc-gc-refactoring/node.py
   pypy/branch/genc-gc-refactoring/test/test_newgc.py
Log:
(cfbolz, mwh)
remove the new versions of funcgen and gc on the branch...


Modified: pypy/branch/genc-gc-refactoring/genc.py
==============================================================================
--- pypy/branch/genc-gc-refactoring/genc.py	(original)
+++ pypy/branch/genc-gc-refactoring/genc.py	Sat Jan 28 13:03:48 2006
@@ -19,14 +19,12 @@
     _compiled = False
     symboltable = None
     stackless = False
-    use_new_funcgen = False
     
-    def __init__(self, translator, entrypoint, gcpolicy=None, libraries=None, thread_enabled=False, use_new_funcgen=False):
+    def __init__(self, translator, entrypoint, gcpolicy=None, libraries=None, thread_enabled=False):
         self.translator = translator
         self.entrypoint = entrypoint
         self.gcpolicy = gcpolicy
         self.thread_enabled = thread_enabled
-        self.use_new_funcgen = use_new_funcgen
 
         if libraries is None:
             libraries = []
@@ -40,7 +38,6 @@
         if self.stackless:
             from pypy.translator.c.stackless import StacklessData
             db.stacklessdata = StacklessData(db)
-        db.use_new_funcgen = self.use_new_funcgen
 
         # we need a concrete gcpolicy to do this
         self.libraries += db.gcpolicy.gc_libraries()

Modified: pypy/branch/genc-gc-refactoring/node.py
==============================================================================
--- pypy/branch/genc-gc-refactoring/node.py	(original)
+++ pypy/branch/genc-gc-refactoring/node.py	Sat Jan 28 13:03:48 2006
@@ -5,7 +5,6 @@
      parentlink, Ptr, PyObject, Void, OpaqueType, Float, \
      RuntimeTypeInfo, getRuntimeTypeInfo, Char
 from pypy.translator.c.funcgen import FunctionCodeGenerator
-from pypy.translator.c.newfuncgen import FunctionCodeGenerator as NewFunctionCodeGenerator
 from pypy.translator.c.external import CExternalFunctionCodeGenerator
 from pypy.translator.c.support import USESLOTS # set to False if necessary while refactoring
 from pypy.translator.c.support import cdecl, somelettersfrom, c_string_constant
@@ -549,11 +548,8 @@
     elif hasattr(fnobj, 'graph'):
         cpython_exc = getattr(fnobj, 'exception_policy', None) == "CPython"
         if hasattr(db, 'stacklessdata'):
-            assert not db.use_new_funcgen, "can't use stackless with the new funcgen yet"
             from pypy.translator.c.stackless import SlpFunctionCodeGenerator
             gencls = SlpFunctionCodeGenerator
-        elif db.use_new_funcgen:
-            gencls = NewFunctionCodeGenerator
         else:
             gencls = FunctionCodeGenerator
         return gencls(fnobj.graph, db, cpython_exc, functionname)

Modified: pypy/branch/genc-gc-refactoring/test/test_newgc.py
==============================================================================
--- pypy/branch/genc-gc-refactoring/test/test_newgc.py	(original)
+++ pypy/branch/genc-gc-refactoring/test/test_newgc.py	Sat Jan 28 13:03:48 2006
@@ -5,7 +5,7 @@
 
 from pypy.translator.tool.cbuild import skip_missing_compiler
 from pypy.translator.translator import TranslationContext
-from pypy.translator.c import genc, newgc
+from pypy.translator.c import genc, gc
 from pypy.rpython.lltypesystem import lltype
 
 from pypy.rpython.memory.gctransform import GCTransformer
@@ -16,8 +16,7 @@
     t.buildrtyper().specialize()
     GCTransformer(t.graphs).transform()
     
-    builder = genc.CExtModuleBuilder(t, fn, use_new_funcgen=True,
-                                     gcpolicy=newgc.RefcountingGcPolicy)
+    builder = genc.CExtModuleBuilder(t, fn, gcpolicy=gc.RefcountingGcPolicy)
     builder.generate_source()
     skip_missing_compiler(builder.compile)
     builder.import_module()