summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2011-12-15 16:10:31 -0800
committerKaz Kylheku <kaz@kylheku.com>2011-12-15 16:10:31 -0800
commit8759015d7efe346fc22febcc7f429cfd09bdac97 (patch)
treefbe6926c1e38e85bde23e5309c12d1e9d826bd40
parent13c9609500c02a10fbea9cd833615a4ceee7dd43 (diff)
downloadtxr-8759015d7efe346fc22febcc7f429cfd09bdac97.tar.gz
txr-8759015d7efe346fc22febcc7f429cfd09bdac97.tar.bz2
txr-8759015d7efe346fc22febcc7f429cfd09bdac97.zip
* lib.c (appendv): bugfix: wrong way test.
(vector_list): Wrong zero used, resulting in vector(nil) being called.
-rw-r--r--ChangeLog5
-rw-r--r--lib.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 18f9e17c..376ea128 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2011-12-15 Kaz Kylheku <kaz@kylheku.com>
+ * lib.c (appendv): bugfix: wrong way test.
+ (vector_list): Wrong zero used, resulting in vector(nil) being called.
+
+2011-12-15 Kaz Kylheku <kaz@kylheku.com>
+
* eval.c (eval_init): not added as synonym for null.
* lib.c (copy_list): Use list_collect_append rather than
diff --git a/lib.c b/lib.c
index 9c3f1e34..cd15cd1b 100644
--- a/lib.c
+++ b/lib.c
@@ -373,7 +373,7 @@ val appendv(val lists)
for (; lists; lists = cdr(lists)) {
val item = car(lists);
- if (listp(*ptail))
+ if (!listp(*ptail))
uw_throwf(error_s, lit("append: ~s is not a list"), *ptail, nao);
list_collect_append(ptail, item);
}
@@ -2357,7 +2357,7 @@ val size_vec(val vec)
val vector_list(val list)
{
- val vec = vector(0);
+ val vec = vector(zero);
if (!listp(list))
uw_throwf(error_s, lit("vector_list: list expected, not ~s"), list, nao);