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

* eval.c (is_self_quoting_p): New static function.

Browse source 
(scm_m_quote): Use is_self_quoting_p.

	(copy_tree): Corrected typo in comment.
This commit is contained in:
Dirk Herrmann 2004-03-29 08:24:57 +00:00
parent bfefbf18db
commit 5fb6438380
2 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libguile/ChangeLog
View file

@ -1,3 +1,11 @@
2004-03-24 Dirk Herrmann <dirk@dirk-herrmanns-seiten.de>
* eval.c (is_self_quoting_p): New static function.
(scm_m_quote): Use is_self_quoting_p.
(copy_tree): Corrected typo in comment.
2004-03-28 Han-Wen Nienhuys <hanwen@xs4all.nl> 2004-03-28 Han-Wen Nienhuys <hanwen@xs4all.nl>
* eval.c (s_scm_copy_tree): idem. * eval.c (s_scm_copy_tree): idem.

28
libguile/eval.c
View file

@ -451,6 +451,22 @@ literal_p (const SCM symbol, const SCM env)
return 0; return 0;
} }
/* Return true if the expression is self-quoting in the memoized code. Thus,
* some other objects (like e. g. vectors) are reported as self-quoting, which
* according to R5RS would need to be quoted. */
static int
is_self_quoting_p (const SCM expr)
{
if (SCM_CONSP (expr))
return 0;
else if (SCM_SYMBOLP (expr))
return 0;
else if (SCM_NULLP (expr))
return 0;
else return 1;
}
/* Lookup a given local variable in an environment. The local variable is /* Lookup a given local variable in an environment. The local variable is
@ -1697,16 +1713,8 @@ scm_m_quote (SCM expr, SCM env SCM_UNUSED)
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);
quotee = SCM_CAR (cdr_expr); quotee = SCM_CAR (cdr_expr);
if (SCM_IMP (quotee) && !SCM_NULLP (quotee)) if (is_self_quoting_p (quotee))
return quotee; return quotee;
else if (SCM_VECTORP (quotee))
return quotee;
#if 0
/* The following optimization would be possible if all variable references
* were resolved during memoization: */
else if (SCM_SYMBOLP (quotee))
return quotee;
#endif
SCM_SETCAR (expr, SCM_IM_QUOTE); SCM_SETCAR (expr, SCM_IM_QUOTE);
return expr; return expr;
} }
@ -5373,7 +5381,7 @@ copy_tree (
* that in contrast to the typical hare-and-tortoise pattern, the step * that in contrast to the typical hare-and-tortoise pattern, the step
* of the tortoise happens before the hare takes its steps. This is, in * of the tortoise happens before the hare takes its steps. This is, in
* principle, no problem, except for the start of the algorithm: Then, * principle, no problem, except for the start of the algorithm: Then,
* it has to be made sure that the hare actually gets its advantage by * it has to be made sure that the hare actually gets its advantage of
* two steps. */ * two steps. */
if (tortoise_delay == 0) if (tortoise_delay == 0)
{ {