[pypy-svn] r26589 - in pypy/dist/pypy/translator/cl: . test

[sanxiyn at codespeak.net]

Author: sanxiyn
Date: Sun Apr 30 08:55:42 2006
New Revision: 26589

Modified:
   pypy/dist/pypy/translator/cl/buildcl.py
   pypy/dist/pypy/translator/cl/test/test_oo.py
Log:
Rename generate_cl_func to generate_cl_code (since the string representation
of the code, not the compiled function, is returned)


Modified: pypy/dist/pypy/translator/cl/buildcl.py
==============================================================================
--- pypy/dist/pypy/translator/cl/buildcl.py	(original)
+++ pypy/dist/pypy/translator/cl/buildcl.py	Sun Apr 30 08:55:42 2006
@@ -76,7 +76,7 @@
 """
 
 def _make_cl_func(func, cl, path, argtypes=[]):
-    out = generate_cl_func(func, argtypes)
+    code = generate_cl_code(func, argtypes)
     fpath = path.join("%s.lisp" % func.func_name)
 
     if clconftest.option.prettyprint:
@@ -86,7 +86,7 @@
         fp.close()
 
     def _(*args):
-        fpath.write(out)
+        fpath.write(code)
         fp = file(str(fpath), "a")
         print >>fp, "(write (", clrepr(func.func_name, symbol=True),
         for arg in args:
@@ -99,7 +99,7 @@
         return readlisp(output)
     return _
 
-def generate_cl_func(func, argtypes=[]):
+def generate_cl_code(func, argtypes=[]):
     t = TranslationContext()
     t.buildannotator().build_types(func, argtypes)
     t.buildrtyper(type_system="ootype").specialize()

Modified: pypy/dist/pypy/translator/cl/test/test_oo.py
==============================================================================
--- pypy/dist/pypy/translator/cl/test/test_oo.py	(original)
+++ pypy/dist/pypy/translator/cl/test/test_oo.py	Sun Apr 30 08:55:42 2006
@@ -1,5 +1,5 @@
 import py
-from pypy.translator.cl.buildcl import make_cl_func, generate_cl_func
+from pypy.translator.cl.buildcl import make_cl_func, generate_cl_code
 
 def test_simple():
     class C:
@@ -39,8 +39,7 @@
         obj.inc()
         obj.inc()
         return obj.get()
-    code = generate_cl_func(inc_two, [int])
-    print code
+    code = generate_cl_code(inc_two, [int])
     methodcount = code.count("defmethod")
     assert methodcount == 3
 
@@ -51,8 +50,7 @@
         pass
     def check_inheritance():
         Bar()
-    code = generate_cl_func(check_inheritance)
-    print code
+    code = generate_cl_code(check_inheritance)
     classcount = code.count("defclass")
     # Divide by two to get rid of meta hierarchy
     # Minus one to get rid of Object