Changeset 87

Timestamp:

08/08/07 07:17:24 (17 months ago)

Author:

weyrick

Message:

revert and reapply manuel's second patch

Location:

trunk/pcc/runtime

Files:

• opaque-math-binding.scm (modified) (4 diffs)
• opaque-math.c (modified) (1 diff)

trunk/pcc/runtime/opaque-math-binding.scm

@@ -44 +44 @@
     (onum%::onum (a::onum b::onum) "phpmod")
 
-    (macro elong->onum::onum (num::elong) "long_to_onum") ;"long_to_phpnum")
+    ;; MS: 5 aug 2007, bigloo2.9a -> bigloo3.0b port
+    ;; (macro elong->onum::onum (num::elong) "LONG_TO_BELONG")
+    (macro elong->onum::onum (num::elong) "ELONG_TO_BELONG") ;"long_to_phpnum")
     (macro float->onum::onum (num::double) "DOUBLE_TO_REAL") ;"double_to_phpnum")
 
@@ -77 +79 @@
     (onum->string/g-vardump::bstring a::onum precision::int)    
     (phpnum_fail reason::string)
-    (onum->int::int num::onum) 
-    (int->onum::onum num::int)
-    (onum-long? a::onum)
-    (onum-float? a::onum)
+    (inline onum->int::int num::onum) 
+    (inline int->onum::onum num::int)
+    (inline onum-long? a::onum)
+    (inline onum-float? a::onum)
     (inline onum?::bool ::obj)))
 
@@ -102 +104 @@
    (pragma::bool "(ELONGP($1) || REALP($1))" obj))
 
-(define (onum-long? a::onum)
+(define-inline (onum-long? a::onum)
    (>fx (onum-is-long a) 0))
 
-(define (onum-float? a::onum)
+(define-inline (onum-float? a::onum)
    (>fx (onum-is-float a) 0))
 
@@ -114 +116 @@
 (define *float-precision* 12) ; might be updated by an INI entry
 
-(define (onum->int::int num::onum)
+(define-inline (onum->int::int num::onum)
    (flonum->fixnum (elong->flonum (onum->elong num))))
 
-(define (int->onum::onum num::int)
-   (elong->onum (make-elong num)))
+(define-inline (int->onum::onum num::int)
+    ;; MS: 5 aug 2007, bigloo2.9a -> bigloo3.0b port
+    ;; CARE: I don't understand why using MAKE-ELONG is correct
+   ;; (elong->onum (make-elong num))
+   (elong->onum ($long->elong ($int->long num))))
 
 ; (define (main argv)

trunk/pcc/runtime/opaque-math.c

@@ -23 +23 @@
 #include "opaque-math.h"
 /* #include "opaque-piddle.h" */
+
+/* MS: 5 aug 2007, bigloo2.9a->bigloo3.0b port */
+#if( defined( BGL_2_9a ) )
+#  define LONG_TO_ONUM(o) (LONG_TO_BELONG(o))
+#else
+#  define LONG_TO_ONUM(o) (make_belong(o))
+#endif