[pypy-svn] r27171 - in pypy/dist/pypy: annotation rpython/ootypesystem/test

[antocuni at codespeak.net]

Author: antocuni
Date: Sat May 13 15:39:18 2006
New Revision: 27171

Modified:
   pypy/dist/pypy/annotation/builtin.py
   pypy/dist/pypy/rpython/ootypesystem/test/test_ooann.py
Log:
Corrected a bug in the annotation of oostring, and a typo in
test_ooann (thanks to pedronis).



Modified: pypy/dist/pypy/annotation/builtin.py
==============================================================================
--- pypy/dist/pypy/annotation/builtin.py	(original)
+++ pypy/dist/pypy/annotation/builtin.py	Sat May 13 15:39:18 2006
@@ -502,8 +502,9 @@
     return SomeInteger()
 
 def oostring(obj):
-    assert isinstance(obj, (SomeInteger, SomeChar, SomeString))
-    return SomeString()
+    assert (isinstance(obj, (SomeInteger, SomeChar)) or
+            isinstance(obj, SomeOOInstance) and obj.ootype is ootype.String)
+    return SomeOOInstance(ootype.String)
 
 BUILTIN_ANALYZERS[ootype.instanceof] = instanceof
 BUILTIN_ANALYZERS[ootype.new] = new

Modified: pypy/dist/pypy/rpython/ootypesystem/test/test_ooann.py
==============================================================================
--- pypy/dist/pypy/rpython/ootypesystem/test/test_ooann.py	(original)
+++ pypy/dist/pypy/rpython/ootypesystem/test/test_ooann.py	Sat May 13 15:39:18 2006
@@ -209,7 +209,7 @@
 
 def test_oostring():
     def oof():
-        return new
+        return oostring
 
     a = RPythonAnnotator()
     s = a.build_types(oof, [])