guile/guile-core/libguile ChangeLog Makefile.am...

[Mikael Djurfeldt]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Mikael Djurfeldt <address@hidden>       01/09/22 17:39:42

Modified files:
        guile-core/libguile: ChangeLog Makefile.am numbers.c 
Added files:
        guile-core/libguile: num2float.i.c 

Log message:
        * Makefile.am: Distribute num2float.i.c.
        
        * num2float.i.c: New file, multiply included by numbers.c, used
        to "templatize" the float <-> num conversion routines.
        
        * numbers.c: New functions: scm_num2float, scm_float2num,
        scm_num2double, scm_double2num.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/num2float.i.c.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/ChangeLog.diff?cvsroot=OldCVS&tr1=1.1514&tr2=1.1515&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/Makefile.am.diff?cvsroot=OldCVS&tr1=1.143&tr2=1.144&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/numbers.c.diff?cvsroot=OldCVS&tr1=1.142&tr2=1.143&r1=text&r2=text

Patches:
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1514 
guile/guile-core/libguile/ChangeLog:1.1515
--- guile/guile-core/libguile/ChangeLog:1.1514  Fri Sep 21 13:56:59 2001
+++ guile/guile-core/libguile/ChangeLog Sat Sep 22 17:39:42 2001
@@ -1,3 +1,13 @@
+2001-09-22  Mikael Djurfeldt  <address@hidden>
+
+       * Makefile.am: Distribute num2float.i.c.
+
+       * num2float.i.c: New file, multiply included by numbers.c, used
+       to "templatize" the float <-> num conversion routines.
+
+       * numbers.c: New functions: scm_num2float, scm_float2num,
+       scm_num2double, scm_double2num.
+
 2001-09-21  Rob Browning  <address@hidden>
 
        * .cvsignore: really add version.h
Index: guile/guile-core/libguile/Makefile.am
diff -u guile/guile-core/libguile/Makefile.am:1.143 
guile/guile-core/libguile/Makefile.am:1.144
--- guile/guile-core/libguile/Makefile.am:1.143 Fri Aug 31 08:13:50 2001
+++ guile/guile-core/libguile/Makefile.am       Sat Sep 22 17:39:42 2001
@@ -111,7 +111,8 @@
 ## compile, since they are #included.  So instead we list them here.
 ## Perhaps we can deal with them normally once the merge seems to be
 ## working.
-noinst_HEADERS = coop-threads.c coop-threads.h coop.c num2integral.i.c
+noinst_HEADERS = coop-threads.c coop-threads.h coop.c \
+                num2integral.i.c num2float.i.c
 
 libguile_la_DEPENDENCIES = @LIBLOBJS@
 libguile_la_LIBADD = @LIBLOBJS@ $(LIBLTDL)
Index: guile/guile-core/libguile/numbers.c
diff -u guile/guile-core/libguile/numbers.c:1.142 
guile/guile-core/libguile/numbers.c:1.143
--- guile/guile-core/libguile/numbers.c:1.142   Fri Sep 21 13:56:31 2001
+++ guile/guile-core/libguile/numbers.c Sat Sep 22 17:39:42 2001
@@ -4365,6 +4365,16 @@
 
 #endif /* HAVE_LONG_LONGS */
 
+#define NUM2FLOAT scm_num2float
+#define FLOAT2NUM scm_float2num
+#define FTYPE float
+#include "libguile/num2float.i.c"
+
+#define NUM2FLOAT scm_num2double
+#define FLOAT2NUM scm_double2num
+#define FTYPE double
+#include "libguile/num2float.i.c"
+
 #ifdef GUILE_DEBUG
 
 #define CHECK(type, v) \