mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-12 23:00:22 +02:00
* arrays.scm, deprecated.scm (uniform-vector-fill!,
make-uniform-vector, make-uniform-array, list->uniform-vector): Moved from arrays.scm to deprecated.scm. * arrays.scm, boot-9.scm (array-dimensions): Moved from arrays.scm to boo-9.scm. * Makefile.am (ice9_sources): Removed arrays.scm.
This commit is contained in:
parent
1d20a49534
commit
2042e178fc
4 changed files with 18 additions and 18 deletions
|
@ -25,14 +25,14 @@ SUBDIRS = debugger
|
||||||
|
|
||||||
# These should be installed and distributed.
|
# These should be installed and distributed.
|
||||||
ice9_sources = \
|
ice9_sources = \
|
||||||
and-let-star.scm arrays.scm boot-9.scm calling.scm common-list.scm \
|
and-let-star.scm boot-9.scm calling.scm common-list.scm \
|
||||||
debug.scm debugger.scm documentation.scm emacs.scm expect.scm \
|
debug.scm debugger.scm documentation.scm emacs.scm expect.scm \
|
||||||
format.scm getopt-long.scm hcons.scm lineio.scm ls.scm mapping.scm \
|
format.scm getopt-long.scm hcons.scm lineio.scm ls.scm mapping.scm \
|
||||||
match.scm networking.scm null.scm optargs.scm poe.scm popen.scm \
|
match.scm networking.scm null.scm optargs.scm poe.scm popen.scm \
|
||||||
posix.scm psyntax.pp psyntax.ss q.scm r4rs.scm r5rs.scm \
|
posix.scm psyntax.pp psyntax.ss q.scm r4rs.scm r5rs.scm \
|
||||||
rdelim.scm receive.scm regex.scm runq.scm rw.scm \
|
rdelim.scm receive.scm regex.scm runq.scm rw.scm \
|
||||||
safe-r5rs.scm safe.scm session.scm slib.scm stack-catch.scm \
|
safe-r5rs.scm safe.scm session.scm slib.scm stack-catch.scm \
|
||||||
streams.scm string-fun.scm syncase.scm threads.scm \
|
streams.scm string-fun.scm syncase.scm threads.scm \
|
||||||
buffered-input.scm time.scm history.scm channel.scm \
|
buffered-input.scm time.scm history.scm channel.scm \
|
||||||
pretty-print.scm ftw.scm gap-buffer.scm occam-channel.scm \
|
pretty-print.scm ftw.scm gap-buffer.scm occam-channel.scm \
|
||||||
weak-vector.scm deprecated.scm list.scm serialize.scm
|
weak-vector.scm deprecated.scm list.scm serialize.scm
|
||||||
|
|
|
@ -21,17 +21,3 @@
|
||||||
(define (array-shape a)
|
(define (array-shape a)
|
||||||
(map (lambda (ind) (if (number? ind) (list 0 (+ -1 ind)) ind))
|
(map (lambda (ind) (if (number? ind) (list 0 (+ -1 ind)) ind))
|
||||||
(array-dimensions a)))
|
(array-dimensions a)))
|
||||||
|
|
||||||
;; deprecated
|
|
||||||
|
|
||||||
(begin-deprecated
|
|
||||||
|
|
||||||
(define uniform-vector-fill! array-fill!)
|
|
||||||
|
|
||||||
(define make-uniform-vector dimensions->uniform-array)
|
|
||||||
|
|
||||||
(define (make-uniform-array prot . args)
|
|
||||||
(dimensions->uniform-array args prot))
|
|
||||||
|
|
||||||
(define (list->uniform-vector prot lst)
|
|
||||||
(list->uniform-array 1 prot lst)))
|
|
||||||
|
|
|
@ -301,8 +301,9 @@
|
||||||
;;; {Arrays}
|
;;; {Arrays}
|
||||||
;;;
|
;;;
|
||||||
|
|
||||||
(if (provided? 'array)
|
(define (array-shape a)
|
||||||
(primitive-load-path "ice-9/arrays.scm"))
|
(map (lambda (ind) (if (number? ind) (list 0 (+ -1 ind)) ind))
|
||||||
|
(array-dimensions a)))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -165,3 +165,16 @@
|
||||||
(define (list* . args)
|
(define (list* . args)
|
||||||
(issue-deprecation-warning "'list*' is deprecated. Use 'cons*' instead.")
|
(issue-deprecation-warning "'list*' is deprecated. Use 'cons*' instead.")
|
||||||
(apply cons* args))
|
(apply cons* args))
|
||||||
|
|
||||||
|
;; The strange prototype system for uniform arrays has been
|
||||||
|
;; deprecated.
|
||||||
|
|
||||||
|
(define uniform-vector-fill! array-fill!)
|
||||||
|
|
||||||
|
(define make-uniform-vector dimensions->uniform-array)
|
||||||
|
|
||||||
|
(define (make-uniform-array prot . args)
|
||||||
|
(dimensions->uniform-array args prot))
|
||||||
|
|
||||||
|
(define (list->uniform-vector prot lst)
|
||||||
|
(list->uniform-array 1 prot lst))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue