Merge branch 'master' into boehm-demers-weiser-gc

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

diff --git a/libguile/keywords.c b/libguile/keywords.c
index fb29bb0..5afa9e9 100644 (file)
--- a/libguile/keywords.c
+++ b/libguile/keywords.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2003, 2004, 2006, 2008 Free Software Foundation, Inc.
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -12,15 +12,19 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 
 \f
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #include <string.h>
 
 #include "libguile/_scm.h"
+#include "libguile/async.h"
 #include "libguile/ports.h"
 #include "libguile/root.h"
 #include "libguile/smob.h"
@@ -28,89 +32,88 @@
 
 #include "libguile/validate.h"
 #include "libguile/keywords.h"
+#include "libguile/strings.h"
+
 \f
 
 scm_t_bits scm_tc16_keyword;
 
+#define KEYWORDP(X)    (SCM_SMOB_PREDICATE (scm_tc16_keyword, (X)))
+#define KEYWORDSYM(X)  (SCM_SMOB_OBJECT (X))
+
 static int
 keyword_print (SCM exp, SCM port, scm_print_state *pstate SCM_UNUSED)
 {
-  SCM symbol = SCM_KEYWORDSYM (exp);
-
   scm_puts ("#:", port);
-  scm_print_symbol_name (SCM_SYMBOL_CHARS (symbol) + 1,
-                        SCM_SYMBOL_LENGTH (symbol) - 1,
-                        port);
-  scm_remember_upto_here_1 (symbol);
+  scm_display (KEYWORDSYM (exp), port);
   return 1;
 }
 
-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_DEFINE (scm_keyword_p, "keyword?", 1, 0, 0, 
+            (SCM obj),
+           "Return @code{#t} if the argument @var{obj} is a keyword, else\n"
+           "@code{#f}.")
+#define FUNC_NAME s_scm_keyword_p
+{
+  return scm_from_bool (KEYWORDP (obj));
+}
+#undef FUNC_NAME
+
+SCM_DEFINE (scm_symbol_to_keyword, "symbol->keyword", 1, 0, 0,
+           (SCM symbol),
+           "Return the keyword with the same name as @var{symbol}.")
+#define FUNC_NAME s_scm_symbol_to_keyword
 {
   SCM keyword;
 
-  SCM_ASSERT (SCM_SYMBOLP (symbol)
-             && ('-' == SCM_SYMBOL_CHARS(symbol)[0]),
-             symbol, SCM_ARG1, FUNC_NAME);
+  SCM_ASSERT_TYPE (scm_is_symbol (symbol), symbol, 0, NULL, "symbol");
 
-  SCM_DEFER_INTS;
+  SCM_CRITICAL_SECTION_START;
+  /* njrev: NEWSMOB and hashq_set_x can raise errors */
   keyword = scm_hashq_ref (scm_keyword_obarray, symbol, SCM_BOOL_F);
   if (scm_is_false (keyword))
     {
       SCM_NEWSMOB (keyword, scm_tc16_keyword, SCM_UNPACK (symbol));
       scm_hashq_set_x (scm_keyword_obarray, symbol, keyword);
     }
-  SCM_ALLOW_INTS;
+  SCM_CRITICAL_SECTION_END;
   return keyword;
 }
 #undef FUNC_NAME
 
-SCM
-scm_c_make_keyword (char *s)
+SCM_DEFINE (scm_keyword_to_symbol, "keyword->symbol", 1, 0, 0,
+           (SCM keyword),
+           "Return the symbol with the same name as @var{keyword}.")
+#define FUNC_NAME s_scm_keyword_to_symbol
 {
-  char *buf = scm_malloc (strlen (s) + 2);
-  SCM symbol;
-
-  buf[0] = '-';
-  strcpy (buf + 1, s);
-  symbol = scm_str2symbol (buf);
-  free (buf);
-
-  return scm_make_keyword_from_dash_symbol (symbol);
+  scm_assert_smob_type (scm_tc16_keyword, keyword);
+  return KEYWORDSYM (keyword);
 }
+#undef FUNC_NAME
 
-SCM_DEFINE (scm_keyword_p, "keyword?", 1, 0, 0, 
-            (SCM obj),
-           "Return @code{#t} if the argument @var{obj} is a keyword, else\n"
-           "@code{#f}.")
-#define FUNC_NAME s_scm_keyword_p
+int
+scm_is_keyword (SCM val)
 {
-  return scm_from_bool (SCM_KEYWORDP (obj));
+  return KEYWORDP (val);
 }
-#undef FUNC_NAME
 
-
-SCM_DEFINE (scm_keyword_dash_symbol, "keyword-dash-symbol", 1, 0, 0, 
-            (SCM keyword),
-           "Return the dash symbol for @var{keyword}.\n"
-           "This is the inverse of @code{make-keyword-from-dash-symbol}.")
-#define FUNC_NAME s_scm_keyword_dash_symbol
+SCM
+scm_from_locale_keyword (const char *str)
 {
-  SCM_VALIDATE_KEYWORD (1, keyword);
-  return SCM_KEYWORDSYM (keyword);
+  return scm_symbol_to_keyword (scm_from_locale_symbol (str));
 }
-#undef FUNC_NAME
-
 
+SCM
+scm_from_locale_keywordn (const char *str, size_t len)
+{
+  return scm_symbol_to_keyword (scm_from_locale_symboln (str, len));
+}
 
+/* njrev: critical sections reviewed so far up to here */
 void
 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_keyword_obarray = scm_c_make_hash_table (0);