Export <slot> from GOOPS

[bpt/guile.git] / libguile / conv-integer.i.c

diff --git a/libguile/conv-integer.i.c b/libguile/conv-integer.i.c
index 4a6095f..4cf887c 100644 (file)
--- a/libguile/conv-integer.i.c
+++ b/libguile/conv-integer.i.c
@@ -1,3 +1,28 @@
+/* This code in included by numbers.c to generate integer conversion
+   functions like scm_to_int and scm_from_int.  It is only for signed
+   types, see conv-uinteger.i.c for the unsigned variant.
+*/
+
+/* You need to define the following macros before including this
+   template.  They are undefined at the end of this file to give a
+   clean slate for the next inclusion.
+
+   TYPE         - the integral type to be converted
+   TYPE_MIN     - the smallest representable number of TYPE
+   TYPE_MAX     - the largest representable number of TYPE
+   SIZEOF_TYPE  - the size of TYPE, equal to "sizeof (TYPE)" but
+                  in a form that can be computed by the preprocessor.
+                 When this number is 0, the preprocessor is not used
+                 to select which code to compile; the most general
+                 code is always used.
+
+   SCM_TO_TYPE_PROTO(arg), SCM_FROM_TYPE_PROTO(arg) 
+                - These two macros should expand into the prototype
+                  for the two defined functions, without the return
+                  type.
+
+*/
+
 TYPE
 SCM_TO_TYPE_PROTO (SCM val)
 {
@@ -66,7 +91,9 @@ SCM_TO_TYPE_PROTO (SCM val)
          else
            {
            out_of_range:
-             scm_out_of_range (NULL, val);
+             scm_i_range_error (val,
+                                scm_from_signed_integer (TYPE_MIN),
+                                scm_from_signed_integer (TYPE_MAX));
              return 0;
            }
        }
@@ -87,11 +114,7 @@ SCM_FROM_TYPE_PROTO (TYPE val)
   if (SCM_FIXABLE (val))
     return SCM_I_MAKINUM (val);
   else if (val >= LONG_MIN && val <= LONG_MAX)
-    {
-      SCM z = scm_double_cell (scm_tc16_big, 0, 0, 0);
-      mpz_init_set_si (SCM_I_BIG_MPZ (z), val);
-      return z;
-    }
+    return scm_i_long2big (val);
   else
     {
       SCM z = scm_double_cell (scm_tc16_big, 0, 0, 0);