diff options
| author | Andy Wingo <wingo@pobox.com> | 2010-01-05 16:31:12 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2010-01-05 16:31:12 +0100 |
| commit | 9c246c03838c1cc844d15a7c4817029df1994e96 (patch) | |
| tree | ae8b135ea96c567956c91d1c2b8b497006211acf /libguile | |
| parent | 9fdf9fd3ea7130fd85eaf0a333a965ac4d2b07c3 (diff) | |
| download | guile-9c246c03838c1cc844d15a7c4817029df1994e96.tar.gz | |
remove unused snarf macros
* libguile/snarf.h (SCM_DEFINE1, SCM_PRIMITIVE_GENERIC_1, SCM_PROC1)
(SCM_GPROC1): Remove, as these deal in the removed typed subr
constructors.
* libguile/tags.h (scm_tcs_subrs): Remove this. Use scm_tc7_gsubr
instead, though hopefully that will go too, soon.
Diffstat (limited to 'libguile')
| -rw-r--r-- | libguile/snarf.h | 37 | ||||
| -rw-r--r-- | libguile/tags.h | 5 |
2 files changed, 0 insertions, 42 deletions
diff --git a/libguile/snarf.h b/libguile/snarf.h index e5b059b2e..a00f5b7bc 100644 --- a/libguile/snarf.h +++ b/libguile/snarf.h @@ -152,26 +152,6 @@ scm_c_export (s_ ## FNAME, NULL); \ )\ SCM_SNARF_DOCS(primitive, FNAME, PRIMNAME, ARGLIST, REQ, OPT, VAR, DOCSTRING) -#define SCM_DEFINE1(FNAME, PRIMNAME, TYPE, ARGLIST, DOCSTRING) \ -SCM_SNARF_HERE(\ -static const char s_ ## FNAME [] = PRIMNAME; \ -SCM FNAME ARGLIST\ -)\ -SCM_SNARF_INIT(scm_c_define_subr (s_ ## FNAME, TYPE, FNAME); ) \ -SCM_SNARF_DOCS(1, FNAME, PRIMNAME, ARGLIST, 2, 0, 0, DOCSTRING) - -#define SCM_PRIMITIVE_GENERIC_1(FNAME, PRIMNAME, TYPE, ARGLIST, DOCSTRING) \ -SCM_SNARF_HERE(\ -static const char s_ ## FNAME [] = PRIMNAME; \ -static SCM g_ ## FNAME; \ -SCM FNAME ARGLIST\ -)\ -SCM_SNARF_INIT(\ -g_ ## FNAME = SCM_PACK (0); \ -scm_c_define_subr_with_generic (s_ ## FNAME, TYPE, FNAME, &g_ ## FNAME); \ -)\ -SCM_SNARF_DOCS(1, FNAME, PRIMNAME, ARGLIST, 2, 0, 0, DOCSTRING) - #define SCM_PROC(RANAME, STR, REQ, OPT, VAR, CFN) \ SCM_SNARF_HERE(static const char RANAME[]=STR) \ SCM_SNARF_INIT(scm_c_define_gsubr (RANAME, REQ, OPT, VAR, \ @@ -194,23 +174,6 @@ scm_c_define_gsubr_with_generic (RANAME, REQ, OPT, VAR, \ (SCM_FUNC_CAST_ARBITRARY_ARGS) CFN, &GF) \ ) -#define SCM_PROC1(RANAME, STR, TYPE, CFN) \ -SCM_SNARF_HERE(static const char RANAME[]=STR) \ -SCM_SNARF_INIT(\ -scm_c_define_subr (RANAME, TYPE, (SCM_FUNC_CAST_ARBITRARY_ARGS) CFN) \ -) - - -#define SCM_GPROC1(RANAME, STR, TYPE, CFN, GF) \ -SCM_SNARF_HERE(\ -static const char RANAME[]=STR; \ -static SCM GF \ -)SCM_SNARF_INIT(\ -GF = SCM_PACK (0); /* Dirk:FIXME:: Can we safely use #f instead of 0? */ \ -scm_c_define_subr_with_generic (RANAME, TYPE, \ - (SCM_FUNC_CAST_ARBITRARY_ARGS) CFN, &GF) \ -) - #ifdef SCM_SUPPORT_STATIC_ALLOCATION # define SCM_SYMBOL(c_name, scheme_name) \ diff --git a/libguile/tags.h b/libguile/tags.h index d2e66e330..a8ecf0f4f 100644 --- a/libguile/tags.h +++ b/libguile/tags.h @@ -648,11 +648,6 @@ enum scm_tc8_tags case scm_tc3_struct + 112:\ case scm_tc3_struct + 120 -/* For subrs - */ -#define scm_tcs_subrs \ - case scm_tc7_gsubr - #if (SCM_ENABLE_DEPRECATED == 1) |