[pypy-svn] r10673 - in pypy/dist/pypy: annotation interpreter

[pedronis at codespeak.net]

Author: pedronis
Date: Fri Apr 15 16:19:03 2005
New Revision: 10673

Modified:
   pypy/dist/pypy/annotation/builtin.py
   pypy/dist/pypy/interpreter/argument.py
Log:
fix math.fmod, math.floor annotation!

fix Arguments.has_keywords -> SomeBool



Modified: pypy/dist/pypy/annotation/builtin.py
==============================================================================
--- pypy/dist/pypy/annotation/builtin.py	(original)
+++ pypy/dist/pypy/annotation/builtin.py	Fri Apr 15 16:19:03 2005
@@ -163,10 +163,10 @@
     return SomeString()
 
 def math_fmod(x, y):
-    return SomeObject()
+    return SomeFloat()
 
 def math_floor(x):
-    return SomeObject()
+    return SomeFloat()
 
 def rarith_ovfcheck(s_obj):
     if isinstance(s_obj, SomeInteger) and s_obj.unsigned:

Modified: pypy/dist/pypy/interpreter/argument.py
==============================================================================
--- pypy/dist/pypy/interpreter/argument.py	(original)
+++ pypy/dist/pypy/interpreter/argument.py	Fri Apr 15 16:19:03 2005
@@ -89,8 +89,8 @@
         return args
 
     def has_keywords(self):
-        return self.kwds_w or (self.w_starstararg is not None and
-                               self.space.is_true(self.w_starstararg))
+        return bool(self.kwds_w) or (self.w_starstararg is not None and
+                                     self.space.is_true(self.w_starstararg))
 
     def fixedunpack(self, argcount):
         """The simplest argument parsing: get the 'argcount' arguments,