Retire inclusion guard macro SCM_MAGIC_SNARFER.

[bpt/guile.git] / libguile / keywords.c

diff --git a/libguile/keywords.c b/libguile/keywords.c
index d3e9f8c..5b10100 100644 (file)
--- a/libguile/keywords.c
+++ b/libguile/keywords.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001 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
@@ -39,102 +39,80 @@
  * whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.  */
 
-/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
-   gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
 
 \f
 
-#include <stdio.h>
 #include <string.h>
 
 #include "libguile/_scm.h"
 #include "libguile/ports.h"
 #include "libguile/root.h"
 #include "libguile/smob.h"
-#include "libguile/dump.h"
 #include "libguile/hashtab.h"
 
 #include "libguile/validate.h"
 #include "libguile/keywords.h"
 \f
 
-scm_bits_t scm_tc16_keyword;
+scm_t_bits scm_tc16_keyword;
 
 static int
-keyword_print (SCM exp, SCM port, scm_print_state *pstate)
+keyword_print (SCM exp, SCM port, scm_print_state *pstate SCM_UNUSED)
 {
+  SCM symbol = SCM_KEYWORDSYM (exp);
+
   scm_puts ("#:", port);
-  scm_puts(1 + SCM_SYMBOL_CHARS (SCM_CDR (exp)), port);
+  scm_print_symbol_name (SCM_SYMBOL_CHARS (symbol) + 1,
+                        SCM_SYMBOL_LENGTH (symbol) - 1,
+                        port);
+  scm_remember_upto_here_1 (symbol);
   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.")
 #define FUNC_NAME s_scm_make_keyword_from_dash_symbol
 {
-  SCM vcell;
+  SCM keyword;
 
   SCM_ASSERT (SCM_SYMBOLP (symbol)
              && ('-' == SCM_SYMBOL_CHARS(symbol)[0]),
              symbol, SCM_ARG1, FUNC_NAME);
 
   SCM_DEFER_INTS;
-  vcell = scm_sym2ovcell_soft (symbol, scm_keyword_obarray);
-  if (SCM_FALSEP (vcell))
+  keyword = scm_hashq_ref (scm_keyword_obarray, symbol, SCM_BOOL_F);
+  if (SCM_FALSEP (keyword))
     {
-      SCM keyword;
       SCM_NEWSMOB (keyword, scm_tc16_keyword, SCM_UNPACK (symbol));
-      scm_intern_symbol (scm_keyword_obarray, symbol);
-      vcell = scm_sym2ovcell_soft (symbol, scm_keyword_obarray);
-      SCM_SETCDR (vcell, keyword);
+      scm_hashq_set_x (scm_keyword_obarray, symbol, keyword);
     }
   SCM_ALLOW_INTS;
-  return SCM_CDR (vcell);
+  return keyword;
 }
 #undef FUNC_NAME
 
 SCM
 scm_c_make_keyword (char *s)
 {
-  char *buf = scm_must_malloc (strlen (s) + 2, "keyword");
+  char *buf = scm_malloc (strlen (s) + 2);
   SCM symbol;
 
   buf[0] = '-';
   strcpy (buf + 1, s);
   symbol = scm_str2symbol (buf);
-  scm_must_free (buf);
-  scm_done_free (strlen (s) + 2);
+  free (buf);
 
   return scm_make_keyword_from_dash_symbol (symbol);
 }
 
 SCM_DEFINE (scm_keyword_p, "keyword?", 1, 0, 0, 
             (SCM obj),
-           "Returns @code{#t} if the argument @var{obj} is a keyword, else @code{#f}.")
+           "Return @code{#t} if the argument @var{obj} is a keyword, else\n"
+           "@code{#f}.")
 #define FUNC_NAME s_scm_keyword_p
 {
-  return SCM_BOOL(SCM_KEYWORDP (obj));
+  return SCM_BOOL (SCM_KEYWORDP (obj));
 }
 #undef FUNC_NAME
 
@@ -145,8 +123,8 @@ SCM_DEFINE (scm_keyword_dash_symbol, "keyword-dash-symbol", 1, 0, 0,
            "This is the inverse of @code{make-keyword-from-dash-symbol}.")
 #define FUNC_NAME s_scm_keyword_dash_symbol
 {
-  SCM_VALIDATE_KEYWORD (1,keyword);
-  return SCM_CDR (keyword);
+  SCM_VALIDATE_KEYWORD (1, keyword);
+  return SCM_KEYWORDSYM (keyword);
 }
 #undef FUNC_NAME
 
@@ -158,13 +136,9 @@ 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
 #include "libguile/keywords.x"
-#endif
 }