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

* eval.c (canonicalize_define): New static helper function.

Browse source 
(memoize_define, canonicalize_define): Extract handling of
	function currying to canonicalize_define.
This commit is contained in:
Dirk Herrmann 2003-11-02 11:39:35 +00:00
parent 2510c81061
commit 0f572ba764
2 changed files with 36 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libguile/ChangeLog
View file

@ -1,3 +1,10 @@
2003-11-02 Dirk Herrmann <D.Herrmann@tu-bs.de>
* eval.c (canonicalize_define): New static helper function.
(memoize_define, canonicalize_define): Extract handling of
function currying to canonicalize_define.
2003-11-02 Dirk Herrmann <D.Herrmann@tu-bs.de> 2003-11-02 Dirk Herrmann <D.Herrmann@tu-bs.de>
* eval.c (scm_trampoline_0, scm_trampoline_1, scm_trampoline_2): * eval.c (scm_trampoline_0, scm_trampoline_1, scm_trampoline_2):

38
libguile/eval.c
View file

@ -87,6 +87,10 @@ char *alloca ();
static SCM canonicalize_define (SCM expr);
/* {Syntax Errors} /* {Syntax Errors}
* *
* This section defines the message strings for the syntax errors that can be * This section defines the message strings for the syntax errors that can be
@ -857,8 +861,8 @@ scm_m_cond (SCM expr, SCM env)
} }
SCM_SYNTAX(s_define, "define", scm_i_makbimacro, scm_m_define); SCM_SYNTAX (s_define, "define", scm_i_makbimacro, scm_m_define);
SCM_GLOBAL_SYMBOL(scm_sym_define, s_define); SCM_GLOBAL_SYMBOL (scm_sym_define, s_define);
/* Guile provides an extension to R5RS' define syntax to represent function /* Guile provides an extension to R5RS' define syntax to represent function
* currying in a compact way. With this extension, it is allowed to write * currying in a compact way. With this extension, it is allowed to write
@ -879,14 +883,13 @@ SCM_GLOBAL_SYMBOL(scm_sym_define, s_define);
*/ */
/* Dirk:FIXME:: We should provide an implementation for 'define' in the R5RS /* Dirk:FIXME:: We should provide an implementation for 'define' in the R5RS
* module that does not implement this extension. */ * module that does not implement this extension. */
SCM static SCM
scm_m_define (SCM expr, SCM env) canonicalize_define (const SCM expr)
{ {
SCM body; SCM body;
SCM variable; SCM variable;
const SCM cdr_expr = SCM_CDR (expr); const SCM cdr_expr = SCM_CDR (expr);
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr);
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 2, s_missing_expression, expr); ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 2, s_missing_expression, expr);
body = SCM_CDR (cdr_expr); body = SCM_CDR (cdr_expr);
@ -910,9 +913,28 @@ scm_m_define (SCM expr, SCM env)
ASSERT_SYNTAX_2 (SCM_SYMBOLP (variable), s_bad_variable, variable, expr); ASSERT_SYNTAX_2 (SCM_SYMBOLP (variable), s_bad_variable, variable, expr);
ASSERT_SYNTAX (scm_ilength (body) == 1, s_expression, expr); ASSERT_SYNTAX (scm_ilength (body) == 1, s_expression, expr);
SCM_SETCAR (cdr_expr, variable);
SCM_SETCDR (cdr_expr, body);
return expr;
}
SCM
scm_m_define (SCM expr, SCM env)
{
SCM canonical_definition;
SCM cdr_canonical_definition;
SCM body;
ASSERT_SYNTAX (scm_ilength (expr) >= 0, s_bad_expression, expr);
canonical_definition = canonicalize_define (expr);
cdr_canonical_definition = SCM_CDR (canonical_definition);
body = SCM_CDR (cdr_canonical_definition);
if (SCM_TOP_LEVEL (env)) if (SCM_TOP_LEVEL (env))
{ {
SCM var; SCM var;
const SCM variable = SCM_CAR (cdr_canonical_definition);
const SCM value = scm_eval_car (body, env); const SCM value = scm_eval_car (body, env);
if (SCM_REC_PROCNAMES_P) if (SCM_REC_PROCNAMES_P)
{ {
@ -930,10 +952,8 @@ scm_m_define (SCM expr, SCM env)
} }
else else
{ {
SCM_SETCAR (expr, SCM_IM_DEFINE); SCM_SETCAR (canonical_definition, SCM_IM_DEFINE);
SCM_SETCAR (cdr_expr, variable); return canonical_definition;
SCM_SETCDR (cdr_expr, body);
return expr;
} }
} }