[pypy-svn] r33534 - in pypy/dist/pypy/translator: jvm oosupport

[fijal at codespeak.net]

Author: fijal
Date: Sun Oct 22 14:37:12 2006
New Revision: 33534

Modified:
   pypy/dist/pypy/translator/jvm/conftest.py
   pypy/dist/pypy/translator/oosupport/metavm.py
Log:
Reverted commit that breaks JS tests. As well as commented out options which are duplicated with CLI conftest.


Modified: pypy/dist/pypy/translator/jvm/conftest.py
==============================================================================
--- pypy/dist/pypy/translator/jvm/conftest.py	(original)
+++ pypy/dist/pypy/translator/jvm/conftest.py	Sun Oct 22 14:37:12 2006
@@ -11,12 +11,12 @@
            help='Define the java executable to use'),
 ##    Option('--view', action='store_true', dest='view', default=False,
 ##           help='View the graphs before they are generated'),
-    Option('--wd', action='store_true', dest='wd', default=False,
-           help='Output to current directory instead of /tmp'),
+#    Option('--wd', action='store_true', dest='wd', default=False,
+#           help='Output to current directory instead of /tmp'),
     Option('--noassemble', action='store_true', dest="noasm", default=False,
            help="don't assemble jasmin files"),
-    Option('--norun', action='store_true', dest="norun", default=False,
-           help="don't run the compiled executable"),
+#    Option('--norun', action='store_true', dest="norun", default=False,
+#           help="don't run the compiled executable"),
     Option('--package', action='store', dest='package', default='pypy',
            help='Package to output generated classes into')
     #Option('--opt', action='XXX', dest='YYY', default=DEF, help='HELP')

Modified: pypy/dist/pypy/translator/oosupport/metavm.py
==============================================================================
--- pypy/dist/pypy/translator/oosupport/metavm.py	(original)
+++ pypy/dist/pypy/translator/oosupport/metavm.py	Sun Oct 22 14:37:12 2006
@@ -127,8 +127,8 @@
 ##        if field.value == 'meta':
 ##            return # TODO
         
-        if value.concretetype is ootype.Void:
-            return
+        #if value.concretetype is ootype.Void:
+        #    return
         generator.load(this)
         generator.load(value)
         generator.set_field(this.concretetype, field.value)
@@ -136,8 +136,9 @@
 class _GetField(MicroInstruction):
     def render(self, generator, op):
         # OOType produces void values on occassion that can safely be ignored
-        if op.result.concretetype is ootype.Void:
-            return
+        # XXX: That's not true
+        #if op.result.concretetype is ootype.Void:
+        #    return
         this, field = op.args
         generator.load(this)
         generator.get_field(this.concretetype, field.value)