From f69a458625d3002d7216fc72b6627a05bb1a934b Mon Sep 17 00:00:00 2001 From: Justin Ethier Date: Thu, 18 Apr 2019 17:07:31 -0400 Subject: [PATCH] Sync up with latest changes to 132 There may be more fixes, this is more of a temporary band-aid. --- srfi/132.sld | 12 +++++++++++- srfi/sorting/vmsort.scm | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/srfi/132.sld b/srfi/132.sld index cdcfd561..e8ef50fc 100644 --- a/srfi/132.sld +++ b/srfi/132.sld @@ -1,5 +1,15 @@ (define-library (srfi 132) - (import (scheme base)) + + + + (import (except (scheme base) vector-copy vector-copy!) + (rename (only (scheme base) vector-copy vector-copy! vector-fill!) + (vector-copy r7rs-vector-copy) + (vector-copy! r7rs-vector-copy!) + (vector-fill! r7rs-vector-fill!) + )) + + ; (import (scheme base)) (import (scheme cxr)) (export list-sorted? vector-sorted? list-merge vector-merge list-sort vector-sort list-stable-sort vector-stable-sort list-merge! vector-merge! list-sort! vector-sort! diff --git a/srfi/sorting/vmsort.scm b/srfi/sorting/vmsort.scm index 9b0eb639..2144716c 100644 --- a/srfi/sorting/vmsort.scm +++ b/srfi/sorting/vmsort.scm @@ -104,7 +104,7 @@ (call-with-values (lambda () (vector-start+end v maybe-args)) (lambda (start end) - (let ((ans (vector-copy v start end))) + (let ((ans (r7rs-vector-copy v start end))) (vector-merge-sort! < ans) ans)))) @@ -211,7 +211,7 @@ temp v (not v=v0?)))))))))) (lambda (ignored-len ignored-ansvec ansvec=v0?) (if (not ansvec=v0?) - (vector-copy! v0 l temp0 l r)))))) + (r7rs-vector-copy! v0 l temp0 l r)))))) ;;; Copyright