Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-07-17 01:47:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing sort on vectors for comparators other than <.

Browse source 
Also applying the dups fix analog to 0d36042bb1c6 for non-< comparators.
This commit is contained in:
Alex Shinn 2013-05-12 10:30:38 +09:00
parent 59c3171c39
commit 74775675fc
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/srfi/95/qsort.c
View file

@ -147,8 +147,6 @@ static void sexp_qsort (sexp ctx, sexp *vec, sexp_sint_t lo, sexp_sint_t hi) {
if (diff <= 0) { if (diff <= 0) {
swap(tmp2, vec[i], vec[j]); swap(tmp2, vec[i], vec[j]);
j++; j++;
} else if (diff == 0) {
j++;
} }
} }
swap(tmp, vec[j], vec[hi]); swap(tmp, vec[j], vec[hi]);
@ -190,12 +188,12 @@ static sexp sexp_qsort_less (sexp ctx, sexp *vec,
} else { } else {
a = vec[i]; a = vec[i];
} }
sexp_car(args2) = a; sexp_car(args2) = b;
sexp_car(args1) = b; sexp_car(args1) = a;
res = sexp_apply(ctx, less, args2); res = sexp_apply(ctx, less, args2);
if (sexp_exceptionp(res)) { if (sexp_exceptionp(res)) {
goto done; goto done;
} else if (sexp_truep(res)) { } else if (sexp_not(res)) {
swap(res, vec[i], vec[j]), j++; swap(res, vec[i], vec[j]), j++;
} else { } else {
sexp_car(args2) = b; sexp_car(args2) = b;
@ -247,6 +245,7 @@ static sexp sexp_sort_x (sexp ctx, sexp self, sexp_sint_t n, sexp seq,
res = sexp_type_exception(ctx, self, SEXP_PROCEDURE, key); res = sexp_type_exception(ctx, self, SEXP_PROCEDURE, key);
} else { } else {
res = sexp_qsort_less(ctx, data, 0, len-1, less, key); res = sexp_qsort_less(ctx, data, 0, len-1, less, key);
if (!sexp_exceptionp(res)) res = vec;
} }
} }