*** empty log message ***

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

diff --git a/libguile/gc-mark.c b/libguile/gc-mark.c
index 7c176f1..456cb37 100644 (file)
--- a/libguile/gc-mark.c
+++ b/libguile/gc-mark.c
@@ -1,43 +1,19 @@
 /* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003 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
+ */
 
 
 \f
@@ -152,12 +128,10 @@ void
 scm_gc_mark (SCM ptr)
 {
   if (SCM_IMP (ptr))
-    return ;
+    return;
   
   if (SCM_GC_MARK_P (ptr))
-    {
-      return;
-    }
+    return;
 
   SCM_SET_GC_MARK (ptr);
   scm_gc_mark_dependencies (ptr);
@@ -192,7 +166,7 @@ scm_gc_mark_dependencies (SCM p)
 {
   register long i;
   register SCM ptr;
-  scm_t_bits cell_type;
+  SCM cell_type;
 
   ptr = p;
  scm_mark_dependencies_again:
@@ -306,6 +280,15 @@ scm_gc_mark_dependencies (SCM p)
     case scm_tc7_string:
       break;
 
+    case scm_tc7_number:
+      if (SCM_TYP16 (ptr) == scm_tc16_fraction)
+       {
+         scm_gc_mark (SCM_CELL_OBJECT_1 (ptr));
+         ptr = SCM_CELL_OBJECT_2 (ptr);
+         goto gc_mark_loop;
+       }
+      break;
+
     case scm_tc7_wvect:
       SCM_SET_WVECT_GC_CHAIN (ptr, scm_weak_vectors);
       scm_weak_vectors = ptr;
@@ -400,10 +383,6 @@ scm_gc_mark_dependencies (SCM p)
           * on the C stack points into guile's heap and is scanned during
           * conservative marking.  */
          break;
-       case scm_tc16_big:
-       case scm_tc16_real:
-       case scm_tc16_complex:
-         break;
        default:
          i = SCM_SMOBNUM (ptr);
 #if (SCM_DEBUG_CELL_ACCESSES == 1)