summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--tests/011/macros-1.expected1
-rw-r--r--tests/011/macros-1.txr6
3 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5dec2d8a..b6834a5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-07 Kaz Kylheku <kaz@kylheku.com>
+
+ * tests/011/macros-1.txr: Add test for lexical function
+ shadowing symbol macro.
+
+ * tests/011/macros-1.expected: Updated.
+
2015-02-06 Kaz Kylheku <kaz@kylheku.com>
* unwind.c (uw_throw): Detect invalid re-entry and bail.
diff --git a/tests/011/macros-1.expected b/tests/011/macros-1.expected
index 66039383..67fd82eb 100644
--- a/tests/011/macros-1.expected
+++ b/tests/011/macros-1.expected
@@ -1,2 +1,3 @@
((42) (a))
+(1)
((1 1) (2 3))
diff --git a/tests/011/macros-1.txr b/tests/011/macros-1.txr
index 35b9d472..946cbf2e 100644
--- a/tests/011/macros-1.txr
+++ b/tests/011/macros-1.txr
@@ -13,6 +13,12 @@
(list (rem-num (foo)) (rem-num x)))))
(prinl
+ (let ((x 0) (y 1))
+ (symacrolet ((a x) (b y))
+ (flet ((x (. args) [apply list args]))
+ [x y]))))
+
+ (prinl
(let ((x 0))
(symacrolet ((a (inc x)))
(list