rename scm_i_make_ra to scm_i_make_array

* libguile/unif.c (scm_i_make_array): Rename from scm_i_make_ra. All
  callers changed.

diff --git a/libguile/ramap.c b/libguile/ramap.c
index e141c18..1d00fb3 100644 (file)
--- a/libguile/ramap.c
+++ b/libguile/ramap.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996,1998,2000,2001,2004,2005, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1998,2000,2001,2004,2005, 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
@@ -223,7 +223,7 @@ scm_ramapc (int (*cproc)(), SCM data, SCM ra0, SCM lra, const char *what)
       if (!SCM_I_ARRAYP (vra0))
        {
          size_t length = scm_c_generalized_vector_length (vra0);
-         vra1 = scm_i_make_ra (1, 0);
+         vra1 = scm_i_make_array (1, 0);
          SCM_I_ARRAY_BASE (vra1) = 0;
          SCM_I_ARRAY_DIMS (vra1)->lbnd = 0;
          SCM_I_ARRAY_DIMS (vra1)->ubnd = length - 1;
@@ -236,7 +236,7 @@ scm_ramapc (int (*cproc)(), SCM data, SCM ra0, SCM lra, const char *what)
       for (z = lra; SCM_NIMP (z); z = SCM_CDR (z))
        {
          ra1 = SCM_CAR (z);
-         vra1 = scm_i_make_ra (1, 0);
+         vra1 = scm_i_make_array (1, 0);
          SCM_I_ARRAY_DIMS (vra1)->lbnd = SCM_I_ARRAY_DIMS (vra0)->lbnd;
          SCM_I_ARRAY_DIMS (vra1)->ubnd = SCM_I_ARRAY_DIMS (vra0)->ubnd;
          if (!SCM_I_ARRAYP (ra1))
@@ -259,7 +259,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_ra (1, 0);
+    vra0 = scm_i_make_array (1, 0);
     if (SCM_I_ARRAYP (ra0))
       {
        kmax = SCM_I_ARRAY_NDIM (ra0) - 1;
@@ -294,7 +294,7 @@ scm_ramapc (int (*cproc)(), SCM data, SCM ra0, SCM lra, const char *what)
     for (z = lra; SCM_NIMP (z); z = SCM_CDR (z))
       {
        ra1 = SCM_CAR (z);
-       vra1 = scm_i_make_ra (1, 0);
+       vra1 = scm_i_make_array (1, 0);
        SCM_I_ARRAY_DIMS (vra1)->lbnd = SCM_I_ARRAY_DIMS (vra0)->lbnd;
        SCM_I_ARRAY_DIMS (vra1)->ubnd = SCM_I_ARRAY_DIMS (vra0)->ubnd;
        if (SCM_I_ARRAYP (ra1))

diff --git a/libguile/unif.c b/libguile/unif.c
index 8489130..603f02e 100644 (file)
--- a/libguile/unif.c
+++ b/libguile/unif.c
@@ -565,7 +565,7 @@ scm_array_handle_pos (scm_t_array_handle *h, SCM indices)
 }
 
 SCM 
-scm_i_make_ra (int ndim, int enclosed)
+scm_i_make_array (int ndim, int enclosed)
 {
   scm_t_bits tag = enclosed? scm_i_tc16_enclosed_array : scm_i_tc16_array;
   SCM ra;
@@ -591,7 +591,7 @@ scm_i_shap2ra (SCM args)
   if (ndim < 0)
     scm_misc_error (NULL, s_bad_spec, SCM_EOL);
 
-  ra = scm_i_make_ra (ndim, 0);
+  ra = scm_i_make_array (ndim, 0);
   SCM_I_ARRAY_BASE (ra) = 0;
   s = SCM_I_ARRAY_DIMS (ra);
   for (; !scm_is_null (args); s++, args = SCM_CDR (args))
@@ -905,7 +905,7 @@ SCM_DEFINE (scm_transpose_array, "transpose-array", 1, 0, 1,
            ndim = i;
        }
       ndim++;
-      res = scm_i_make_ra (ndim, 0);
+      res = scm_i_make_array (ndim, 0);
       SCM_I_ARRAY_V (res) = SCM_I_ARRAY_V (ra);
       SCM_I_ARRAY_BASE (res) = SCM_I_ARRAY_BASE (ra);
       for (k = ndim; k--;)
@@ -981,7 +981,7 @@ SCM_DEFINE (scm_enclose_array, "enclose-array", 1, 0, 1,
   ninr = scm_ilength (axes);
   if (ninr < 0)
     SCM_WRONG_NUM_ARGS ();
-  ra_inr = scm_i_make_ra (ninr, 0);
+  ra_inr = scm_i_make_array (ninr, 0);
 
   if (scm_is_generalized_vector (ra))
     {
@@ -1006,7 +1006,7 @@ SCM_DEFINE (scm_enclose_array, "enclose-array", 1, 0, 1,
   if (noutr < 0)
     SCM_WRONG_NUM_ARGS ();
   axv = scm_make_string (scm_from_int (ndim), SCM_MAKE_CHAR (0));
-  res = scm_i_make_ra (noutr, 1);
+  res = scm_i_make_array (noutr, 1);
   SCM_I_ARRAY_BASE (res) = SCM_I_ARRAY_BASE (ra_inr);
   SCM_I_ARRAY_V (res) = ra_inr;
   for (k = 0; k < ninr; k++, axes = SCM_CDR (axes))
@@ -1102,7 +1102,7 @@ scm_i_cvref (SCM v, size_t pos, int enclosed)
   if (enclosed)
     {
       int k = SCM_I_ARRAY_NDIM (v);
-      SCM res = scm_i_make_ra (k, 0);
+      SCM res = scm_i_make_array (k, 0);
       SCM_I_ARRAY_V (res) = SCM_I_ARRAY_V (v);
       SCM_I_ARRAY_BASE (res) = pos;
       while (k--)
@@ -1198,7 +1198,7 @@ SCM_DEFINE (scm_array_contents, "array-contents", 1, 1, 0,
          return v;
       }
       
-      sra = scm_i_make_ra (1, 0);
+      sra = scm_i_make_array (1, 0);
       SCM_I_ARRAY_DIMS (sra)->lbnd = 0;
       SCM_I_ARRAY_DIMS (sra)->ubnd = len - 1;
       SCM_I_ARRAY_V (sra) = SCM_I_ARRAY_V (ra);
@@ -1232,7 +1232,7 @@ scm_ra2contig (SCM ra, int copy)
           0 == len % SCM_LONG_BIT))
        return ra;
     }
-  ret = scm_i_make_ra (k, 0);
+  ret = scm_i_make_array (k, 0);
   SCM_I_ARRAY_BASE (ret) = 0;
   while (k--)
     {

diff --git a/libguile/unif.h b/libguile/unif.h
index 6b59e41..7018027 100644 (file)
--- a/libguile/unif.h
+++ b/libguile/unif.h
@@ -166,7 +166,7 @@ SCM_API scm_t_bits scm_i_tc16_enclosed_array;
 #define SCM_I_ARRAY_DIMS(a) \
   ((scm_t_array_dim *)((char *) SCM_I_ARRAY_MEM (a) + sizeof (scm_i_t_array)))
 
-SCM_INTERNAL SCM scm_i_make_ra (int ndim, int enclosed);
+SCM_INTERNAL SCM scm_i_make_array (int ndim, int enclosed);
 SCM_INTERNAL SCM scm_i_cvref (SCM v, size_t p, int enclosed);
 SCM_INTERNAL SCM scm_i_read_array (SCM port, int c);