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

* eval.c (scm_m_atdispatch): Removed until actually needed. (This

Browse source 
macro was introduced in anticipation of GOOPS method compilation
code.)

* goops.c: Removed binding of @dispatch.
This commit is contained in:
Mikael Djurfeldt 2003-04-28 12:43:45 +00:00
parent a4aa213486
commit c8e1d35451
3 changed files with 15 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libguile/ChangeLog
View file

@ -1,3 +1,11 @@
2003-04-28 Mikael Djurfeldt <djurfeldt@nada.kth.se>
* eval.c (scm_m_atdispatch): Removed until actually needed. (This
macro was introduced in anticipation of GOOPS method compilation
code.)
* goops.c: Removed binding of @dispatch.
2003-04-28 Dirk Herrmann <D.Herrmann@tu-bs.de> 2003-04-28 Dirk Herrmann <D.Herrmann@tu-bs.de>
* eval.c, goops.c (@dispatch, @slot-ref, @slot-set!): Move the * eval.c, goops.c (@dispatch, @slot-ref, @slot-set!): Move the

63
libguile/eval.c
View file

@ -1090,37 +1090,6 @@ scm_m_at_call_with_values (SCM xorig, SCM env SCM_UNUSED)
} }
static const char* s_atdispatch = "@dispatch";
SCM_SYMBOL (sym_atdispatch, s_atdispatch);
/* @slot-dispatch is bound privately in the (oop goops) module from goops.c.
* As soon as the module system allows us to more freely create bindings in
* arbitrary modules during the startup phase, the code from goops.c should be
* moved here. */
SCM
scm_m_atdispatch (SCM xorig, SCM env)
#define FUNC_NAME s_atdispatch
{
SCM args, n, v, gf, x = SCM_CDR (xorig);
SCM_ASSYNT (scm_ilength (x) == 4, scm_s_expression, FUNC_NAME);
args = SCM_CAR (x);
if (!SCM_CONSP (args) && !SCM_SYMBOLP (args))
SCM_WRONG_TYPE_ARG (SCM_ARG1, args);
x = SCM_CDR (x);
n = SCM_XEVALCAR (x, env);
SCM_VALIDATE_INUM (SCM_ARG2, n);
SCM_ASSERT_RANGE (0, n, SCM_INUM (n) >= 1);
x = SCM_CDR (x);
v = SCM_XEVALCAR (x, env);
SCM_VALIDATE_VECTOR (SCM_ARG3, v);
x = SCM_CDR (x);
gf = SCM_XEVALCAR (x, env);
SCM_VALIDATE_PUREGENERIC (SCM_ARG4, gf);
return scm_list_5 (SCM_IM_DISPATCH, args, n, v, gf);
}
#undef FUNC_NAME
SCM_SYNTAX (s_future, "future", scm_makmmacro, scm_m_future); SCM_SYNTAX (s_future, "future", scm_makmmacro, scm_m_future);
SCM_GLOBAL_SYMBOL (scm_sym_future, s_future); SCM_GLOBAL_SYMBOL (scm_sym_future, s_future);
@ -2484,32 +2453,12 @@ dispatch:
RETURN (scm_i_make_future (scm_closure (SCM_CDR (x), env))); RETURN (scm_i_make_future (scm_closure (SCM_CDR (x), env)));
case (SCM_ISYMNUM (SCM_IM_DISPATCH)): /* PLACEHOLDER for case (SCM_ISYMNUM (SCM_IM_DISPATCH)): The
{ following code (type_dispatch) is intended to be the tail
/* If not done yet, evaluate the operand forms. The result is a of the case clause for the internal macro
* list of arguments stored in arg1, which is used to perform the SCM_IM_DISPATCH. Please don't remove it from this
* function dispatch. */ location without discussing it with Mikael
SCM operand_forms = SCM_CADR (x); <djurfeldt@nada.kth.se> */
PREP_APPLY (SCM_UNDEFINED, SCM_EOL);
if (SCM_ILOCP (operand_forms))
arg1 = *scm_ilookup (operand_forms, env);
else if (SCM_VARIABLEP (operand_forms))
arg1 = SCM_VARIABLE_REF (operand_forms);
else if (!SCM_CONSP (operand_forms))
arg1 = *scm_lookupcar (SCM_CDR (x), env, 1);
else
{
SCM tail = arg1 = scm_list_1 (EVALCAR (operand_forms, env));
operand_forms = SCM_CDR (operand_forms);
while (!SCM_NULLP (operand_forms))
{
SCM new_tail = scm_list_1 (EVALCAR (operand_forms, env));
SCM_SETCDR (tail, new_tail);
tail = new_tail;
operand_forms = SCM_CDR (operand_forms);
}
}
}
/* The type dispatch code is duplicated below /* The type dispatch code is duplicated below
* (c.f. objects.c:scm_mcache_compute_cmethod) since that * (c.f. objects.c:scm_mcache_compute_cmethod) since that

3
libguile/goops.c
View file

@ -1619,9 +1619,6 @@ static SCM list_of_no_method;
SCM_GLOBAL_SYMBOL (scm_sym_args, "args"); SCM_GLOBAL_SYMBOL (scm_sym_args, "args");
SCM_SYNTAX (s_atdispatch, "@dispatch", scm_makmmacro, scm_m_atdispatch);
SCM SCM
scm_make_method_cache (SCM gf) scm_make_method_cache (SCM gf)
{ {