mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-15 08:10:17 +02:00
Code Activity

Reindent scm_ramapc

Browse source 
* libguile/array-map.c (scm_ramapc): Reindent.
This commit is contained in:
Andy Wingo 2014-02-09 21:11:08 +01:00
parent 2c001086b2
commit 1ac534e904
1 changed files with 80 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

160
libguile/array-map.c
View file

@ -211,90 +211,90 @@ scm_ramapc (void *cproc_ptr, SCM data, SCM ra0, SCM lra, const char *what)
case 1: case 1:
gencase: /* Have to loop over all dimensions. */ gencase: /* Have to loop over all dimensions. */
vra0 = scm_i_make_array (1); vra0 = scm_i_make_array (1);
if (SCM_I_ARRAYP (ra0)) if (SCM_I_ARRAYP (ra0))
{ {
kmax = SCM_I_ARRAY_NDIM (ra0) - 1; kmax = SCM_I_ARRAY_NDIM (ra0) - 1;
if (kmax < 0) if (kmax < 0)
{ {
SCM_I_ARRAY_DIMS (vra0)->lbnd = 0; SCM_I_ARRAY_DIMS (vra0)->lbnd = 0;
SCM_I_ARRAY_DIMS (vra0)->ubnd = 0; SCM_I_ARRAY_DIMS (vra0)->ubnd = 0;
SCM_I_ARRAY_DIMS (vra0)->inc = 1; SCM_I_ARRAY_DIMS (vra0)->inc = 1;
} }
else else
{ {
SCM_I_ARRAY_DIMS (vra0)->lbnd = SCM_I_ARRAY_DIMS (ra0)[kmax].lbnd; SCM_I_ARRAY_DIMS (vra0)->lbnd = SCM_I_ARRAY_DIMS (ra0)[kmax].lbnd;
SCM_I_ARRAY_DIMS (vra0)->ubnd = SCM_I_ARRAY_DIMS (ra0)[kmax].ubnd; SCM_I_ARRAY_DIMS (vra0)->ubnd = SCM_I_ARRAY_DIMS (ra0)[kmax].ubnd;
SCM_I_ARRAY_DIMS (vra0)->inc = SCM_I_ARRAY_DIMS (ra0)[kmax].inc; SCM_I_ARRAY_DIMS (vra0)->inc = SCM_I_ARRAY_DIMS (ra0)[kmax].inc;
} }
SCM_I_ARRAY_BASE (vra0) = SCM_I_ARRAY_BASE (ra0); SCM_I_ARRAY_BASE (vra0) = SCM_I_ARRAY_BASE (ra0);
SCM_I_ARRAY_V (vra0) = SCM_I_ARRAY_V (ra0); SCM_I_ARRAY_V (vra0) = SCM_I_ARRAY_V (ra0);
} }
else else
{ {
size_t length = scm_c_array_length (ra0); size_t length = scm_c_array_length (ra0);
kmax = 0; kmax = 0;
SCM_I_ARRAY_DIMS (vra0)->lbnd = 0; SCM_I_ARRAY_DIMS (vra0)->lbnd = 0;
SCM_I_ARRAY_DIMS (vra0)->ubnd = length - 1; SCM_I_ARRAY_DIMS (vra0)->ubnd = length - 1;
SCM_I_ARRAY_DIMS (vra0)->inc = 1; SCM_I_ARRAY_DIMS (vra0)->inc = 1;
SCM_I_ARRAY_BASE (vra0) = 0; SCM_I_ARRAY_BASE (vra0) = 0;
SCM_I_ARRAY_V (vra0) = ra0; SCM_I_ARRAY_V (vra0) = ra0;
ra0 = vra0; ra0 = vra0;
} }
lvra = SCM_EOL; lvra = SCM_EOL;
plvra = &lvra; plvra = &lvra;
for (z = lra; scm_is_pair (z); z = SCM_CDR (z)) for (z = lra; scm_is_pair (z); z = SCM_CDR (z))
{ {
ra1 = SCM_CAR (z); ra1 = SCM_CAR (z);
vra1 = scm_i_make_array (1); vra1 = scm_i_make_array (1);
SCM_I_ARRAY_DIMS (vra1)->lbnd = SCM_I_ARRAY_DIMS (vra0)->lbnd; SCM_I_ARRAY_DIMS (vra1)->lbnd = SCM_I_ARRAY_DIMS (vra0)->lbnd;
SCM_I_ARRAY_DIMS (vra1)->ubnd = SCM_I_ARRAY_DIMS (vra0)->ubnd; SCM_I_ARRAY_DIMS (vra1)->ubnd = SCM_I_ARRAY_DIMS (vra0)->ubnd;
if (SCM_I_ARRAYP (ra1)) if (SCM_I_ARRAYP (ra1))
{ {
if (kmax >= 0) if (kmax >= 0)
SCM_I_ARRAY_DIMS (vra1)->inc = SCM_I_ARRAY_DIMS (ra1)[kmax].inc; SCM_I_ARRAY_DIMS (vra1)->inc = SCM_I_ARRAY_DIMS (ra1)[kmax].inc;
SCM_I_ARRAY_V (vra1) = SCM_I_ARRAY_V (ra1); SCM_I_ARRAY_V (vra1) = SCM_I_ARRAY_V (ra1);
} }
else else
{ {
SCM_I_ARRAY_DIMS (vra1)->inc = 1; SCM_I_ARRAY_DIMS (vra1)->inc = 1;
SCM_I_ARRAY_V (vra1) = ra1; SCM_I_ARRAY_V (vra1) = ra1;
} }
*plvra = scm_cons (vra1, SCM_EOL); *plvra = scm_cons (vra1, SCM_EOL);
plvra = SCM_CDRLOC (*plvra); plvra = SCM_CDRLOC (*plvra);
} }
vinds = scm_gc_malloc_pointerless (sizeof(long) * SCM_I_ARRAY_NDIM (ra0), vinds = scm_gc_malloc_pointerless (sizeof(long) * SCM_I_ARRAY_NDIM (ra0),
indices_gc_hint); indices_gc_hint);
for (k = 0; k <= kmax; k++) for (k = 0; k <= kmax; k++)
vinds[k] = SCM_I_ARRAY_DIMS (ra0)[k].lbnd; vinds[k] = SCM_I_ARRAY_DIMS (ra0)[k].lbnd;
k = kmax; k = kmax;
do do
{ {
if (k == kmax) if (k == kmax)
{ {
SCM y = lra; SCM y = lra;
SCM_I_ARRAY_BASE (vra0) = cind (ra0, vinds); SCM_I_ARRAY_BASE (vra0) = cind (ra0, vinds);
for (z = lvra; scm_is_pair (z); z = SCM_CDR (z), y = SCM_CDR (y)) for (z = lvra; scm_is_pair (z); z = SCM_CDR (z), y = SCM_CDR (y))
SCM_I_ARRAY_BASE (SCM_CAR (z)) = cind (SCM_CAR (y), vinds); SCM_I_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--;
continue; continue;
} }
if (vinds[k] < SCM_I_ARRAY_DIMS (ra0)[k].ubnd) if (vinds[k] < SCM_I_ARRAY_DIMS (ra0)[k].ubnd)
{ {
vinds[k]++; vinds[k]++;
k++; k++;
continue; continue;
} }
vinds[k] = SCM_I_ARRAY_DIMS (ra0)[k].lbnd - 1; vinds[k] = SCM_I_ARRAY_DIMS (ra0)[k].lbnd - 1;
k--; k--;
} }
while (k >= 0); while (k >= 0);
case 5: case 5:
return 1; return 1;
} }
} }