*** empty log message ***

[bpt/guile.git] / libguile / gc-card.c

diff --git a/libguile/gc-card.c b/libguile/gc-card.c
index c2a316a..9525416 100644 (file)
--- a/libguile/gc-card.c
+++ b/libguile/gc-card.c
@@ -1,46 +1,23 @@
 /* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002 Free Software Foundation, Inc.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE.  If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way.  To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.  */
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
 
 
 #include <stdio.h>
+#include <gmp.h>
 
 #include "libguile/_scm.h"
 #include "libguile/eval.h"
@@ -117,7 +94,7 @@ scm_i_sweep_card (scm_t_cell *  p, SCM *free_list, scm_t_heap_segment*seg)
 
   /*
     I tried something fancy with shifting by one bit every word from
-    the bitvec in turn, but it wasn't any faster, but quite bit
+    the bitvec in turn, but it wasn't any faster, but quite a bit
     hairier.
    */
   for (p += offset; p < end; p += span, offset += span)
@@ -166,7 +143,7 @@ scm_i_sweep_card (scm_t_cell *  p, SCM *free_list, scm_t_heap_segment*seg)
                       "compiled closure");
          break;
 #endif
-#ifdef SCM_HAVE_ARRAYS
+#if SCM_HAVE_ARRAYS
        case scm_tc7_bvect:
          {
            unsigned long int length = SCM_BITVECTOR_LENGTH (scmptr);
@@ -256,13 +233,10 @@ scm_i_sweep_card (scm_t_cell *  p, SCM *free_list, scm_t_heap_segment*seg)
            case scm_tc_free_cell:
            case scm_tc16_real:
              break;
-#ifdef SCM_BIGDIG
-           case scm_tc16_big:
-             scm_gc_free (SCM_BDIGITS (scmptr),
-                          ((SCM_NUMDIGS (scmptr) * SCM_BITSPERDIG
-                            / SCM_CHAR_BIT)), "bignum");
-             break;
-#endif /* def SCM_BIGDIG */
+            case scm_tc16_big:
+              mpz_clear (SCM_I_BIG_MPZ (scmptr));
+              /* nothing else to do here since the mpz is in a double cell */
+              break;
            case scm_tc16_complex:
              scm_gc_free (SCM_COMPLEX_MEM (scmptr), 2*sizeof (double),
                           "complex");