Prefixed each each exported symbol with SCM_API.

[bpt/guile.git] / libguile / vectors.h

diff --git a/libguile/vectors.h b/libguile/vectors.h
index 3cf5c64..746a768 100644 (file)
--- a/libguile/vectors.h
+++ b/libguile/vectors.h
@@ -1,22 +1,24 @@
 /* classes: h_files */
 
-#ifndef VECTORSH
-#define VECTORSH
-/*     Copyright (C) 1995,1996 Free Software Foundation, Inc.
- * 
+#ifndef SCM_VECTORS_H
+#define SCM_VECTORS_H
+
+/* Copyright (C) 1995,1996,1998,2000,2001 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
  * the Free Software Foundation; either version 2, or (at your option)
  * any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
  *
  * As a special exception, the Free Software Foundation gives permission
  * for additional uses of the text contained in its release of GUILE.
@@ -40,43 +42,58 @@
  *
  * If you write modifications of your own for GUILE, it is your choice
  * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.  
- */
+ * If you do not wish that, delete this exception notice.  */
+
+\f
+
+#include "libguile/__scm.h"
+
 \f
 
-#include "__scm.h"
+#define SCM_VECTORP(x) (!SCM_IMP (x) && (SCM_TYP7S (x) == scm_tc7_vector))
+#define SCM_VECTOR_BASE(x) ((scm_t_bits *) 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)))
+
 
 \f
+/*
+  bit vectors
+ */
+#define SCM_BITVEC_REF(a, i) ((SCM_BITVECTOR_BASE (a) [(i) / SCM_LONG_BIT] & (1L << ((i) % SCM_LONG_BIT))) ? 1 : 0)
+#define SCM_BITVEC_SET(a, i) SCM_BITVECTOR_BASE (a) [(i) / SCM_LONG_BIT] |= (1L << ((i) % SCM_LONG_BIT))
+#define SCM_BITVEC_CLR(a, i) SCM_BITVECTOR_BASE (a) [(i) / SCM_LONG_BIT] &= ~(1L << ((i) % SCM_LONG_BIT))
 
-#define SCM_VECTORP(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
 
 \f
-#ifdef __STDC__
-extern SCM scm_vector_p(SCM x);
-extern SCM scm_vector_length(SCM v);
-extern SCM scm_vector(SCM l);
-extern SCM scm_vector_ref(SCM v, SCM k);
-extern SCM scm_vector_set_x(SCM v, SCM k, SCM obj);
-extern SCM scm_make_vector(SCM k, SCM fill, SCM multi);
-extern SCM scm_vector_to_list(SCM v);
-extern SCM scm_vector_fill_x(SCM v, SCM fill_x);
-extern SCM scm_vector_equal_p(SCM x, SCM y);
-extern void scm_init_vectors (void);
 
-#else /* STDC */
-extern SCM scm_vector_p();
-extern SCM scm_vector_length();
-extern SCM scm_vector();
-extern SCM scm_vector_ref();
-extern SCM scm_vector_set_x();
-extern SCM scm_make_vector();
-extern SCM scm_vector_to_list();
-extern SCM scm_vector_fill_x();
-extern SCM scm_vector_equal_p();
-extern void scm_init_vectors ();
+SCM_API SCM scm_c_make_vector (unsigned long int k, SCM fill);
+
+SCM_API SCM scm_vector_p (SCM x);
+SCM_API SCM scm_vector_length (SCM v);
+SCM_API SCM scm_vector (SCM l);
+SCM_API SCM scm_vector_ref (SCM v, SCM k);
+SCM_API SCM scm_vector_set_x (SCM v, SCM k, SCM obj);
+SCM_API SCM scm_make_vector (SCM k, SCM fill);
+SCM_API SCM scm_vector_to_list (SCM v);
+SCM_API SCM scm_vector_fill_x (SCM v, SCM fill_x);
+SCM_API SCM scm_vector_equal_p (SCM x, SCM y);
+SCM_API SCM scm_vector_move_left_x (SCM vec1, SCM start1, SCM end1,
+                                   SCM vec2, SCM start2);
+SCM_API SCM scm_vector_move_right_x (SCM vec1, SCM start1, SCM end1, 
+                                    SCM vec2, SCM start2);
+SCM_API void scm_init_vectors (void);
+
+#endif  /* SCM_VECTORS_H */
 
-#endif /* STDC */
-#endif  /* VECTORSH */
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/