* vector->list is moved to ikarus.vectors
This commit is contained in:
parent
e9ca4ed971
commit
8188c51d20
BIN
src/ikarus.boot
BIN
src/ikarus.boot
Binary file not shown.
|
@ -179,21 +179,6 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
(let ()
|
|
||||||
(define f
|
|
||||||
(lambda (v i ls)
|
|
||||||
(cond
|
|
||||||
[($fx< i 0) ls]
|
|
||||||
[else
|
|
||||||
(f v ($fxsub1 i) (cons ($vector-ref v i) ls))])))
|
|
||||||
(primitive-set! 'vector->list
|
|
||||||
(lambda (v)
|
|
||||||
(if (vector? v)
|
|
||||||
(let ([n ($vector-length v)])
|
|
||||||
(if ($fxzero? n)
|
|
||||||
'()
|
|
||||||
(f v ($fxsub1 n) '())))
|
|
||||||
(error 'vector->list "~s is not a vector" v)))))
|
|
||||||
|
|
||||||
(let ()
|
(let ()
|
||||||
(define f
|
(define f
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
|
|
||||||
(library (ikarus vectors)
|
(library (ikarus vectors)
|
||||||
(export make-vector vector vector-length vector-ref vector-set!
|
(export make-vector vector vector-length vector-ref vector-set!
|
||||||
list->vector)
|
vector->list list->vector)
|
||||||
(import
|
(import
|
||||||
(except (ikarus) make-vector vector
|
(except (ikarus) make-vector vector
|
||||||
vector-length vector-ref vector-set!
|
vector-length vector-ref vector-set!
|
||||||
list->vector)
|
vector->list list->vector)
|
||||||
(only (scheme)
|
(only (scheme)
|
||||||
$fx= $fx>= $fx< $fx<= $fx+ $fxadd1 $car $cdr
|
$fx= $fx>= $fx< $fx<= $fx+ $fxadd1 $fxsub1 $fxzero? $car $cdr
|
||||||
$vector-set! $vector-ref $make-vector $vector-length))
|
$vector-set! $vector-ref $make-vector $vector-length))
|
||||||
|
|
||||||
|
|
||||||
|
@ -76,6 +76,21 @@
|
||||||
(error 'vector-set! "index ~s is out of range for ~s" i v))
|
(error 'vector-set! "index ~s is out of range for ~s" i v))
|
||||||
($vector-set! v i c)))
|
($vector-set! v i c)))
|
||||||
|
|
||||||
|
(define vector->list
|
||||||
|
(lambda (v)
|
||||||
|
(define f
|
||||||
|
(lambda (v i ls)
|
||||||
|
(cond
|
||||||
|
[($fx< i 0) ls]
|
||||||
|
[else
|
||||||
|
(f v ($fxsub1 i) (cons ($vector-ref v i) ls))])))
|
||||||
|
(if (vector? v)
|
||||||
|
(let ([n ($vector-length v)])
|
||||||
|
(if ($fxzero? n)
|
||||||
|
'()
|
||||||
|
(f v ($fxsub1 n) '())))
|
||||||
|
(error 'vector->list "~s is not a vector" v))))
|
||||||
|
|
||||||
(define list->vector
|
(define list->vector
|
||||||
(letrec ([race
|
(letrec ([race
|
||||||
(lambda (h t ls n)
|
(lambda (h t ls n)
|
||||||
|
|
Loading…
Reference in New Issue