summaryrefslogtreecommitdiffstats
path: root/lib.c
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2012-02-22 17:21:43 -0800
committerKaz Kylheku <kaz@kylheku.com>2012-02-22 17:21:43 -0800
commitad3a952d7dd471995270a0c044b1d22ca4da8585 (patch)
tree307d37f00e9e09d5a8fc38b445ce93858038eafd /lib.c
parente2f5aecbef1b41f65b65bd580531f5869d1e232f (diff)
downloadtxr-ad3a952d7dd471995270a0c044b1d22ca4da8585.tar.gz
txr-ad3a952d7dd471995270a0c044b1d22ca4da8585.tar.bz2
txr-ad3a952d7dd471995270a0c044b1d22ca4da8585.zip
* eval.c (dwim_loc): del operator's return value is the
deleted range of values. Missing del cases added for single index cases. * lib.c (quicksort): Fix pivot selection one more time. (length): Fix bad argument in "not a sequence" error.
Diffstat (limited to 'lib.c')
-rw-r--r--lib.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib.c b/lib.c
index d405a991..db4b145e 100644
--- a/lib.c
+++ b/lib.c
@@ -3578,7 +3578,7 @@ static void swap(val vec, val i, val j)
static void quicksort(val vec, val lessfun, val keyfun, cnum from, cnum to)
{
if (to - from >= 2) {
- cnum pivot = to + (to - from) / 2;
+ cnum pivot = from + (to - from) / 2;
cnum i, j;
val pval = ref(vec, num_fast(pivot));
val pkval = funcall1(keyfun, pval);
@@ -3673,7 +3673,7 @@ val length(val seq)
case VEC:
return length_vec(seq);
default:
- type_mismatch(lit("length: ~s is not a sequence"), cons, nao);
+ type_mismatch(lit("length: ~s is not a sequence"), seq, nao);
}
}