Remove dump facilities.

libguile/ChangeLog

@@ -1,3 +1,19 @@
+2001-03-02  Keisuke Nishida  <kxn30@po.cwru.edu>
+
+	* Remove dump facilities.
+	* dump.c, dump.h: Removed.
+	* Makefile.am: Remove dump.c, dump.h, dump.x, dump.doc.
+	* init.c: Remove #include "libguile/dump.h".
+	(scm_init_guile_1): Remove scm_init_dump.
+	* smob.h (scm_smob_descriptor): Remove slots: dump, undump.
+	(scm_set_smob_dump, scm_set_smob_undump): Remove declaration.
+	* smob.c (scm_make_smob_type): Remove initialization: dump, undump.
+	(scm_set_smob_dump, scm_set_smob_undump): Removed.
+
+	* keywords.c: Remove #include "libguile/dump.h".
+	(keyword_dump, keyword_undump): Removed.
+	(scm_init_keywords): Remove scm_set_smob_dump and scm_set_smob_undump.
+
 2001-03-02  Martin Grabmueller  <mgrabmue@cs.tu-berlin.de>
 
 	* vectors.c (s_scm_vector_p, list->vector, scm_vector)

libguile/Makefile.am

@@ -39,7 +39,7 @@ guile_LDADD = libguile.la ${THREAD_LIBS_LOCAL}
 guile_LDFLAGS = @DLPREOPEN@
 
 libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c	     \
-    chars.c continuations.c debug.c dump.c dynl.c dynwind.c		     \
+    chars.c continuations.c debug.c dynl.c dynwind.c			     \
     environments.c eq.c error.c eval.c evalext.c feature.c fluids.c fports.c \
     gc.c gc_os_dep.c gdbint.c gh_data.c gh_eval.c gh_funcs.c gh_init.c	     \
     gh_io.c gh_list.c gh_predicates.c goops.c gsubr.c guardians.c hash.c     \
@@ -52,7 +52,7 @@ libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c	     \
     variable.c vectors.c version.c vports.c weaks.c
 
 DOT_X_FILES = alist.x arbiters.x async.x backtrace.x boolean.x chars.x	    \
-    continuations.x debug.x dump.x dynl.x dynwind.x environments.x eq.x	    \
+    continuations.x debug.x dynl.x dynwind.x environments.x eq.x	    \
     error.x eval.x evalext.x feature.x fluids.x fports.x gc.x goops.x	    \
     gsubr.x guardians.x hash.x hashtab.x hooks.x init.x ioext.x iselect.x   \
     keywords.x lang.x list.x load.x macros.x mallocs.x modules.x net_db.x   \
@@ -67,7 +67,7 @@ EXTRA_DOT_X_FILES = debug-malloc.x filesys.x net_db.x posix.x ramap.x	\
                     regex-posix.x socket.x threads.x unif.x
 
 DOT_DOC_FILES = alist.doc arbiters.doc async.doc backtrace.doc		   \
-    boolean.doc chars.doc continuations.doc debug.doc dump.doc dynl.doc	   \
+    boolean.doc chars.doc continuations.doc debug.doc dynl.doc		   \
     dynwind.doc environments.doc eq.doc error.doc eval.doc evalext.doc	   \
     feature.doc fluids.doc fports.doc gc.doc goops.doc gsubr.doc	   \
     guardians.doc hash.doc hashtab.doc hooks.doc init.doc ioext.doc	   \
@@ -112,7 +112,7 @@ pkginclude_HEADERS = gh.h
 # These are headers visible as <libguile/mumble.h>.
 modincludedir = $(includedir)/libguile
 modinclude_HEADERS = __scm.h alist.h arbiters.h async.h backtrace.h boolean.h \
-    chars.h continuations.h coop-defs.h debug.h debug-malloc.h dump.h	      \
+    chars.h continuations.h coop-defs.h debug.h debug-malloc.h		      \
     dynl.h dynwind.h environments.h eq.h error.h eval.h evalext.h	      \
     feature.h filesys.h fluids.h fports.h gc.h gdb_interface.h gdbint.h	      \
     goops.h gsubr.h guardians.h hash.h hashtab.h hooks.h init.h ioext.h	      \

libguile/init.c

@@ -66,7 +66,6 @@
 #ifdef GUILE_DEBUG_MALLOC
 #include "libguile/debug-malloc.h"
 #endif
-#include "libguile/dump.h"
 #include "libguile/dynl.h"
 #include "libguile/dynwind.h"
 #include "libguile/environments.h"
@@ -494,7 +493,6 @@ scm_init_guile_1 (SCM_STACKITEM *base)
 #ifdef GUILE_DEBUG_MALLOC
   scm_init_debug_malloc ();
 #endif
-  scm_init_dump ();
   scm_init_dynwind ();
   scm_init_eq ();
   scm_init_error ();

libguile/keywords.c

@@ -51,7 +51,6 @@
 #include "libguile/ports.h"
 #include "libguile/root.h"
 #include "libguile/smob.h"
-#include "libguile/dump.h"
 #include "libguile/hashtab.h"
 
 #include "libguile/validate.h"
@@ -68,26 +67,6 @@ keyword_print (SCM exp, SCM port, scm_print_state *pstate)
   return 1;
 }
 
-static void
-keyword_dump (SCM obj, SCM dstate)
-{
-  SCM sym = scm_keyword_dash_symbol (obj);
-  scm_store_string (SCM_SYMBOL_CHARS (sym),
-		    SCM_SYMBOL_LENGTH (sym),
-		    dstate);
-}
-
-static SCM
-keyword_undump (SCM dstate)
-{
-  int len;
-  const char *mem;
-  SCM sym;
-  scm_restore_string (&mem, &len, dstate);
-  sym = scm_mem2symbol (mem, len);
-  return scm_make_keyword_from_dash_symbol (sym);
-}
-
 SCM_DEFINE (scm_make_keyword_from_dash_symbol, "make-keyword-from-dash-symbol", 1, 0, 0, 
             (SCM symbol),
             "Make a keyword object from a @var{symbol} that starts with a dash.")
@@ -158,8 +137,6 @@ scm_init_keywords ()
   scm_tc16_keyword = scm_make_smob_type ("keyword", 0);
   scm_set_smob_mark (scm_tc16_keyword, scm_markcdr);
   scm_set_smob_print (scm_tc16_keyword, keyword_print);
-  scm_set_smob_dump (scm_tc16_keyword, keyword_dump);
-  scm_set_smob_undump (scm_tc16_keyword, keyword_undump);
 
   scm_keyword_obarray = scm_c_make_hash_table (256);
 #ifndef SCM_MAGIC_SNARFER

libguile/smob.c

@@ -300,8 +300,6 @@ scm_make_smob_type (char *name, scm_sizet size)
       scm_smobs[scm_numsmob].apply_2 = 0;
       scm_smobs[scm_numsmob].apply_3 = 0;
       scm_smobs[scm_numsmob].gsubr_type = 0;
-      scm_smobs[scm_numsmob].dump    = 0;
-      scm_smobs[scm_numsmob].undump  = 0;
       scm_numsmob++;
     }
   SCM_ALLOW_INTS;
@@ -451,18 +449,6 @@ scm_set_smob_apply (scm_bits_t tc, SCM (*apply) (),
   scm_smobs[SCM_TC2SMOBNUM (tc)].gsubr_type = type;
 }
 
-void
-scm_set_smob_dump (scm_bits_t tc, void (*dump) (SCM, SCM))
-{
-  scm_smobs[SCM_TC2SMOBNUM (tc)].dump = dump;
-}
-
-void
-scm_set_smob_undump (scm_bits_t tc, SCM (*undump) (SCM))
-{
-  scm_smobs[SCM_TC2SMOBNUM (tc)].undump = undump;
-}
-
 SCM
 scm_make_smob (scm_bits_t tc)
 {

libguile/smob.h

@@ -53,24 +53,16 @@ typedef struct scm_smob_descriptor
 {
   char *name;
   scm_sizet size;
-
-  /* Basic functions */
   SCM (*mark) (SCM);
   scm_sizet (*free) (SCM);
   int (*print) (SCM exp, SCM port, scm_print_state *pstate);
   SCM (*equalp) (SCM, SCM);
-
-  /* Apply functions */
   SCM (*apply) ();
   SCM (*apply_0) (SCM);
   SCM (*apply_1) (SCM, SCM);
   SCM (*apply_2) (SCM, SCM, SCM);
   SCM (*apply_3) (SCM, SCM, SCM, SCM);
   int gsubr_type; /* Used in procprop.c */
-
-  /* Dump functions */
-  void (*dump) (SCM, SCM);
-  SCM (*undump) (SCM);
 } scm_smob_descriptor;
 
 
@@ -163,8 +155,6 @@ extern void scm_set_smob_apply (scm_bits_t tc,
 				unsigned int req,
 				unsigned int opt,
 				unsigned int rst);
-extern void scm_set_smob_dump (scm_bits_t tc, void (*dump) (SCM, SCM));
-extern void scm_set_smob_undump (scm_bits_t tc, SCM (*undump) (SCM));
 
 /* Function for creating smobs */