From 2042e178fcc75d748981aeaf7b8a7281df6cef2f Mon Sep 17 00:00:00 2001
From: Marius Vollmer <mvo@zagadka.de>
Date: Mon, 10 Jan 2005 20:06:03 +0000
Subject: [PATCH] * 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.

---
 ice-9/Makefile.am    |  4 ++--
 ice-9/arrays.scm     | 14 --------------
 ice-9/boot-9.scm     |  5 +++--
 ice-9/deprecated.scm | 13 +++++++++++++
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ice-9/Makefile.am b/ice-9/Makefile.am
index 46bc3db05..7853faab2 100644
--- a/ice-9/Makefile.am
+++ b/ice-9/Makefile.am
@@ -25,14 +25,14 @@ SUBDIRS = debugger
 
 # These should be installed and distributed.
 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	   \
 	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	   \
 	posix.scm psyntax.pp psyntax.ss q.scm r4rs.scm r5rs.scm		   \
 	rdelim.scm receive.scm regex.scm runq.scm rw.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		   \
         pretty-print.scm ftw.scm gap-buffer.scm occam-channel.scm	   \
 	weak-vector.scm deprecated.scm list.scm serialize.scm
diff --git a/ice-9/arrays.scm b/ice-9/arrays.scm
index 3e92931db..a29396b81 100644
--- a/ice-9/arrays.scm
+++ b/ice-9/arrays.scm
@@ -21,17 +21,3 @@
 (define (array-shape a)
   (map (lambda (ind) (if (number? ind) (list 0 (+ -1 ind)) ind))
        (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)))
diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm
index e5bdd6738..d31c65051 100644
--- a/ice-9/boot-9.scm
+++ b/ice-9/boot-9.scm
@@ -301,8 +301,9 @@
 ;;; {Arrays}
 ;;;
 
-(if (provided? 'array)
-    (primitive-load-path "ice-9/arrays.scm"))
+(define (array-shape a)
+  (map (lambda (ind) (if (number? ind) (list 0 (+ -1 ind)) ind))
+       (array-dimensions a)))
 
 
 
diff --git a/ice-9/deprecated.scm b/ice-9/deprecated.scm
index 609dc7f4f..5f42b42ff 100644
--- a/ice-9/deprecated.scm
+++ b/ice-9/deprecated.scm
@@ -165,3 +165,16 @@
 (define (list* . args)
   (issue-deprecation-warning "'list*' is deprecated.  Use 'cons*' instead.")
   (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))