mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

(scm_macroexp, macroexp): Renamed scm_macroexp to

Browse source 
macroexp and made static.  Added new version of scm_macroexp that
emits a deprecation warning and then calls macroexp.
(scm_m_undefine): Issue deprecation warning.
This commit is contained in:
Marius Vollmer 2004-06-02 09:37:48 +00:00
parent aa498d0c1b
commit 2b189e65c4
1 changed files with 50 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

94
libguile/eval.c
View file

@ -92,9 +92,6 @@ char *alloca ();
static SCM canonicalize_define (SCM expr); static SCM canonicalize_define (SCM expr);
static SCM *scm_lookupcar1 (SCM vloc, SCM genv, int check); static SCM *scm_lookupcar1 (SCM vloc, SCM genv, int check);
/* prototype in eval.h is not given under --disable-deprecated */
SCM_API SCM scm_macroexp (SCM x, SCM env);
/* {Syntax Errors} /* {Syntax Errors}
@ -747,6 +744,49 @@ m_expand_body (const SCM forms, const SCM env)
} }
} }
static SCM
macroexp (SCM x, SCM env)
{
SCM res, proc, orig_sym;
/* Don't bother to produce error messages here. We get them when we
eventually execute the code for real. */
macro_tail:
orig_sym = SCM_CAR (x);
if (!SCM_SYMBOLP (orig_sym))
return x;
{
SCM *proc_ptr = scm_lookupcar1 (x, env, 0);
if (proc_ptr == NULL)
{
/* We have lost the race. */
goto macro_tail;
}
proc = *proc_ptr;
}
/* Only handle memoizing macros. `Acros' and `macros' are really
special forms and should not be evaluated here. */
if (!SCM_MACROP (proc)
|| (SCM_MACRO_TYPE (proc) != 2 && !SCM_BUILTIN_MACRO_P (proc)))
return x;
SCM_SETCAR (x, orig_sym); /* Undo memoizing effect of lookupcar */
res = scm_call_2 (SCM_MACRO_CODE (proc), x, env);
if (scm_ilength (res) <= 0)
res = scm_list_2 (SCM_IM_BEGIN, res);
SCM_DEFER_INTS;
SCM_SETCAR (x, SCM_CAR (res));
SCM_SETCDR (x, SCM_CDR (res));
SCM_ALLOW_INTS;
goto macro_tail;
}
/* Start of the memoizers for the standard R5RS builtin macros. */ /* Start of the memoizers for the standard R5RS builtin macros. */
@ -1732,7 +1772,7 @@ scm_m_generalized_set_x (SCM expr, SCM env)
(begin <atom>). In that case, <atom> must be a symbol or a (begin <atom>). In that case, <atom> must be a symbol or a
variable and we memoize to (set! <atom> ...). variable and we memoize to (set! <atom> ...).
*/ */
exp_target = scm_macroexp (target, env); exp_target = macroexp (target, env);
if (SCM_EQ_P (SCM_CAR (exp_target), SCM_IM_BEGIN) if (SCM_EQ_P (SCM_CAR (exp_target), SCM_IM_BEGIN)
&& !SCM_NULLP (SCM_CDR (exp_target)) && !SCM_NULLP (SCM_CDR (exp_target))
&& SCM_NULLP (SCM_CDDR (exp_target))) && SCM_NULLP (SCM_CDDR (exp_target)))
@ -1911,6 +1951,9 @@ scm_m_undefine (SCM expr, SCM env)
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr); ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr);
ASSERT_SYNTAX (scm_ilength (cdr_expr) == 1, s_expression, expr); ASSERT_SYNTAX (scm_ilength (cdr_expr) == 1, s_expression, expr);
scm_c_issue_deprecation_warning
("`undefine' is deprecated.\n");
variable = SCM_CAR (cdr_expr); variable = SCM_CAR (cdr_expr);
ASSERT_SYNTAX_2 (SCM_SYMBOLP (variable), s_bad_variable, variable, expr); ASSERT_SYNTAX_2 (SCM_SYMBOLP (variable), s_bad_variable, variable, expr);
location = scm_sym2var (variable, scm_env_top_level (env), SCM_BOOL_F); location = scm_sym2var (variable, scm_env_top_level (env), SCM_BOOL_F);
@ -1921,49 +1964,12 @@ scm_m_undefine (SCM expr, SCM env)
return SCM_UNSPECIFIED; return SCM_UNSPECIFIED;
} }
SCM SCM
scm_macroexp (SCM x, SCM env) scm_macroexp (SCM x, SCM env)
{ {
SCM res, proc, orig_sym; scm_c_issue_deprecation_warning
("`scm_macroexp' is deprecated.");
/* Don't bother to produce error messages here. We get them when we return macroexp (x, env);
eventually execute the code for real. */
macro_tail:
orig_sym = SCM_CAR (x);
if (!SCM_SYMBOLP (orig_sym))
return x;
{
SCM *proc_ptr = scm_lookupcar1 (x, env, 0);
if (proc_ptr == NULL)
{
/* We have lost the race. */
goto macro_tail;
}
proc = *proc_ptr;
}
/* Only handle memoizing macros. `Acros' and `macros' are really
special forms and should not be evaluated here. */
if (!SCM_MACROP (proc)
|| (SCM_MACRO_TYPE (proc) != 2 && !SCM_BUILTIN_MACRO_P (proc)))
return x;
SCM_SETCAR (x, orig_sym); /* Undo memoizing effect of lookupcar */
res = scm_call_2 (SCM_MACRO_CODE (proc), x, env);
if (scm_ilength (res) <= 0)
res = scm_list_2 (SCM_IM_BEGIN, res);
SCM_DEFER_INTS;
SCM_SETCAR (x, SCM_CAR (res));
SCM_SETCDR (x, SCM_CDR (res));
SCM_ALLOW_INTS;
goto macro_tail;
} }
#endif #endif