summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2015-05-09 10:44:02 -0700
committerKaz Kylheku <kaz@kylheku.com>2015-05-09 10:44:02 -0700
commit0bb51d8600ea8b9f6cda97071a586a4f1ee5837e (patch)
treedcb05a9a4d513d06e3d152641b5ce9dfd7dfa4dc
parent3352b5c79b59bb847f4b69dd58be37f78d2341de (diff)
downloadtxr-0bb51d8600ea8b9f6cda97071a586a4f1ee5837e.tar.gz
txr-0bb51d8600ea8b9f6cda97071a586a4f1ee5837e.tar.bz2
txr-0bb51d8600ea8b9f6cda97071a586a4f1ee5837e.zip
Improve error message related to splice misuse.
* eval.c (expand_qquote): Corrected awkward error message text which was saying that a splice "cannot occur as an atom".
-rw-r--r--ChangeLog7
-rw-r--r--eval.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ba23553..de99e40b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2015-05-09 Kaz Kylheku <kaz@kylheku.com>
+ Improve error message related to splice misuse.
+
+ * eval.c (expand_qquote): Corrected awkward error message text
+ which was saying that a splice "cannot occur as an atom".
+
+2015-05-09 Kaz Kylheku <kaz@kylheku.com>
+
Adding pset operator.
* place.tl (pset): New macro.
diff --git a/eval.c b/eval.c
index 6462cd71..c4b6bcbb 100644
--- a/eval.c
+++ b/eval.c
@@ -2151,9 +2151,9 @@ static val expand_qquote(val qquoted_form, val menv,
if (sym == spl) {
val error_msg = if3(spl == sys_splice_s,
- lit("the splice ,*~s cannot occur as an atom "
+ lit("the splice ,*~s cannot occur outside of a list "
"or in the dotted position of a list"),
- lit("(splice ~s) cannot occur as an atom "
+ lit("(splice ~s) cannot occur outside of a list "
"or in the dotted position of a list"));
eval_error(qquoted_form, error_msg,
second(qquoted_form), nao);