* scheme-io.texi: Removed obsolete section Binary IO. Added

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

diff --git a/libguile/struct.h b/libguile/struct.h
index 38b7c92..7c784eb 100644 (file)
--- a/libguile/struct.h
+++ b/libguile/struct.h
@@ -2,7 +2,7 @@
 
 #ifndef STRUCTH
 #define STRUCTH
-/*     Copyright (C) 1995, 1997, 1999 Free Software Foundation, Inc.
+/*     Copyright (C) 1995, 1997, 1999, 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
@@ -70,20 +70,26 @@
 #define scm_vtable_index_printer 3 /* A printer for this struct type. */
 #define scm_vtable_offset_user   4 /* Where do user fields start? */
 
-typedef scm_sizet (*scm_struct_free_t) (SCM *vtable, SCM *data);
+typedef scm_sizet (*scm_struct_free_t) (scm_bits_t * vtable, scm_bits_t * data);
 
 #define SCM_STRUCTF_MASK   (0xFFF << 20)
 #define SCM_STRUCTF_ENTITY (1L << 30) /* Indicates presence of proc slots */
 #define SCM_STRUCTF_LIGHT  (1L << 31) /* Light representation
                                         (no hidden words) */
 
+/* Dirk:FIXME:: the SCM_STRUCTP predicate is also fulfilled for glocs */
 #define SCM_STRUCTP(X)                 (SCM_NIMP(X) && (SCM_TYP3(X) == scm_tc3_cons_gloc))
-#define SCM_STRUCT_DATA(X)             ((SCM*)(SCM_CDR(X)))
-#define SCM_STRUCT_VTABLE_DATA(X)      ((SCM *)(SCM_CAR(X) - 1))
-#define SCM_STRUCT_LAYOUT(X)           (SCM_STRUCT_VTABLE_DATA(X)[scm_vtable_index_layout])
-#define SCM_STRUCT_VTABLE(X)           (SCM_STRUCT_VTABLE_DATA(X)[scm_vtable_index_vtable])
-#define SCM_STRUCT_PRINTER(X)          (SCM_STRUCT_VTABLE_DATA(X)[scm_vtable_index_printer])
-#define SCM_SET_VTABLE_DESTRUCTOR(X, D) (SCM_STRUCT_DATA(X)[scm_struct_i_free] = (SCM) D)
+#define SCM_STRUCT_DATA(X)             ((scm_bits_t *) SCM_CELL_WORD_1 (X))
+#define SCM_STRUCT_VTABLE_DATA(X)       ((scm_bits_t *) (SCM_CELL_WORD_0 (X) - scm_tc3_cons_gloc))
+
+#define SCM_STRUCT_LAYOUT(X)           (SCM_PACK (SCM_STRUCT_VTABLE_DATA (X) [scm_vtable_index_layout]))
+#define SCM_SET_STRUCT_LAYOUT(X, v)     (SCM_STRUCT_VTABLE_DATA (X) [scm_vtable_index_layout] = SCM_UNPACK (v))
+
+#define SCM_STRUCT_VTABLE(X)           (SCM_PACK (SCM_STRUCT_VTABLE_DATA (X) [scm_vtable_index_vtable]))
+#define SCM_STRUCT_PRINTER(X)          (SCM_PACK (SCM_STRUCT_VTABLE_DATA (X) [scm_vtable_index_printer]))
+#define SCM_SET_STRUCT_PRINTER(x, v)\
+   (SCM_STRUCT_VTABLE_DATA (x) [scm_vtable_index_printer] = (v))
+#define SCM_SET_VTABLE_DESTRUCTOR(X, D) (SCM_STRUCT_DATA (X) [scm_struct_i_free] = (scm_bits_t) (D))
 /* Efficiency is important in the following macro, since it's used in GC */
 #define SCM_LAYOUT_TAILP(X)            (((X) & 32) == 0) /* R, W or O */
 
@@ -93,16 +99,17 @@ typedef scm_sizet (*scm_struct_free_t) (SCM *vtable, SCM *data);
 #define SCM_SET_STRUCT_TABLE_CLASS(X, CLASS) SCM_SETCDR (X, CLASS)
 extern SCM scm_struct_table;
 
+#define SCM_STRUCT_GC_CHAIN(X) SCM_CELL_OBJECT_3 (X)
+#define SCM_SET_STRUCT_GC_CHAIN(X, Y) SCM_SET_CELL_OBJECT_3 (X, Y)
+extern SCM scm_structs_to_free;
+
 \f
 
-extern SCM *scm_alloc_struct (int n_words,
-                             int n_extra,
-                             char *who);
-extern scm_sizet scm_struct_free_0 (SCM *vtable, SCM *data);
-extern scm_sizet scm_struct_free_light (SCM *vtable, SCM *data);
-extern scm_sizet scm_struct_free_standard (SCM *vtable, SCM *data);
-extern scm_sizet scm_struct_free_entity (SCM *vtable, SCM *data);
-extern void scm_struct_init (SCM handle, int tail_elts, SCM inits);
+extern scm_bits_t * scm_alloc_struct (int n_words, int n_extra, char * who);
+extern scm_sizet scm_struct_free_0 (scm_bits_t * vtable, scm_bits_t * data);
+extern scm_sizet scm_struct_free_light (scm_bits_t * vtable, scm_bits_t * data);
+extern scm_sizet scm_struct_free_standard (scm_bits_t * vtable, scm_bits_t * data);
+extern scm_sizet scm_struct_free_entity (scm_bits_t * vtable, scm_bits_t * data);
 extern SCM scm_make_struct_layout (SCM fields);
 extern SCM scm_struct_p (SCM x);
 extern SCM scm_struct_vtable_p (SCM x);
@@ -117,6 +124,13 @@ extern SCM scm_struct_create_handle (SCM obj);
 extern SCM scm_struct_vtable_name (SCM vtable);
 extern SCM scm_set_struct_vtable_name_x (SCM vtable, SCM name);
 extern void scm_print_struct (SCM exp, SCM port, scm_print_state *);
+extern void scm_struct_prehistory (void);
 extern void scm_init_struct (void);
 
 #endif  /* STRUCTH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/