guile/guile-core NEWS libguile/ChangeLog libgui...

[Dirk Herrmann]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Dirk Herrmann <address@hidden>  00/11/22 06:45:41

Modified files:
        guile-core     : NEWS 
        guile-core/libguile: ChangeLog vectors.c vectors.h weaks.c 

Log message:
        * Added SCM_SET_VECTOR_LENGTH as one replacement for SCM_SETLENGTH.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/NEWS.diff?r1=1.215&r2=1.216
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/ChangeLog.diff?r1=1.1170&r2=1.1171
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/vectors.c.diff?r1=1.39&r2=1.40
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/vectors.h.diff?r1=1.24&r2=1.25
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/weaks.c.diff?r1=1.29&r2=1.30

Patches:
Index: guile/guile-core/NEWS
diff -u guile/guile-core/NEWS:1.215 guile/guile-core/NEWS:1.216
--- guile/guile-core/NEWS:1.215 Wed Nov 22 03:20:02 2000
+++ guile/guile-core/NEWS       Wed Nov 22 06:45:40 2000
@@ -243,6 +243,10 @@
 
 Use these instead of SCM_LENGTH.
 
+** New macros:  SCM_SET_VECTOR_LENGTH
+
+Use these instead of SCM_SETLENGTH
+
 ** New macros:  SCM_STRING_CHARS, SCM_SYMBOL_CHARS, SCM_CCLO_BASE, 
 SCM_VECTOR_BASE, SCM_UVECTOR_BASE, SCM_BITVECTOR_BASE, SCM_COMPLEX_MEM,
 SCM_ARRAY_MEM
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1170 
guile/guile-core/libguile/ChangeLog:1.1171
--- guile/guile-core/libguile/ChangeLog:1.1170  Wed Nov 22 03:20:02 2000
+++ guile/guile-core/libguile/ChangeLog Wed Nov 22 06:45:41 2000
@@ -1,5 +1,12 @@
 2000-11-22  Dirk Herrmann  <address@hidden>
 
+       * vectors.c (scm_make_vector), weaks.c (scm_make_weak_vector):
+       Use SCM_SET_VECTOR_LENGTH instead of SCM_SETLENGTH.
+
+       * vectors.h (SCM_SET_VECTOR_LENGTH):  Added.
+
+2000-11-22  Dirk Herrmann  <address@hidden>
+
        * dynl.c (scm_make_argv_from_stringlist), filesys.c (scm_dirname,
        scm_basename), gh_data.c (gh_scm2newstr, gh_get_substr), hash.c
        (scm_hasher), load.c (scm_parse_path, scm_search_path,
Index: guile/guile-core/libguile/vectors.c
diff -u guile/guile-core/libguile/vectors.c:1.39 
guile/guile-core/libguile/vectors.c:1.40
--- guile/guile-core/libguile/vectors.c:1.39    Fri Nov 17 08:25:04 2000
+++ guile/guile-core/libguile/vectors.c Wed Nov 22 06:45:41 2000
@@ -293,7 +293,7 @@
       velts[j] = SCM_UNPACK (fill);
 
     SCM_SETCHARS (v, velts);
-    SCM_SETLENGTH (v, i, scm_tc7_vector);
+    SCM_SET_VECTOR_LENGTH (v, i, scm_tc7_vector);
   }
   SCM_ALLOW_INTS;
 
Index: guile/guile-core/libguile/vectors.h
diff -u guile/guile-core/libguile/vectors.h:1.24 
guile/guile-core/libguile/vectors.h:1.25
--- guile/guile-core/libguile/vectors.h:1.24    Wed Oct 25 05:58:51 2000
+++ guile/guile-core/libguile/vectors.h Wed Nov 22 06:45:41 2000
@@ -54,6 +54,7 @@
 #define SCM_VECTORP(x) (SCM_NIMP (x) && (SCM_TYP7S (x) == scm_tc7_vector))
 #define SCM_VECTOR_BASE(x) ((scm_bits_t *) SCM_CELL_WORD_1 (x))
 #define SCM_VECTOR_LENGTH(x) (((unsigned long) SCM_CELL_WORD_0 (x)) >> 8)
+#define SCM_SET_VECTOR_LENGTH(v, l, t) (SCM_SET_CELL_WORD_0 ((v), ((l) << 8) + 
(t)))
 
 #define SCM_VELTS(x) ((SCM *) SCM_CELL_WORD_1 (x))
 #define SCM_VELTS_AS_STACKITEMS(x) ((SCM_STACKITEM *) SCM_CELL_WORD_1 (x))
Index: guile/guile-core/libguile/weaks.c
diff -u guile/guile-core/libguile/weaks.c:1.29 
guile/guile-core/libguile/weaks.c:1.30
--- guile/guile-core/libguile/weaks.c:1.29      Fri Nov 17 08:25:05 2000
+++ guile/guile-core/libguile/weaks.c   Wed Nov 22 06:45:41 2000
@@ -63,10 +63,11 @@
            "@var{fill}. The default value for @var{fill} is the empty list.")
 #define FUNC_NAME s_scm_make_weak_vector
 {
+  /* Dirk:FIXME:: We should probably rather use a double cell for weak 
vectors. */
   SCM v;
   v = scm_make_vector (scm_sum (k, SCM_MAKINUM (2)), fill);
   SCM_DEFER_INTS;
-  SCM_SETLENGTH(v, SCM_INUM (k), scm_tc7_wvect);
+  SCM_SET_VECTOR_LENGTH (v, SCM_INUM (k), scm_tc7_wvect);
   SCM_SETVELTS(v, SCM_VELTS(v) + 2);
   SCM_VELTS(v)[-2] = SCM_EOL;
   SCM_UNPACK (SCM_VELTS (v)[-1]) = 0;