summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--eval.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c692db9a..75a0558e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-31 Kaz Kylheku <kaz@kylheku.com>
+
+ * eval.c (expand): Bugfix: failure to handle regular
+ expression syntax, resulting in (set ...) syntax being regarded as
+ assignment (due to another recent change).
+
2012-08-30 Kaz Kylheku <kaz@kylheku.com>
* txr.1: Documented chain, andf, orf and iff.
diff --git a/eval.c b/eval.c
index b51adaac..ca7c51ec 100644
--- a/eval.c
+++ b/eval.c
@@ -1726,6 +1726,8 @@ val expand(val form)
return expand_op(rest(form));
} else if (sym == catch_s) {
return expand_catch(rest(form));
+ } else if (sym == regex_s || regexp(sym)) {
+ return form;
} else {
/* funtion call
also handles: progn, prog1, call, if, and, or,