[pypy-svn] r26984 - pypy/dist/pypy/translator/goal

[arigo at codespeak.net]

Author: arigo
Date: Tue May  9 00:10:12 2006
New Revision: 26984

Modified:
   pypy/dist/pypy/translator/goal/targetpypystandalone.py
   pypy/dist/pypy/translator/goal/translate.py
Log:
For now, keep its original meaning to the --stackless option
and use --new-stackless for the stackless transformer.


Modified: pypy/dist/pypy/translator/goal/targetpypystandalone.py
==============================================================================
--- pypy/dist/pypy/translator/goal/targetpypystandalone.py	(original)
+++ pypy/dist/pypy/translator/goal/targetpypystandalone.py	Tue May  9 00:10:12 2006
@@ -89,7 +89,8 @@
         # thread might appear twice now, but the objspace can handle this
         usemodules.append('thread')
     if options.stackless:
-        raise MemoryError("in-progress, but maybe consumes tons of memory")
+        if options.stackless != 'old':
+            raise MemoryError("in-progress; might consume tons of memory")
         usemodules.append('stackless')
         
     space = StdObjSpace(nofaking=True,

Modified: pypy/dist/pypy/translator/goal/translate.py
==============================================================================
--- pypy/dist/pypy/translator/goal/translate.py	(original)
+++ pypy/dist/pypy/translator/goal/translate.py	Tue May  9 00:10:12 2006
@@ -49,8 +49,8 @@
     '1_backend': [OPT(('-b', '--backend'), "Backend", ['c', 'llvm', 'cl', 'squeak', 'js'])],
 
     '2_gc': [OPT(('--gc',), "Garbage collector", ['boehm', 'ref', 'framework', 'none', 'exact_boehm'])],
-    '3_stackless': [OPT(('--stackless',), "Stackless code generation", True)],
-    '4_stackless': [OPT(('--old-stackless',), "Stackless code generation (old GenC way)", 'old')],
+    '3_stackless': [OPT(('--new-stackless',), "Stackless code generation (graph transformer)", True)],
+    '4_stackless': [OPT(('--stackless',), "Stackless code generation (old GenC way)", 'old')],
     '5_merge_if_blocks': [OPT(('--no-if-blocks-merge',), "Do not merge if ... elif ... chains and use a switch statement for them.", False)],
     },