[pypy-svn] r17321 - pypy/dist/pypy/translator/llvm

[ericvrp at codespeak.net]

Author: ericvrp
Date: Wed Sep  7 14:15:22 2005
New Revision: 17321

Modified:
   pypy/dist/pypy/translator/llvm/externs2ll.py
   pypy/dist/pypy/translator/llvm/funcnode.py
   pypy/dist/pypy/translator/llvm/opwriter.py
Log:
cosmetics


Modified: pypy/dist/pypy/translator/llvm/externs2ll.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/externs2ll.py	(original)
+++ pypy/dist/pypy/translator/llvm/externs2ll.py	Wed Sep  7 14:15:22 2005
@@ -66,7 +66,7 @@
 
 
 def post_setup_externs(db):
-    rtyper = db._translator.rtyper
+    rtyper = db.translator.rtyper
     from pypy.translator.c.extfunc import predeclare_all
 
     # hacks to make predeclare_all work
@@ -78,7 +78,7 @@
         if isinstance(obj, lltype.LowLevelType):
             db.prepare_type(obj)
         elif isinstance(obj, types.FunctionType):
-            funcptr = getfunctionptr(db._translator, obj)
+            funcptr = getfunctionptr(db.translator, obj)
             c = inputconst(lltype.typeOf(funcptr), funcptr)
             db.prepare_arg_value(c)
         elif isinstance(lltype.typeOf(obj), lltype.Ptr):
@@ -105,7 +105,7 @@
             s = "#define %s struct %s\n%s;\n" % (c_name, c_name, c_name)
             ccode.append(s)
         elif isinstance(obj, types.FunctionType):
-            funcptr = getfunctionptr(db._translator, obj)
+            funcptr = getfunctionptr(db.translator, obj)
             c = inputconst(lltype.typeOf(funcptr), funcptr)
             predeclarefn(c_name, db.repr_arg(c))
         elif isinstance(lltype.typeOf(obj), lltype.Ptr):

Modified: pypy/dist/pypy/translator/llvm/funcnode.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/funcnode.py	(original)
+++ pypy/dist/pypy/translator/llvm/funcnode.py	Wed Sep  7 14:15:22 2005
@@ -39,7 +39,7 @@
         self.ref   = self.make_ref('%pypy_', value.graph.name)
         self.graph = value.graph 
         remove_same_as(self.graph) 
-        remove_double_links(self.db._translator, self.graph) 
+        remove_double_links(self.db.translator, self.graph) 
 
     def __str__(self):
         return "<FuncNode %r>" %(self.ref,)

Modified: pypy/dist/pypy/translator/llvm/opwriter.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/opwriter.py	(original)
+++ pypy/dist/pypy/translator/llvm/opwriter.py	Wed Sep  7 14:15:22 2005
@@ -335,7 +335,7 @@
         else:
             self.codewriter.invoke_void(functionref, argrefs, argtypes, none_label, exc_label)
 
-        e = self.db._translator.rtyper.getexceptiondata()
+        e = self.db.translator.rtyper.getexceptiondata()
         ll_exception_match       = '%pypy_' + e.ll_exception_match.__name__
         lltype_of_exception_type = ('%structtype.' +
                                     e.lltype_of_exception_type.TO.__name__