guile/guile-core/libguile ChangeLog continuatio...

[Dirk Herrmann]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Dirk Herrmann <address@hidden>  00/10/06 06:35:58

Modified files:
        guile-core/libguile: ChangeLog continuations.h strings.h 
                             symbols.h unif.h vectors.h 

Log message:
        * Added type-specific replacement macros for SCM_LENGTH.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/ChangeLog.diff?r1=1.1133&r2=1.1134
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/continuations.h.diff?r1=1.13&r2=1.14
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/strings.h.diff?r1=1.19&r2=1.20
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/symbols.h.diff?r1=1.36&r2=1.37
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/unif.h.diff?r1=1.26&r2=1.27
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/vectors.h.diff?r1=1.22&r2=1.23

Patches:
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1133 
guile/guile-core/libguile/ChangeLog:1.1134
--- guile/guile-core/libguile/ChangeLog:1.1133  Mon Oct  2 14:33:38 2000
+++ guile/guile-core/libguile/ChangeLog Fri Oct  6 06:35:58 2000
@@ -1,3 +1,10 @@
+2000-10-06  Dirk Herrmann  <address@hidden>
+
+       * continuations.h (SCM_CONTINUATION_LENGTH), strings.h
+       (SCM_STRING_LENGTH), symbols.h (SCM_SYMBOL_LENGTH), unif.h
+       (SCM_UVECTOR_LENGTH, SCM_BITVECTOR_LENGTH), vectors.h
+       (SCM_VECTOR_LENGTH):  Added as replacements for SCM_LENGTH.
+
 2000-10-02  Marius Vollmer  <address@hidden>
 
        * coop-defs.h (coop_key_create): Don't use the C++ keyword
Index: guile/guile-core/libguile/continuations.h
diff -u guile/guile-core/libguile/continuations.h:1.13 
guile/guile-core/libguile/continuations.h:1.14
--- guile/guile-core/libguile/continuations.h:1.13      Mon Jun 12 05:28:23 2000
+++ guile/guile-core/libguile/continuations.h   Fri Oct  6 06:35:58 2000
@@ -63,6 +63,7 @@
 
 #define SCM_CONTREGS(x)                ((scm_contregs *) SCM_CELL_WORD_1 (x))  
 
 #define SCM_SET_CONTREGS(x, r) (SCM_SET_CELL_WORD_1 ((x), (scm_bits_t) (r))) 
+#define SCM_CONTINUATION_LENGTH(x) (((unsigned long) SCM_CELL_WORD_0 (x)) >> 8)
 
 #define SCM_JMPBUF(x)          ((SCM_CONTREGS (x))->jmpbuf)
 #define SCM_DYNENV(x)          ((SCM_CONTREGS (x))->dynenv)
Index: guile/guile-core/libguile/strings.h
diff -u guile/guile-core/libguile/strings.h:1.19 
guile/guile-core/libguile/strings.h:1.20
--- guile/guile-core/libguile/strings.h:1.19    Tue Sep 26 11:37:26 2000
+++ guile/guile-core/libguile/strings.h Fri Oct  6 06:35:58 2000
@@ -54,6 +54,7 @@
 #define SCM_STRINGP(x) (SCM_NIMP (x) && (SCM_TYP7S (x) == scm_tc7_string))
 #define SCM_STRING_UCHARS(x) ((unsigned char *) (SCM_CELL_WORD_1 (x)))
 #define SCM_STRING_CHARS(x) ((char *) (SCM_CELL_WORD_1 (x)))
+#define SCM_STRING_LENGTH(x) (((unsigned long) SCM_CELL_WORD_0 (x)) >> 8)
 
 /* Is X a writable string (i.e., not a substring)?  */
 #define SCM_RWSTRINGP(x) (SCM_NIMP (x) && (SCM_TYP7 (x) == scm_tc7_string))
Index: guile/guile-core/libguile/symbols.h
diff -u guile/guile-core/libguile/symbols.h:1.36 
guile/guile-core/libguile/symbols.h:1.37
--- guile/guile-core/libguile/symbols.h:1.36    Tue Sep 26 15:15:13 2000
+++ guile/guile-core/libguile/symbols.h Fri Oct  6 06:35:58 2000
@@ -52,13 +52,14 @@
 
 extern int scm_symhash_dim;
 
-/* SCM_LENGTH(SYM) is the length of SYM's name in characters, and
+/* SCM_SYMBOL_LENGTH(SYM) is the length of SYM's name in characters, and
  * SCM_SYMBOL_CHARS(SYM) is the address of the first character of SYM's name.
  */
 
 #define SCM_SYMBOLP(x) (SCM_NIMP (x) && (SCM_TYP7 (x) == scm_tc7_symbol))
 #define SCM_SYMBOL_UCHARS(x)  ((unsigned char *) (SCM_CELL_WORD_1 (x)))
 #define SCM_SYMBOL_CHARS(x)  ((char *) (SCM_CELL_WORD_1 (x)))
+#define SCM_SYMBOL_LENGTH(x)  (((unsigned long) SCM_CELL_WORD_0 (x)) >> 8)
 
 #define SCM_LENGTH_MAX         (0xffffffL)
 #define SCM_LENGTH(x)          (((unsigned long) SCM_CELL_WORD_0 (x)) >> 8)
Index: guile/guile-core/libguile/unif.h
diff -u guile/guile-core/libguile/unif.h:1.26 
guile/guile-core/libguile/unif.h:1.27
--- guile/guile-core/libguile/unif.h:1.26       Tue Sep 26 14:53:49 2000
+++ guile/guile-core/libguile/unif.h    Fri Oct  6 06:35:58 2000
@@ -87,6 +87,9 @@
 #define SCM_ARRAY_DIMS(a) ((scm_array_dim *)((char *) SCM_ARRAY_MEM (a) + 
sizeof (scm_array))) 
 
 #define SCM_UVECTOR_BASE(x) ((void *) (SCM_CELL_WORD_1 (x)))
+#define SCM_UVECTOR_LENGTH(x) (((unsigned long) SCM_CELL_WORD_0 (x)) >> 8)
+
+#define SCM_BITVECTOR_LENGTH(x) (((unsigned long) SCM_CELL_WORD_0 (x)) >> 8)
 
 /* apparently it's possible to have more than SCM_LENGTH_MAX elements
    in an array: if the length is SCM_LENGTH_MAX then the SCM_VELTS
Index: guile/guile-core/libguile/vectors.h
diff -u guile/guile-core/libguile/vectors.h:1.22 
guile/guile-core/libguile/vectors.h:1.23
--- guile/guile-core/libguile/vectors.h:1.22    Tue Sep 26 12:20:39 2000
+++ guile/guile-core/libguile/vectors.h Fri Oct  6 06:35:58 2000
@@ -53,6 +53,8 @@
 
 #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_VELTS(x) ((SCM *) SCM_CELL_WORD_1 (x))
 #define SCM_VELTS_AS_STACKITEMS(x) ((SCM_STACKITEM *) SCM_CELL_WORD_1 (x))
 #define SCM_SETVELTS(x,v) (SCM_SET_CELL_WORD_1 ((x), (v)))