[pypy-svn] r32759 - in pypy/branch/even-more-config/pypy/config: . test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Sat Sep 30 02:22:54 2006
New Revision: 32759

Modified:
   pypy/branch/even-more-config/pypy/config/pypyoption.py
   pypy/branch/even-more-config/pypy/config/test/test_pypyoption.py
Log:
rename typesystem to type_system (which seems more common). add some more
config options.


Modified: pypy/branch/even-more-config/pypy/config/pypyoption.py
==============================================================================
--- pypy/branch/even-more-config/pypy/config/pypyoption.py	(original)
+++ pypy/branch/even-more-config/pypy/config/pypyoption.py	Sat Sep 30 02:22:54 2006
@@ -105,26 +105,32 @@
     OptionDescription("translation", "Translation Options", [
         BoolOption("stackless", "compile stackless features in",
                    default=False, cmdline="--stackless",
-                   requires=[("translation.typesystem", "lltype")]),
-        ChoiceOption("typesystem", "Type system to use when RTyping",
-                     ["lltype", "ootype"], "lltype", cmdline=None),
+                   requires=[("translation.type_system", "lltype")]),
+        ChoiceOption("type_system", "Type system to use when RTyping",
+                     [None, "lltype", "ootype"], "lltype", cmdline=None),
         ChoiceOption("backend", "Backend to use for code generation",
-                     ["c", "llvm", "cli", "js", "squeak", "cl"], "c",
-                     cmdline="--gc",
+                     [None, "c", "llvm", "cli", "js", "squeak", "cl"], "c",
                      requires={
-                         "c":      [("translation.typesystem", "lltype")],
-                         "llvm":   [("translation.typesystem", "lltype")],
-                         "cli":    [("translation.typesystem", "ootype")],
-                         "js":     [("translation.typesystem", "ootype")],
-                         "squeak": [("translation.typesystem", "ootype")],
-                         "cl":     [("translation.typesystem", "ootype")],
+                         "c":      [("translation.type_system", "lltype")],
+                         "llvm":   [("translation.type_system", "lltype")],
+                         "cli":    [("translation.type_system", "ootype")],
+                         "js":     [("translation.type_system", "ootype")],
+                         "squeak": [("translation.type_system", "ootype")],
+                         "cl":     [("translation.type_system", "ootype")],
                          }),
         ChoiceOption("gc", "Garbage Collection Strategy",
                      ["boehm", "ref", "framework", "none", "stacklessgc"],
                       "boehm", requires={
-                         "stacklessgc": [("translation.stackless", True)]}),
+                         "stacklessgc": [("translation.stackless", True)]},
+                      cmdline="--gc"),
 
+        BoolOption("thread", "enable use of threading primitives",
+                   default=False),
         BoolOption("verbose", "Print extra information", default=False),
+        BoolOption("insist", "Try hard to go on RTyping", default=False),
+        BoolOption("lowmem", "Try to use little memory during translation",
+                   default=False, cmdline="--lowmem"),
+
 
         # Flags of the TranslationContext:
         BoolOption("verbose", "Print extra information", default=False),

Modified: pypy/branch/even-more-config/pypy/config/test/test_pypyoption.py
==============================================================================
--- pypy/branch/even-more-config/pypy/config/test/test_pypyoption.py	(original)
+++ pypy/branch/even-more-config/pypy/config/test/test_pypyoption.py	Sat Sep 30 02:22:54 2006
@@ -29,4 +29,4 @@
     conf = Config(pypy_optiondescription)
     conf.translation.gc = "stacklessgc"
     assert conf.translation.stackless
-    assert conf.translation.typesystem == "lltype"
+    assert conf.translation.type_system == "lltype"