revert the ill-considered part of the 2001-05-24 changes

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

diff --git a/libguile/stacks.h b/libguile/stacks.h
index 1bf39b9..b86d87a 100644 (file)
--- a/libguile/stacks.h
+++ b/libguile/stacks.h
@@ -2,7 +2,7 @@
 
 #ifndef STACKSH
 #define STACKSH
-/*     Copyright (C) 1995,1996 Free Software Foundation
+/*     Copyright (C) 1995,1996, 2000 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
@@ -55,29 +55,33 @@
 /* {Frames and stacks}
  */
 
-typedef struct scm_info_frame {
-  //SCM flags;
+typedef struct scm_info_frame_t {
+  /* SCM flags; */
   scm_bits_t flags;
   SCM source;
   SCM proc;
   SCM args;
-} scm_info_frame;
-#define SCM_FRAME_N_SLOTS (sizeof (scm_info_frame) / sizeof (SCM))
+} scm_info_frame_t;
+#define SCM_FRAME_N_SLOTS (sizeof (scm_info_frame_t) / sizeof (SCM))
 
-#define SCM_STACK(obj) ((scm_stack *) SCM_STRUCT_DATA (obj))
+#define SCM_STACK(obj) ((scm_stack_t *) SCM_STRUCT_DATA (obj))
 #define SCM_STACK_LAYOUT "pwuourpW"
-typedef struct scm_stack {
+typedef struct scm_stack_t {
   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;
+  scm_info_frame_t *frames;    /* Info frames */
+  unsigned long length;                /* Stack length */
+  unsigned long tail_length;
+  scm_info_frame_t tail[1];
+} scm_stack_t;
+
+#if (SCM_DEBUG_DEPRECATED == 0)
+# define scm_info_frame scm_info_frame_t
+# define scm_stack scm_stack_t
+#endif
 
 extern SCM scm_stack_type;
 
-#define SCM_STACKP(obj) (SCM_NIMP(obj) && \
-                         SCM_STRUCTP (obj) && SCM_STRUCT_VTABLE (obj) == scm_stack_type)
+#define SCM_STACKP(obj) (SCM_STRUCTP (obj) && SCM_EQ_P (SCM_STRUCT_VTABLE (obj), scm_stack_type))
 #define SCM_STACK_LENGTH(stack) (SCM_STACK (stack) -> length)
 
 #define SCM_FRAMEP(obj) (SCM_CONSP (obj) \
@@ -108,16 +112,16 @@ extern SCM scm_stack_type;
 #define SCM_FRAMEF_EVAL_ARGS   (1L << 5)
 #define SCM_FRAMEF_OVERFLOW    (1L << 6)
 
-#define SCM_FRAME_VOID_P(frame) (SCM_BITS (SCM_FRAME_FLAGS (frame)) & SCM_FRAMEF_VOID)
-#define SCM_FRAME_REAL_P(frame) (SCM_BITS (SCM_FRAME_FLAGS (frame)) & SCM_FRAMEF_REAL)
-#define SCM_FRAME_PROC_P(frame) (SCM_BITS (SCM_FRAME_FLAGS (frame)) & SCM_FRAMEF_PROC)
-#define SCM_FRAME_EVAL_ARGS_P(frame) (SCM_BITS (SCM_FRAME_FLAGS (frame)) & SCM_FRAMEF_EVAL_ARGS)
-#define SCM_FRAME_OVERFLOW_P(frame) (SCM_BITS (SCM_FRAME_FLAGS (frame)) & SCM_FRAMEF_OVERFLOW)
+#define SCM_FRAME_VOID_P(f)       (SCM_FRAME_FLAGS (f) & SCM_FRAMEF_VOID)
+#define SCM_FRAME_REAL_P(f)       (SCM_FRAME_FLAGS (f) & SCM_FRAMEF_REAL)
+#define SCM_FRAME_PROC_P(f)       (SCM_FRAME_FLAGS (f) & SCM_FRAMEF_PROC)
+#define SCM_FRAME_EVAL_ARGS_P(f)  (SCM_FRAME_FLAGS (f) & SCM_FRAMEF_EVAL_ARGS)
+#define SCM_FRAME_OVERFLOW_P(f)   (SCM_FRAME_FLAGS (f) & SCM_FRAMEF_OVERFLOW)
 
 \f
 
 SCM scm_stack_p (SCM obj);
-SCM scm_make_stack (SCM args);
+SCM scm_make_stack (SCM obj, SCM args);
 SCM scm_stack_id (SCM stack);
 SCM scm_stack_ref (SCM stack, SCM i);
 SCM scm_stack_length (SCM stack);
@@ -139,3 +143,9 @@ SCM scm_frame_overflow_p (SCM frame);
 void scm_init_stacks (void);
 
 #endif /* STACKSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/