mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-17 17:20:29 +02:00
Code Activity

* eval.c, eval.h (scm_m_expand_body, m_expand_body): Deprecated

Browse source 
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.
This commit is contained in:
Dirk Herrmann 2003-11-09 08:10:58 +00:00
parent c2337a6178
commit 328dc9a3ef
4 changed files with 41 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libguile/ChangeLog
View file

@ -1,3 +1,13 @@
2003-11-09 Dirk Herrmann <D.Herrmann@tu-bs.de>
* 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.
2003-11-09 Kevin Ryde <user42@zip.com.au>
* dynl.c (scm_dynamic_unlink): Need scm_list_1 on error message

24
libguile/eval.c
View file

@ -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;
}

4
libguile/eval.h
View file

@ -186,7 +186,6 @@ SCM_API scm_t_trampoline_2 scm_trampoline_2 (SCM proc);
SCM_API SCM scm_nconc2last (SCM lst);
SCM_API SCM scm_apply (SCM proc, SCM arg1, SCM args);
SCM_API SCM scm_dapply (SCM proc, SCM arg1, SCM args);
SCM_API SCM scm_m_expand_body (SCM xorig, SCM env);
SCM_API SCM scm_macroexp (SCM x, SCM env);
SCM_API SCM scm_map (SCM proc, SCM arg1, SCM args);
SCM_API SCM scm_for_each (SCM proc, SCM arg1, SCM args);
@ -210,6 +209,9 @@ SCM_API void scm_init_eval (void);
SCM_API SCM scm_m_undefine (SCM x, SCM env);
/* Deprecated in guile 1.7.0 on 2003-11-09. */
SCM_API SCM scm_m_expand_body (SCM xorig, SCM env);
#endif