diff options
author | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2003-11-09 08:10:58 +0000 |
---|---|---|
committer | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2003-11-09 08:10:58 +0000 |
commit | 328dc9a3ef372c0e1a439afabebd44d0ab1edaa9 (patch) | |
tree | f60ddfcc375b3f4ea177b260e4c4f6dfedbe1ffe /libguile/eval.c | |
parent | c2337a6178282861418d9b277b2a6084a8120f66 (diff) | |
download | guile-328dc9a3ef372c0e1a439afabebd44d0ab1edaa9.tar.gz |
* eval.c, eval.h (scm_m_expand_body, m_expand_body): Deprecated
public use of scm_m_expand_body in eval.h. In eval.c, renamed
scm_m_expand_body to m_expand_body and made it static. Added
deprecated wrapper scm_m_expand_body.
(scm_eval_body, SCM_CEVAL, SCM_APPLY): Use m_expand_body instead
of scm_m_expand_body.
Diffstat (limited to 'libguile/eval.c')
-rw-r--r-- | libguile/eval.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/libguile/eval.c b/libguile/eval.c index 266066ef7..901fa93c8 100644 --- a/libguile/eval.c +++ b/libguile/eval.c @@ -58,6 +58,7 @@ char *alloca (); #include "libguile/async.h" #include "libguile/continuations.h" #include "libguile/debug.h" +#include "libguile/deprecation.h" #include "libguile/dynwind.h" #include "libguile/eq.h" #include "libguile/feature.h" @@ -1827,8 +1828,8 @@ scm_m_undefine (SCM expr, SCM env) #endif -SCM -scm_m_expand_body (SCM xorig, SCM env) +static SCM +m_expand_body (const SCM xorig, const SCM env) { SCM x = SCM_CDR (xorig), defs = SCM_EOL; @@ -1888,6 +1889,19 @@ scm_m_expand_body (SCM xorig, SCM env) return xorig; } +#if (SCM_ENABLE_DEPRECATED == 1) + +/* Deprecated in guile 1.7.0 on 2003-11-09. */ +SCM +scm_m_expand_body (SCM exprs, SCM env) +{ + scm_c_issue_deprecation_warning + ("`scm_m_expand_body' is deprecated."); + return m_expand_body (exprs, env); +} + +#endif + SCM scm_macroexp (SCM x, SCM env) @@ -2301,7 +2315,7 @@ scm_eval_body (SCM code, SCM env) scm_rec_mutex_lock (&source_mutex); /* check for race condition */ if (SCM_ISYMP (SCM_CAR (code))) - code = scm_m_expand_body (code, env); + code = m_expand_body (code, env); scm_rec_mutex_unlock (&source_mutex); goto again; } @@ -2699,7 +2713,7 @@ dispatch: scm_rec_mutex_lock (&source_mutex); /* check for race condition */ if (SCM_ISYMP (SCM_CAR (x))) - x = scm_m_expand_body (x, env); + x = m_expand_body (x, env); scm_rec_mutex_unlock (&source_mutex); goto nontoplevel_begin; } @@ -4350,7 +4364,7 @@ tail: scm_rec_mutex_lock (&source_mutex); /* check for race condition */ if (SCM_ISYMP (SCM_CAR (proc))) - proc = scm_m_expand_body (proc, args); + proc = m_expand_body (proc, args); scm_rec_mutex_unlock (&source_mutex); goto again; } |