[pypy-svn] r18992 - in pypy/dist/pypy/translator/llvm: . test

[ericvrp at codespeak.net]

Author: ericvrp
Date: Wed Oct 26 11:43:22 2005
New Revision: 18992

Modified:
   pypy/dist/pypy/translator/llvm/exception.py
   pypy/dist/pypy/translator/llvm/gc.py
   pypy/dist/pypy/translator/llvm/genllvm.py
   pypy/dist/pypy/translator/llvm/log.py
   pypy/dist/pypy/translator/llvm/test/test_class.py
   pypy/dist/pypy/translator/llvm/test/test_extfunc.py
   pypy/dist/pypy/translator/llvm/test/test_gc.py
   pypy/dist/pypy/translator/llvm/test/test_genllvm.py
   pypy/dist/pypy/translator/llvm/test/test_lltype.py
Log:
* removed (ahum) forward declaration imports (don't ask)

* cleaned up some logging issues



Modified: pypy/dist/pypy/translator/llvm/exception.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/exception.py	(original)
+++ pypy/dist/pypy/translator/llvm/exception.py	Wed Oct 26 11:43:22 2005
@@ -51,13 +51,10 @@
     def new(exceptionpolicy=None):  #factory
         exceptionpolicy = exceptionpolicy or 'explicit'
         if exceptionpolicy == 'invokeunwind':
-            from pypy.translator.llvm.exception import InvokeUnwindExceptionPolicy
             exceptionpolicy = InvokeUnwindExceptionPolicy()
         elif exceptionpolicy == 'explicit':
-            from pypy.translator.llvm.exception import ExplicitExceptionPolicy
             exceptionpolicy = ExplicitExceptionPolicy()
         elif exceptionpolicy == 'none':
-            from pypy.translator.llvm.exception import NoneExceptionPolicy
             exceptionpolicy = NoneExceptionPolicy()
         else:
             raise Exception, 'unknown exceptionpolicy: ' + str(exceptionpolicy)

Modified: pypy/dist/pypy/translator/llvm/gc.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/gc.py	(original)
+++ pypy/dist/pypy/translator/llvm/gc.py	Wed Oct 26 11:43:22 2005
@@ -1,8 +1,5 @@
-import py
-from pypy.tool.ansi_print import ansi_log
-log = py.log.Producer("llvm")
-log.setconsumer("llvm", ansi_log)
-
+from pypy.translator.llvm.log import log
+log = log.gc
 
 class GcPolicy:
     def __init__(self):
@@ -32,13 +29,10 @@
             gcpolicy = 'none'
 
         if gcpolicy == 'boehm':
-            from pypy.translator.llvm.gc import BoehmGcPolicy
             gcpolicy = BoehmGcPolicy()
         elif gcpolicy == 'ref':
-            from pypy.translator.llvm.gc import RefcountingGcPolicy
             gcpolicy = RefcountingGcPolicy()
         elif gcpolicy == 'none':
-            from pypy.translator.llvm.gc import NoneGcPolicy
             gcpolicy = NoneGcPolicy()
         else:
             raise Exception, 'unknown gcpolicy: ' + str(gcpolicy)

Modified: pypy/dist/pypy/translator/llvm/genllvm.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/genllvm.py	(original)
+++ pypy/dist/pypy/translator/llvm/genllvm.py	Wed Oct 26 11:43:22 2005
@@ -22,10 +22,7 @@
 from pypy.translator.llvm.gc import GcPolicy
 from pypy.translator.llvm.exception import ExceptionPolicy
 from pypy.translator.translator import Translator
-
-from pypy.tool.ansi_print import ansi_log
-log = py.log.Producer("llvm")
-log.setconsumer("llvm", ansi_log)
+from pypy.translator.llvm.log import log
 
 function_count = {}
 llexterns_header = llexterns_functions = None

Modified: pypy/dist/pypy/translator/llvm/log.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/log.py	(original)
+++ pypy/dist/pypy/translator/llvm/log.py	Wed Oct 26 11:43:22 2005
@@ -1,4 +1,4 @@
 import py
-log = py.log.Producer('genllvm') 
-py.log.setconsumer('genllvm', None) 
-
+from pypy.tool.ansi_print import ansi_log
+log = py.log.Producer('llvm') 
+py.log.setconsumer('llvm', ansi_log) 

Modified: pypy/dist/pypy/translator/llvm/test/test_class.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/test/test_class.py	(original)
+++ pypy/dist/pypy/translator/llvm/test/test_class.py	Wed Oct 26 11:43:22 2005
@@ -6,8 +6,6 @@
 from pypy.translator.llvm.test.runtest import compile_function
 from pypy.translator.llvm.test import llvmsnippet
 
-#py.log.setconsumer("genllvm", py.log.STDOUT)
-
 class TestClass(object):
     def test_classsimple(self):
         f = compile_function(llvmsnippet.class_simple, [])

Modified: pypy/dist/pypy/translator/llvm/test/test_extfunc.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/test/test_extfunc.py	(original)
+++ pypy/dist/pypy/translator/llvm/test/test_extfunc.py	Wed Oct 26 11:43:22 2005
@@ -8,9 +8,6 @@
 from pypy.translator.llvm.test.runtest import compile_function
 from pypy.rpython.rarithmetic import r_uint
 
-py.log.setconsumer("genllvm", py.log.STDOUT)
-py.log.setconsumer("genllvm database prepare", None)
-
 def test_external_function_ll_os_dup():
     def fn():
         return os.dup(0)

Modified: pypy/dist/pypy/translator/llvm/test/test_gc.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/test/test_gc.py	(original)
+++ pypy/dist/pypy/translator/llvm/test/test_gc.py	Wed Oct 26 11:43:22 2005
@@ -3,9 +3,6 @@
 
 from pypy.translator.llvm.test.runtest import compile_module_function
 
-py.log.setconsumer("genllvm", py.log.STDOUT)
-py.log.setconsumer("genllvm database prepare", None)
-
 def test_GC_malloc(): 
     #XXX how to get to gcpolicy?
     #if not use_boehm_gc:

Modified: pypy/dist/pypy/translator/llvm/test/test_genllvm.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/test/test_genllvm.py	(original)
+++ pypy/dist/pypy/translator/llvm/test/test_genllvm.py	Wed Oct 26 11:43:22 2005
@@ -6,9 +6,6 @@
 from pypy.rpython.rarithmetic import r_uint
 from pypy.translator.llvm.test.runtest import compile_function
 
-py.log.setconsumer("genllvm", py.log.STDOUT)
-py.log.setconsumer("genllvm database prepare", None)
-
 def test_return1():
     def simple1():
         return 1

Modified: pypy/dist/pypy/translator/llvm/test/test_lltype.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/test/test_lltype.py	(original)
+++ pypy/dist/pypy/translator/llvm/test/test_lltype.py	Wed Oct 26 11:43:22 2005
@@ -7,9 +7,6 @@
 from pypy.translator.llvm import database, codewriter
 from pypy.rpython import rarithmetic 
 
-py.log.setconsumer("genllvm", py.log.STDOUT)
-py.log.setconsumer("genllvm database prepare", None)
-
 S = lltype.Struct("base", ('a', lltype.Signed), ('b', lltype.Signed))
 
 def test_struct_constant1():