*** empty log message ***

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

diff --git a/libguile/stacks.h b/libguile/stacks.h
index 13fc5cd..f92fa9a 100644 (file)
--- a/libguile/stacks.h
+++ b/libguile/stacks.h
@@ -2,7 +2,7 @@
 
 #ifndef STACKSH
 #define STACKSH
-/*     Copyright (C) 1995,1996 Mikael Djurfeldt
+/*     Copyright (C) 1995,1996 Free Software Foundation
  * 
  * 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
@@ -16,7 +16,8 @@
  * 
  * 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.
@@ -43,8 +44,7 @@
  * If you do not wish that, delete this exception notice.
  *
  * The author can be reached at djurfeldt@nada.kth.se
- * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN
- */
+ * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
 \f
 
 #include "libguile/__scm.h"
@@ -60,28 +60,41 @@ typedef struct scm_info_frame {
 } scm_info_frame;
 #define SCM_FRAME_N_SLOTS (sizeof (scm_info_frame) / sizeof (SCM))
 
-#define SCM_STACKP(obj) SCM_VECTORP (obj)
-#define SCM_STACK_LENGTH(stack) (SCM_LENGTH (stack) / SCM_FRAME_N_SLOTS)
+#define SCM_STACK(obj) ((scm_stack *) SCM_STRUCT_DATA (obj))
+#define SCM_STACK_LAYOUT "pwuourpW"
+typedef struct scm_stack {
+  SCM id;                      /* Stack id */
+  scm_info_frame *frames;      /* Info frames */
+  unsigned int length;         /* Stack length */
+  unsigned int tail_length;
+  scm_info_frame tail[1];
+} scm_stack;
+
+extern SCM scm_stack_type;
+
+#define SCM_STACKP(obj) (SCM_STRUCTP (obj) && SCM_STRUCT_VTABLE (obj) == scm_stack_type)
+#define SCM_STACK_LENGTH(stack) (SCM_STACK (stack) -> length)
 
 #define SCM_FRAMEP(obj) (SCM_CONSP (obj) \
-                        && SCM_NIMP (SCM_CAR (frame)) \
-                        && SCM_STACKP (SCM_CAR (frame)) \
-                        && SCM_INUMP (SCM_CDR (frame))) \
-
-
-/* Note that the following line contains a dependency on the
-   representation of INUMs. */
-#define SCM_FRAME_REF(frame, idx) (SCM_VELTS (SCM_CAR (frame))[(SCM_CDR (frame) & ~3L) + (idx)])
-#define SCM_FRAME_NUMBER(frame) (SCM_BACKWARDS_P \
-                                ? SCM_INUM (SCM_CDR (frame)) \
-                                : (SCM_STACK_LENGTH (SCM_CAR (frame)) \
-                                   - SCM_INUM (SCM_CDR (frame)) \
-                                   - 1)) \
-
-#define SCM_FRAME_FLAGS(frame) SCM_FRAME_REF (frame, 0)
-#define SCM_FRAME_SOURCE(frame) SCM_FRAME_REF (frame, 1)
-#define SCM_FRAME_PROC(frame) SCM_FRAME_REF (frame, 2)
-#define SCM_FRAME_ARGS(frame) SCM_FRAME_REF (frame, 3)
+                        && SCM_NIMP (SCM_CAR (obj)) \
+                        && SCM_STACKP (SCM_CAR (obj)) \
+                        && SCM_INUMP (SCM_CDR (obj))) \
+
+
+#define SCM_FRAME_REF(frame, slot) \
+(SCM_STACK (SCM_CAR (frame)) -> frames[SCM_INUM (SCM_CDR (frame))].slot) \
+
+#define SCM_FRAME_NUMBER(frame) \
+(SCM_BACKWARDS_P \
+ ? SCM_INUM (SCM_CDR (frame)) \
+ : (SCM_STACK_LENGTH (SCM_CAR (frame)) \
+    - SCM_INUM (SCM_CDR (frame)) \
+    - 1)) \
+
+#define SCM_FRAME_FLAGS(frame) SCM_FRAME_REF (frame, flags)
+#define SCM_FRAME_SOURCE(frame) SCM_FRAME_REF (frame, source)
+#define SCM_FRAME_PROC(frame) SCM_FRAME_REF (frame, proc)
+#define SCM_FRAME_ARGS(frame) SCM_FRAME_REF (frame, args)
 #define SCM_FRAME_PREV(frame) scm_frame_previous (frame)
 #define SCM_FRAME_NEXT(frame) scm_frame_next (frame)
 
@@ -99,10 +112,13 @@ typedef struct scm_info_frame {
 
 \f
 
-SCM scm_make_stack SCM_P ((SCM obj, SCM inner_cut, SCM outer_cut));
+SCM scm_stack_p SCM_P ((SCM obj));
+SCM scm_make_stack SCM_P ((SCM args));
+SCM scm_stack_id SCM_P ((SCM stack));
 SCM scm_stack_ref SCM_P ((SCM stack, SCM i));
 SCM scm_stack_length SCM_P ((SCM stack));
 
+SCM scm_frame_p SCM_P ((SCM obj));
 SCM scm_last_stack_frame SCM_P ((SCM obj));
 SCM scm_frame_number SCM_P ((SCM frame));
 SCM scm_frame_source SCM_P ((SCM frame));
@@ -115,6 +131,7 @@ SCM scm_frame_procedure_p SCM_P ((SCM frame));
 SCM scm_frame_evaluating_args_p SCM_P ((SCM frame));
 SCM scm_frame_overflow_p SCM_P ((SCM frame));
 
+
 void scm_init_stacks SCM_P ((void));
 
 #endif /* STACKSH */