guile/guile-core/libguile ChangeLog unif.c

[Mikael Djurfeldt]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Mikael Djurfeldt <address@hidden>       01/10/28 06:13:35

Modified files:
        guile-core/libguile: ChangeLog unif.c 

Log message:
        * unif.c (scm_uniform_array_read_x, scm_uniform_array_write):
        Don't apply scm_uniform_vector_length on arrays.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/ChangeLog.diff?cvsroot=OldCVS&tr1=1.1535&tr2=1.1536&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/unif.c.diff?cvsroot=OldCVS&tr1=1.121&tr2=1.122&r1=text&r2=text

Patches:
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1535 
guile/guile-core/libguile/ChangeLog:1.1536
--- guile/guile-core/libguile/ChangeLog:1.1535  Thu Oct 18 17:38:04 2001
+++ guile/guile-core/libguile/ChangeLog Sun Oct 28 06:13:34 2001
@@ -1,3 +1,8 @@
+2001-10-28  Mikael Djurfeldt  <address@hidden>
+
+       * unif.c (scm_uniform_array_read_x, scm_uniform_array_write):
+       Don't apply scm_uniform_vector_length on arrays.
+
 2001-10-14  Dirk Herrmann  <address@hidden>
 
        * eval.c (scm_lookupcar, scm_m_letstar, scm_m_do, iqq,
Index: guile/guile-core/libguile/unif.c
diff -u guile/guile-core/libguile/unif.c:1.121 
guile/guile-core/libguile/unif.c:1.122
--- guile/guile-core/libguile/unif.c:1.121      Mon Jul  9 03:36:48 2001
+++ guile/guile-core/libguile/unif.c    Sun Oct 28 06:13:35 2001
@@ -1511,7 +1511,9 @@
     SCM_ASSERT (SCM_INUMP (port_or_fd)
                || (SCM_OPINPORTP (port_or_fd)),
                port_or_fd, SCM_ARG2, FUNC_NAME);
-  vlen = SCM_INUM (scm_uniform_vector_length (v));
+  vlen = (SCM_TYP7 (v) == scm_tc7_smob
+         ? 0
+         : SCM_INUM (scm_uniform_vector_length (v)));
 
 loop:
   switch SCM_TYP7 (v)
@@ -1675,8 +1677,10 @@
     SCM_ASSERT (SCM_INUMP (port_or_fd)
                || (SCM_OPOUTPORTP (port_or_fd)),
                port_or_fd, SCM_ARG2, FUNC_NAME);
-  vlen = SCM_INUM (scm_uniform_vector_length (v));
-
+  vlen = (SCM_TYP7 (v) == scm_tc7_smob
+         ? 0
+         : SCM_INUM (scm_uniform_vector_length (v)));
+  
 loop:
   switch SCM_TYP7 (v)
     {
@@ -1686,8 +1690,8 @@
       SCM_ASRTGO (SCM_ARRAYP (v), badarg1);
       v = scm_ra2contig (v, 1);
       cstart = SCM_ARRAY_BASE (v);
-      vlen = SCM_ARRAY_DIMS (v)->inc
-       * (SCM_ARRAY_DIMS (v)->ubnd - SCM_ARRAY_DIMS (v)->lbnd + 1);
+      vlen = (SCM_ARRAY_DIMS (v)->inc
+             * (SCM_ARRAY_DIMS (v)->ubnd - SCM_ARRAY_DIMS (v)->lbnd + 1));
       v = SCM_ARRAY_V (v);
       goto loop;
     case scm_tc7_string: