From 265a7997fb8ee78fd6fc22a184f6e2ef4f5f4946 Mon Sep 17 00:00:00 2001 From: Marius Vollmer Date: Mon, 4 Oct 2004 17:02:01 +0000 Subject: [PATCH] * keywords.h, keywords.c, deprecated.h, deprecated.c (SCM_KEYWORDP, SCM_KEYWORDSYM): Deprecated and implemented in terms of scm_is_keyword and scm_keyword_dash_symbol. * keywords.h, keywords.c, discouraged.h, discouraged.c (scm_make_keyword_from_dash_symbol, scm_keyword_dash_symbol, scm_c_make_keyword): Discouraged. * keywords.h, keywords.c (scm_symbol_to_keyword, scm_keyword_to_symbol): Implemented in C. (scm_is_keyword, scm_from_locale_keyword, scm_from_locale_keywordn): New. --- libguile/deprecated.c | 16 +++++++++ libguile/deprecated.h | 8 +++++ libguile/discouraged.c | 41 ++++++++++++++++++++++ libguile/discouraged.h | 12 +++++++ libguile/keywords.c | 78 ++++++++++++++++++++---------------------- libguile/keywords.h | 14 ++++---- 6 files changed, 121 insertions(+), 48 deletions(-) diff --git a/libguile/deprecated.c b/libguile/deprecated.c index 2a0320fd8..10782c3a5 100644 --- a/libguile/deprecated.c +++ b/libguile/deprecated.c @@ -1192,6 +1192,22 @@ SCM_SYMBOL_LENGTH (SCM sym) return scm_i_symbol_length (sym); } +int +SCM_KEYWORDP (SCM obj) +{ + scm_c_issue_deprecation_warning + ("SCM_KEYWORDP is deprecated. Use scm_is_keyword instead."); + return scm_is_keyword (obj); +} + +SCM +SCM_KEYWORDSYM (SCM keyword); +{ + scm_c_issue_deprecation_warning + ("SCM_KEYWORDSYM is deprecated. See scm_keyword_to_symbol instead."); + return scm_keyword_dash_symbol (keyword); +} + void scm_i_init_deprecated () { diff --git a/libguile/deprecated.h b/libguile/deprecated.h index e3f229566..06bf9c9a0 100644 --- a/libguile/deprecated.h +++ b/libguile/deprecated.h @@ -447,6 +447,14 @@ SCM_API double scm_round (double x); SCM_API char *SCM_SYMBOL_CHARS (SCM sym); SCM_API size_t SCM_SYMBOL_LENGTH (SCM sym); +/* Deprecated because the macros used to evaluate the arguments more + than once and because the symbol of a keyword now has no dash. +*/ + +SCM_API int SCM_KEYWORDP (SCM obj); +SCM_API SCM SCM_KEYWORDSYM (SCM keyword); + + void scm_i_init_deprecated (void); #endif diff --git a/libguile/discouraged.c b/libguile/discouraged.c index 10386ce75..85d277b8a 100644 --- a/libguile/discouraged.c +++ b/libguile/discouraged.c @@ -156,6 +156,47 @@ scm_allocate_string (size_t len) return scm_i_make_string (len, NULL); } +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 dash_string, non_dash_symbol; + + SCM_ASSERT (scm_is_symbol (symbol) + && ('-' == scm_i_symbol_chars(symbol)[0]), + symbol, SCM_ARG1, FUNC_NAME); + + dash_string = scm_symbol_to_string (symbol); + non_dash_symbol = + scm_string_to_symbol (scm_c_substring (dash_string, + 1, + scm_c_string_length (dash_string))); + + return scm_symbol_to_keyword (non_dash_symbol); +} +#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 symbol = scm_keyword_to_symbol (keyword); + SCM parts = scm_list_2 (scm_from_locale_string ("-"), + scm_symbol_to_string (symbol)); + return scm_string_to_symbol (scm_string_append (parts)); +} +#undef FUNC_NAME + +SCM +scm_c_make_keyword (const char *s) +{ + return scm_from_locale_keyword (s); +} + + void scm_i_init_discouraged (void) { diff --git a/libguile/discouraged.h b/libguile/discouraged.h index 50aa8fb09..b1fa79ecd 100644 --- a/libguile/discouraged.h +++ b/libguile/discouraged.h @@ -157,6 +157,18 @@ SCM_API SCM scm_allocate_string (size_t len); #define SCM_NULLP(x) (scm_is_null (x)) #define SCM_NNULLP(x) (!scm_is_null (x)) +/* Discouraged because they are just strange. + */ + +SCM_API SCM scm_make_keyword_from_dash_symbol (SCM symbol); +SCM_API SCM scm_keyword_dash_symbol (SCM keyword); + +/* Discouraged because it does not state what encoding S is in. + */ + +SCM_API SCM scm_c_make_keyword (const char *s); + + void scm_i_init_discouraged (void); #endif /* SCM_ENABLE_DISCOURAGED == 1 */ diff --git a/libguile/keywords.c b/libguile/keywords.c index fd75d7274..24e290ffc 100644 --- a/libguile/keywords.c +++ b/libguile/keywords.c @@ -34,29 +34,35 @@ 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_i_symbol_chars (symbol) + 1, - scm_i_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_is_symbol (symbol) - && ('-' == scm_i_symbol_chars(symbol)[0]), - symbol, SCM_ARG1, FUNC_NAME); + SCM_ASSERT (scm_is_symbol (symbol), symbol, 0, NULL); SCM_DEFER_INTS; keyword = scm_hashq_ref (scm_keyword_obarray, symbol, SCM_BOOL_F); @@ -70,43 +76,33 @@ SCM_DEFINE (scm_make_keyword_from_dash_symbol, "make-keyword-from-dash-symbol", } #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; - size_t len; - SCM string, symbol; - - len = strlen (s) + 1; - string = scm_i_make_string (len, &buf); - buf[0] = '-'; - strcpy (buf + 1, s); - symbol = scm_string_to_symbol (string); - 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)); +} void diff --git a/libguile/keywords.h b/libguile/keywords.h index b182b5df8..64273278a 100644 --- a/libguile/keywords.h +++ b/libguile/keywords.h @@ -28,16 +28,16 @@ SCM_API scm_t_bits scm_tc16_keyword; -#define SCM_KEYWORDP(X) (SCM_SMOB_PREDICATE (scm_tc16_keyword, (X))) -#define SCM_KEYWORDSYM(X) (SCM_SMOB_OBJECT (X)) - - -SCM_API SCM scm_make_keyword_from_dash_symbol (SCM symbol); -SCM_API SCM scm_c_make_keyword (char *s); SCM_API SCM scm_keyword_p (SCM obj); -SCM_API SCM scm_keyword_dash_symbol (SCM keyword); +SCM_API SCM scm_symbol_to_keyword (SCM symbol); +SCM_API SCM scm_keyword_to_symbol (SCM keyword); + +SCM_API int scm_is_keyword (SCM val); +SCM_API SCM scm_from_locale_keyword (const char *str); +SCM_API SCM scm_from_locale_keywordn (const char *str, size_t len); + SCM_API void scm_init_keywords (void); #endif /* SCM_KEYWORDS_H */ -- 2.20.1