From af32bf8ff10452ccb8a5c58d266880c4d3200938 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Wed, 20 Jun 2018 09:25:20 +0200 Subject: [PATCH] Devolve keyword-snarfing macros * libguile/snarf.h: * libguile/keywords.h (SCM_KEYWORD, SCM_GLOBAL_KEYWORD): Move here. --- libguile/keywords.h | 9 +++++++++ libguile/snarf.h | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/libguile/keywords.h b/libguile/keywords.h index 547984949..5f3390341 100644 --- a/libguile/keywords.h +++ b/libguile/keywords.h @@ -26,6 +26,7 @@ #include "libguile/__scm.h" #include +#include @@ -42,6 +43,14 @@ SCM_API SCM scm_from_utf8_keyword (const char *name); #define SCM_VALIDATE_KEYWORD(pos, v) \ SCM_MAKE_VALIDATE_MSG (pos, v, KEYWORDP, "keyword") +#define SCM_KEYWORD(c_name, scheme_name) \ +SCM_SNARF_HERE(static SCM c_name) \ +SCM_SNARF_INIT(c_name = scm_from_locale_keyword (scheme_name)) + +#define SCM_GLOBAL_KEYWORD(c_name, scheme_name) \ +SCM_SNARF_HERE(SCM c_name) \ +SCM_SNARF_INIT(c_name = scm_from_locale_keyword (scheme_name)) + enum scm_keyword_arguments_flags { SCM_ALLOW_OTHER_KEYS = (1U << 0), diff --git a/libguile/snarf.h b/libguile/snarf.h index 1dacfd741..83b40c8aa 100644 --- a/libguile/snarf.h +++ b/libguile/snarf.h @@ -85,14 +85,6 @@ DOCSTRING ^^ } # endif #endif -#define SCM_KEYWORD(c_name, scheme_name) \ -SCM_SNARF_HERE(static SCM c_name) \ -SCM_SNARF_INIT(c_name = scm_from_locale_keyword (scheme_name)) - -#define SCM_GLOBAL_KEYWORD(c_name, scheme_name) \ -SCM_SNARF_HERE(SCM c_name) \ -SCM_SNARF_INIT(c_name = scm_from_locale_keyword (scheme_name)) - #define SCM_VARIABLE(c_name, scheme_name) \ SCM_SNARF_HERE(static SCM c_name) \ SCM_SNARF_INIT(c_name = scm_c_define (scheme_name, SCM_BOOL_F);)