Sync up with latest changes to 132

There may be more fixes, this is more of a temporary band-aid.
This commit is contained in:
Justin Ethier 2019-04-18 17:07:31 -04:00
parent c80d53c6e8
commit f69a458625
2 changed files with 13 additions and 3 deletions

View file

@ -1,5 +1,15 @@
(define-library (srfi 132) (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)) (import (scheme cxr))
(export list-sorted? vector-sorted? list-merge vector-merge list-sort vector-sort (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! list-stable-sort vector-stable-sort list-merge! vector-merge! list-sort! vector-sort!

View file

@ -104,7 +104,7 @@
(call-with-values (call-with-values
(lambda () (vector-start+end v maybe-args)) (lambda () (vector-start+end v maybe-args))
(lambda (start end) (lambda (start end)
(let ((ans (vector-copy v start end))) (let ((ans (r7rs-vector-copy v start end)))
(vector-merge-sort! < ans) (vector-merge-sort! < ans)
ans)))) ans))))
@ -211,7 +211,7 @@
temp v (not v=v0?)))))))))) temp v (not v=v0?))))))))))
(lambda (ignored-len ignored-ansvec ansvec=v0?) (lambda (ignored-len ignored-ansvec ansvec=v0?)
(if (not ansvec=v0?) (if (not ansvec=v0?)
(vector-copy! v0 l temp0 l r)))))) (r7rs-vector-copy! v0 l temp0 l r))))))
;;; Copyright ;;; Copyright