[pypy-svn] r22777 - in pypy/dist/pypy/translator/c: . test
mwh at codespeak.net
mwh at codespeak.net
Sat Jan 28 13:07:29 CET 2006
Author: mwh
Date: Sat Jan 28 13:07:26 2006
New Revision: 22777
Removed:
pypy/dist/pypy/translator/c/newfuncgen.py
pypy/dist/pypy/translator/c/newgc.py
pypy/dist/pypy/translator/c/test/test_newgc.py
Modified:
pypy/dist/pypy/translator/c/genc.py
pypy/dist/pypy/translator/c/node.py
Log:
(cfbolz,mwh)
... and on the branch.
We'll leave the trunk in peace. For now :)
Modified: pypy/dist/pypy/translator/c/genc.py
==============================================================================
--- pypy/dist/pypy/translator/c/genc.py (original)
+++ pypy/dist/pypy/translator/c/genc.py Sat Jan 28 13:07:26 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/dist/pypy/translator/c/node.py
==============================================================================
--- pypy/dist/pypy/translator/c/node.py (original)
+++ pypy/dist/pypy/translator/c/node.py Sat Jan 28 13:07:26 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)
More information about the Pypy-commit
mailing list