X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/7866a09b5b355ea277d2dd780b24e98f647329d4..e81d98ec2d12d9101dc79928833b2c064d148afc:/libguile/vectors.h

diff --git a/libguile/vectors.h b/libguile/vectors.h
index df4902c33..77d6131bf 100644
--- a/libguile/vectors.h
+++ b/libguile/vectors.h
@@ -2,7 +2,7 @@
 
 #ifndef VECTORSH
 #define VECTORSH
-/*	Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc.
+/*	Copyright (C) 1995, 1996, 1998, 2000 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -51,14 +51,31 @@
 
 
 
-#define SCM_VECTORP(x) (SCM_NIMP(x) && (SCM_TYP7S(x)==scm_tc7_vector))
-#define SCM_NVECTORP(x) (!SCM_VECTORP(x))
-#define SCM_VELTS(x) ((SCM *)SCM_CDR(x))
-#define SCM_SETVELTS SCM_SETCDR
+#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_SET_VECTOR_BASE(v, b) (SCM_SET_CELL_WORD_1 ((v), (b)))
+#define SCM_VECTOR_MAX_LENGTH ((1L << 24) - 1)
+#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))
+#define SCM_SETVELTS(x,v) (SCM_SET_CELL_WORD_1 ((x), (v)))
+
 
 
+/*
+  bit vectors
+ */
+#define SCM_BITVEC_REF(a, i) ((SCM_UNPACK(SCM_VELTS(a)[(i)/SCM_LONG_BIT]) & (1L<<((i)%SCM_LONG_BIT))) ? 1 : 0)
+#define SCM_BITVEC_SET(a, i) SCM_UNPACK(SCM_VELTS(a)[(i)/SCM_LONG_BIT]) |= (1L<<((i)%SCM_LONG_BIT))
+#define SCM_BITVEC_CLR(a, i) SCM_UNPACK(SCM_VELTS(a)[(i)/SCM_LONG_BIT]) &= ~(1L<<((i)%SCM_LONG_BIT))
+
+
+
+
+extern SCM scm_c_make_vector (unsigned long int k, SCM fill);
 
-extern SCM scm_vector_set_length_x (SCM vect, SCM len);
 extern SCM scm_vector_p (SCM x);
 extern SCM scm_vector_length (SCM v);
 extern SCM scm_vector (SCM l);
@@ -74,4 +91,18 @@ extern SCM scm_vector_move_right_x (SCM vec1, SCM start1, SCM end1,
                                     SCM vec2, SCM start2);
 extern void scm_init_vectors (void);
 
+
+
+#if (SCM_DEBUG_DEPRECATED == 0)
+
+extern SCM scm_vector_set_length_x (SCM vect, SCM len);
+
+#endif  /* SCM_DEBUG_DEPRECATED == 0 */
+
 #endif  /* VECTORSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/