summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--eval.c4
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 626b741d..e2142e02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2013-10-27 Kaz Kylheku <kaz@kylheku.com>
+ Fix 2013-10-06 regression in op syntax. This happens when a @var
+ syntax appears in an op form, crashing the expander with infinite
+ recursion at program load time, before the code is run.
+
+ * eval.c (transform_op): The fi == var check to handle a
+ trailing op variable in the dot position of a form
+ needs to ensure that it really is @<num> type var, and
+ not the @<sym> type for instance.
+
+2013-10-27 Kaz Kylheku <kaz@kylheku.com>
+
Fix jaw-dropping bug introduced on 2009-11-15, first affecting
the 022 release.
diff --git a/eval.c b/eval.c
index 1471e9be..162b0c91 100644
--- a/eval.c
+++ b/eval.c
@@ -1506,7 +1506,9 @@ static val transform_op(val forms, val syms, val rg)
val fi = first(forms);
val re = rest(forms);
- if (fi == var_s) {
+ /* This handles improper list forms like (a b c . @42)
+ when the recursion hits the @42 part. */
+ if (fi == var_s && integerp(car(re))) {
cons_bind (outsyms, outforms, transform_op(cons(forms, nil), syms, rg));
return cons(outsyms, rlcp(car(outforms), outforms));
}