mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-23 21:10:29 +02:00
Code Activity

(cind): Changed second arg to be pointer to long instead

Browse source 
of uniform vector.
(scm_ramapc): Allocate index vector with scm_malloc and not as
uniform vector.  Wrap it in a frameso that it gets properly freed.
(scm_array_index_map_x): Likewise.
This commit is contained in:
Marius Vollmer 2004-11-10 01:47:44 +00:00
parent 2ed348854d
commit b4b3363620
1 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

34
libguile/ramap.c
View file

@ -36,6 +36,7 @@
#include "libguile/root.h" #include "libguile/root.h"
#include "libguile/vectors.h" #include "libguile/vectors.h"
#include "libguile/srfi-4.h" #include "libguile/srfi-4.h"
#include "libguile/dynwind.h"
#include "libguile/validate.h" #include "libguile/validate.h"
#include "libguile/ramap.h" #include "libguile/ramap.h"
@ -139,11 +140,10 @@ do { type (*v0)[2] = (type (*)[2]) SCM_VELTS (ra0);\
} while (0) } while (0)
static unsigned long static unsigned long
cind (SCM ra, SCM inds) cind (SCM ra, long *ve)
{ {
unsigned long i; unsigned long i;
int k; int k;
long *ve = (long*) SCM_VELTS (inds);
if (!SCM_ARRAYP (ra)) if (!SCM_ARRAYP (ra))
return *ve; return *ve;
i = SCM_ARRAY_BASE (ra); i = SCM_ARRAY_BASE (ra);
@ -258,7 +258,7 @@ scm_ra_matchp (SCM ra0, SCM ras)
int int
scm_ramapc (int (*cproc)(), SCM data, SCM ra0, SCM lra, const char *what) scm_ramapc (int (*cproc)(), SCM data, SCM ra0, SCM lra, const char *what)
{ {
SCM inds, z; SCM z;
SCM vra0, ra1, vra1; SCM vra0, ra1, vra1;
SCM lvra, *plvra; SCM lvra, *plvra;
long *vinds; long *vinds;
@ -367,8 +367,12 @@ scm_ramapc (int (*cproc)(), SCM data, SCM ra0, SCM lra, const char *what)
*plvra = scm_cons (vra1, SCM_EOL); *plvra = scm_cons (vra1, SCM_EOL);
plvra = SCM_CDRLOC (*plvra); plvra = SCM_CDRLOC (*plvra);
} }
inds = scm_make_uve (SCM_ARRAY_NDIM (ra0), scm_from_int (-1));
vinds = (long *) SCM_VELTS (inds); scm_frame_begin (0);
vinds = scm_malloc (sizeof(long) * SCM_ARRAY_NDIM (ra0));
scm_frame_free (vinds);
for (k = 0; k <= kmax; k++) for (k = 0; k <= kmax; k++)
vinds[k] = SCM_ARRAY_DIMS (ra0)[k].lbnd; vinds[k] = SCM_ARRAY_DIMS (ra0)[k].lbnd;
k = kmax; k = kmax;
@ -377,9 +381,9 @@ scm_ramapc (int (*cproc)(), SCM data, SCM ra0, SCM lra, const char *what)
if (k == kmax) if (k == kmax)
{ {
SCM y = lra; SCM y = lra;
SCM_ARRAY_BASE (vra0) = cind (ra0, inds); SCM_ARRAY_BASE (vra0) = cind (ra0, vinds);
for (z = lvra; SCM_NIMP (z); z = SCM_CDR (z), y = SCM_CDR (y)) for (z = lvra; SCM_NIMP (z); z = SCM_CDR (z), y = SCM_CDR (y))
SCM_ARRAY_BASE (SCM_CAR (z)) = cind (SCM_CAR (y), inds); SCM_ARRAY_BASE (SCM_CAR (z)) = cind (SCM_CAR (y), vinds);
if (0 == (SCM_UNBNDP (data) ? cproc(vra0, lvra) : cproc(vra0, data, lvra))) if (0 == (SCM_UNBNDP (data) ? cproc(vra0, lvra) : cproc(vra0, data, lvra)))
return 0; return 0;
k--; k--;
@ -395,6 +399,8 @@ scm_ramapc (int (*cproc)(), SCM data, SCM ra0, SCM lra, const char *what)
k--; k--;
} }
while (k >= 0); while (k >= 0);
scm_frame_end ();
return 1; return 1;
} }
} }
@ -1093,11 +1099,17 @@ SCM_DEFINE (scm_array_index_map_x, "array-index-map!", 2, 0, 0,
else if (SCM_ARRAYP (ra)) else if (SCM_ARRAYP (ra))
{ {
SCM args = SCM_EOL; SCM args = SCM_EOL;
SCM inds = scm_make_uve (SCM_ARRAY_NDIM (ra), scm_from_int (-1));
long *vinds = (long *) SCM_VELTS (inds);
int j, k, kmax = SCM_ARRAY_NDIM (ra) - 1; int j, k, kmax = SCM_ARRAY_NDIM (ra) - 1;
long *vinds;
if (kmax < 0) if (kmax < 0)
return scm_array_set_x (ra, scm_call_0 (proc), SCM_EOL); return scm_array_set_x (ra, scm_call_0 (proc), SCM_EOL);
scm_frame_begin (0);
vinds = scm_malloc (sizeof(long) * SCM_ARRAY_NDIM (ra));
scm_frame_free (vinds);
for (k = 0; k <= kmax; k++) for (k = 0; k <= kmax; k++)
vinds[k] = SCM_ARRAY_DIMS (ra)[k].lbnd; vinds[k] = SCM_ARRAY_DIMS (ra)[k].lbnd;
k = kmax; k = kmax;
@ -1106,7 +1118,7 @@ SCM_DEFINE (scm_array_index_map_x, "array-index-map!", 2, 0, 0,
if (k == kmax) if (k == kmax)
{ {
vinds[k] = SCM_ARRAY_DIMS (ra)[k].lbnd; vinds[k] = SCM_ARRAY_DIMS (ra)[k].lbnd;
i = cind (ra, inds); i = cind (ra, vinds);
for (; vinds[k] <= SCM_ARRAY_DIMS (ra)[k].ubnd; vinds[k]++) for (; vinds[k] <= SCM_ARRAY_DIMS (ra)[k].ubnd; vinds[k]++)
{ {
for (j = kmax + 1, args = SCM_EOL; j--;) for (j = kmax + 1, args = SCM_EOL; j--;)
@ -1129,6 +1141,8 @@ SCM_DEFINE (scm_array_index_map_x, "array-index-map!", 2, 0, 0,
k--; k--;
} }
while (k >= 0); while (k >= 0);
scm_frame_end ();
return SCM_UNSPECIFIED; return SCM_UNSPECIFIED;
} }
else else