/[guile]/guile/guile-core/libguile/ramap.c
ViewVC logotype

Diff of /guile/guile-core/libguile/ramap.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.84 by mvo, Sat Apr 5 19:10:22 2003 UTC revision 1.85 by dirk, Mon Apr 21 01:35:33 2003 UTC
# Line 981  scm_ra_sum (SCM ra0, SCM ras) Line 981  scm_ra_sum (SCM ra0, SCM ras)
981    unsigned long i0 = SCM_ARRAY_BASE (ra0);    unsigned long i0 = SCM_ARRAY_BASE (ra0);
982    long inc0 = SCM_ARRAY_DIMS (ra0)->inc;    long inc0 = SCM_ARRAY_DIMS (ra0)->inc;
983    ra0 = SCM_ARRAY_V (ra0);    ra0 = SCM_ARRAY_V (ra0);
984    if (SCM_NNULLP(ras))    if (!SCM_NULLP(ras))
985      {      {
986        SCM ra1 = SCM_CAR (ras);        SCM ra1 = SCM_CAR (ras);
987        unsigned long i1 = SCM_ARRAY_BASE (ra1);        unsigned long i1 = SCM_ARRAY_BASE (ra1);
# Line 1076  scm_ra_product (SCM ra0, SCM ras) Line 1076  scm_ra_product (SCM ra0, SCM ras)
1076    unsigned long i0 = SCM_ARRAY_BASE (ra0);    unsigned long i0 = SCM_ARRAY_BASE (ra0);
1077    long inc0 = SCM_ARRAY_DIMS (ra0)->inc;    long inc0 = SCM_ARRAY_DIMS (ra0)->inc;
1078    ra0 = SCM_ARRAY_V (ra0);    ra0 = SCM_ARRAY_V (ra0);
1079    if (SCM_NNULLP (ras))    if (!SCM_NULLP (ras))
1080      {      {
1081        SCM ra1 = SCM_CAR (ras);        SCM ra1 = SCM_CAR (ras);
1082        unsigned long i1 = SCM_ARRAY_BASE (ra1);        unsigned long i1 = SCM_ARRAY_BASE (ra1);
# Line 1528  SCM_DEFINE (scm_array_map_x, "array-map! Line 1528  SCM_DEFINE (scm_array_map_x, "array-map!
1528          for (p = ra_rpsubrs; p->name; p++)          for (p = ra_rpsubrs; p->name; p++)
1529            if (SCM_EQ_P (proc, p->sproc))            if (SCM_EQ_P (proc, p->sproc))
1530              {              {
1531                while (SCM_NNULLP (lra) && SCM_NNULLP (SCM_CDR (lra)))                while (!SCM_NULLP (lra) && !SCM_NULLP (SCM_CDR (lra)))
1532                  {                  {
1533                    scm_ramapc (p->vproc, SCM_UNDEFINED, ra0, lra, FUNC_NAME);                    scm_ramapc (p->vproc, SCM_UNDEFINED, ra0, lra, FUNC_NAME);
1534                    lra = SCM_CDR (lra);                    lra = SCM_CDR (lra);
1535                  }                  }
1536                return SCM_UNSPECIFIED;                return SCM_UNSPECIFIED;
1537              }              }
1538          while (SCM_NNULLP (lra) && SCM_NNULLP (SCM_CDR (lra)))          while (!SCM_NULLP (lra) && !SCM_NULLP (SCM_CDR (lra)))
1539            {            {
1540              scm_ramapc (ramap_rp, proc, ra0, lra, FUNC_NAME);              scm_ramapc (ramap_rp, proc, ra0, lra, FUNC_NAME);
1541              lra = SCM_CDR (lra);              lra = SCM_CDR (lra);
# Line 1568  SCM_DEFINE (scm_array_map_x, "array-map! Line 1568  SCM_DEFINE (scm_array_map_x, "array-map!
1568              if (!SCM_EQ_P (ra0, ra1)              if (!SCM_EQ_P (ra0, ra1)
1569                  || (SCM_ARRAYP(ra0) && !SCM_ARRAY_CONTP(ra0)))                  || (SCM_ARRAYP(ra0) && !SCM_ARRAY_CONTP(ra0)))
1570                goto gencase;                goto gencase;
1571            for (tail = SCM_CDR (lra); SCM_NNULLP (tail); tail = SCM_CDR (tail))            for (tail = SCM_CDR (lra); !SCM_NULLP (tail); tail = SCM_CDR (tail))
1572              {              {
1573                ra1 = SCM_CAR (tail);                ra1 = SCM_CAR (tail);
1574                if (SCM_EQ_P (v0, ra1)                if (SCM_EQ_P (v0, ra1)

Legend:
Removed from v.1.84  
changed lines
  Added in v.1.85

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26