rename ramap.[ch] to array-map.[ch]

* libguile/array-map.c:
* libguile/array-map.h: Rename from ramap.c and ramap.h.

* libguile.h:
* libguile/Makefile.am:
* libguile/eq.c:
* libguile/init.c:
* libguile/sort.c:
* libguile/unif.c:
* libguile/vectors.c: All referrers changed.

libguile.h

@@ -31,6 +31,7 @@ extern "C" {
 #include "libguile/__scm.h"
 #include "libguile/alist.h"
 #include "libguile/arbiters.h"
+#include "libguile/array-map.h"
 #include "libguile/async.h"
 #include "libguile/boolean.h"
 #include "libguile/bytevectors.h"
@@ -78,7 +79,6 @@ extern "C" {
 #include "libguile/properties.h"
 #include "libguile/procs.h"
 #include "libguile/r6rs-ports.h"
-#include "libguile/ramap.h"
 #include "libguile/random.h"
 #include "libguile/read.h"
 #include "libguile/root.h"

libguile/Makefile.am

@@ -108,6 +108,7 @@ libguile_la_CFLAGS = $(GUILE_CFLAGS) $(AM_CFLAGS)
 libguile_la_SOURCES =				\
 	alist.c					\
 	arbiters.c				\
+	array-map.c				\
 	async.c					\
 	backtrace.c				\
 	boolean.c				\
@@ -170,7 +171,6 @@ libguile_la_SOURCES =				\
 	programs.c				\
 	properties.c				\
 	r6rs-ports.c				\
-	ramap.c					\
 	random.c				\
 	rdelim.c				\
 	read.c					\
@@ -216,6 +216,7 @@ libguile_i18n_v_@LIBGUILE_I18N_MAJOR@_la_LDFLAGS =	\
 DOT_X_FILES =					\
 	alist.x					\
 	arbiters.x				\
+	array-map.x				\
 	async.x					\
 	backtrace.x				\
 	boolean.x				\
@@ -271,7 +272,6 @@ DOT_X_FILES =					\
 	procs.x					\
 	properties.x				\
 	r6rs-ports.x				\
-	ramap.x					\
 	random.x				\
 	rdelim.x				\
 	read.x					\
@@ -312,6 +312,7 @@ EXTRA_DOT_X_FILES = @EXTRA_DOT_X_FILES@
 DOT_DOC_FILES = 				\
 	alist.doc				\
 	arbiters.doc				\
+	array-map.doc				\
 	async.doc				\
 	backtrace.doc				\
 	boolean.doc				\
@@ -367,7 +368,6 @@ DOT_DOC_FILES = 				\
 	procs.doc				\
 	properties.doc				\
 	r6rs-ports.doc				\
-	ramap.doc				\
 	random.doc				\
 	rdelim.doc				\
 	read.doc				\
@@ -452,6 +452,7 @@ modinclude_HEADERS =				\
 	__scm.h					\
 	alist.h					\
 	arbiters.h				\
+	array-map.h				\
 	async.h					\
 	backtrace.h				\
 	boolean.h				\
@@ -516,7 +517,6 @@ modinclude_HEADERS =				\
 	properties.h				\
 	pthread-threads.h			\
 	r6rs-ports.h				\
-	ramap.h					\
 	random.h				\
 	rdelim.h				\
 	read.h					\

libguile/array-map.c

@@ -17,10 +17,6 @@
  */
 
 
-/*
-  HWN:FIXME::
-  Someone should rename this to arraymap.c; that would reflect the
-  contents better.  */
 
 
 
@@ -43,7 +39,7 @@
 #include "libguile/dynwind.h"
 
 #include "libguile/validate.h"
-#include "libguile/ramap.h"
+#include "libguile/array-map.h"
 
 
 typedef struct
@@ -259,7 +255,7 @@ scm_ramapc (int (*cproc)(), SCM data, SCM ra0, SCM lra, const char *what)
       return (SCM_UNBNDP (data) ? cproc(vra0, lvra) : cproc(vra0, data, lvra));
     case 1:
     gencase:			/* Have to loop over all dimensions. */
-    vra0 = scm_i_make_array (1, 0);
+      vra0 = scm_i_make_array (1, 0);
     if (SCM_I_ARRAYP (ra0))
       {
 	kmax = SCM_I_ARRAY_NDIM (ra0) - 1;
@@ -1222,13 +1218,13 @@ init_raprocs (ra_iproc *subra)
 
 
 void
-scm_init_ramap ()
+scm_init_array_map (void)
 {
   init_raprocs (ra_rpsubrs);
   init_raprocs (ra_asubrs);
   scm_c_define_subr (s_array_equal_p, scm_tc7_rpsubr, scm_array_equal_p);
   scm_smobs[SCM_TC2SMOBNUM (scm_i_tc16_array)].equalp = scm_raequal;
-#include "libguile/ramap.x"
+#include "libguile/array-map.x"
   scm_add_feature (s_scm_array_for_each);
 }
 

libguile/array-map.h

@@ -1,9 +1,9 @@
 /* classes: h_files */
 
-#ifndef SCM_RAMAP_H
+#ifndef SCM_ARRAY_MAP_H
-#define SCM_RAMAP_H
+#define SCM_ARRAY_MAP_H
 
-/* Copyright (C) 1995,1996,1997,2000, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,2000, 2006, 2008, 2009 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -48,9 +48,9 @@ SCM_API SCM scm_array_for_each (SCM proc, SCM ra0, SCM lra);
 SCM_API SCM scm_array_index_map_x (SCM ra, SCM proc);
 SCM_API SCM scm_raequal (SCM ra0, SCM ra1);
 SCM_API SCM scm_array_equal_p (SCM ra0, SCM ra1);
-SCM_INTERNAL void scm_init_ramap (void);
+SCM_INTERNAL void scm_init_array_map (void);
 
-#endif  /* SCM_RAMAP_H */
+#endif  /* SCM_ARRAY_MAP_H */
 
 /*
   Local Variables:

libguile/eq.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,2000,2001,2003, 2004, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,2000,2001,2003, 2004, 2006, 2009 Free Software Foundation, Inc.
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -22,7 +22,7 @@
 #endif
 
 #include "libguile/_scm.h"
-#include "libguile/ramap.h"
+#include "libguile/array-map.h"
 #include "libguile/stackchk.h"
 #include "libguile/strorder.h"
 #include "libguile/async.h"

libguile/init.c

@@ -92,7 +92,7 @@
 #include "libguile/procprop.h"
 #include "libguile/procs.h"
 #include "libguile/properties.h"
-#include "libguile/ramap.h"
+#include "libguile/array-map.h"
 #include "libguile/random.h"
 #include "libguile/rdelim.h"
 #include "libguile/read.h"
@@ -540,7 +540,7 @@ scm_i_init_guile (SCM_STACKITEM *base)
   scm_init_evalext ();
   scm_init_debug ();	/* Requires macro smobs */
   scm_init_random ();
-  scm_init_ramap ();
+  scm_init_array_map ();
   scm_init_unif ();
   scm_init_simpos ();
   scm_init_load_path ();

libguile/sort.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 1999,2000,2001,2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1999,2000,2001,2002, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
  * as published by the Free Software Foundation; either version 3 of
@@ -40,7 +40,7 @@
 #include "libguile/_scm.h"
 #include "libguile/eval.h"
 #include "libguile/unif.h"
-#include "libguile/ramap.h"
+#include "libguile/array-map.h"
 #include "libguile/feature.h"
 #include "libguile/vectors.h"
 #include "libguile/lang.h"

libguile/unif.c

@@ -53,7 +53,7 @@
 
 #include "libguile/validate.h"
 #include "libguile/unif.h"
-#include "libguile/ramap.h"
+#include "libguile/array-map.h"
 #include "libguile/print.h"
 #include "libguile/read.h"
 

libguile/vectors.c

@@ -32,7 +32,7 @@
 #include "libguile/vectors.h"
 #include "libguile/unif.h"
 #include "libguile/bytevectors.h"
-#include "libguile/ramap.h"
+#include "libguile/array-map.h"
 #include "libguile/srfi-4.h"
 #include "libguile/strings.h"
 #include "libguile/srfi-13.h"