[pypy-svn] r14018 - in pypy/dist/pypy: rpython translator/c

[pedronis at codespeak.net]

Author: pedronis
Date: Thu Jun 30 03:11:39 2005
New Revision: 14018

Modified:
   pypy/dist/pypy/rpython/llinterp.py
   pypy/dist/pypy/translator/c/float_include.h
Log:
fix broken tests



Modified: pypy/dist/pypy/rpython/llinterp.py
==============================================================================
--- pypy/dist/pypy/rpython/llinterp.py	(original)
+++ pypy/dist/pypy/rpython/llinterp.py	Thu Jun 30 03:11:39 2005
@@ -294,13 +294,13 @@
 
 for typ in (float, int, r_uint):
     typname = typ.__name__
-    optup = ('add', 'sub', 'mul', 'div', 'mod', 'gt', 'lt', 'ge', 'ne', 'le', 'eq',)
+    optup = ('add', 'sub', 'mul', 'div', 'truediv', 'floordiv', 'mod', 'gt', 'lt', 'ge', 'ne', 'le', 'eq',)
     if typ is r_uint:
         opnameprefix = 'uint'
     else:
         opnameprefix = typname
     if typ in (int, r_uint):
-        optup += 'truediv', 'floordiv', 'and_', 'or_', 'lshift', 'rshift', 'xor'
+        optup += 'and_', 'or_', 'lshift', 'rshift', 'xor'
     for opname in optup:
         assert opname in opimpls
         if typ is int and opname not in ops_returning_a_bool:

Modified: pypy/dist/pypy/translator/c/float_include.h
==============================================================================
--- pypy/dist/pypy/translator/c/float_include.h	(original)
+++ pypy/dist/pypy/translator/c/float_include.h	Thu Jun 30 03:11:39 2005
@@ -30,7 +30,7 @@
 #define OP_FLOAT_SUB(x,y,r,err)     r = x - y;
 #define OP_FLOAT_MUL(x,y,r,err)     r = x * y;
 #define OP_FLOAT_DIV(x,y,r,err)     r = x / y;
-
+#define OP_FLOAT_TRUEDIV(x,y,r,err) OP_FLOAT_DIV(x,y,r,err)
 #define OP_FLOAT_MOD(x,y,r,err)     r = fmod(x, y); 
 #define OP_FLOAT_POW(x,y,r,err)     r = pow(x, y);