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 7d018c8..b86d87a 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, 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
@@ -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,10 @@
  * 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 */
+
+/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
+   gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
 \f
 
 #include "libguile/__scm.h"
@@ -52,31 +55,36 @@
 /* {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_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) \
-                        && SCM_NIMP (SCM_CAR (obj)) \
                         && SCM_STACKP (SCM_CAR (obj)) \
                         && SCM_INUMP (SCM_CDR (obj))) \
 
@@ -104,32 +112,40 @@ 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_FRAME_FLAGS (frame) & SCM_FRAMEF_VOID)
-#define SCM_FRAME_REAL_P(frame) (SCM_FRAME_FLAGS (frame) & SCM_FRAMEF_REAL)
-#define SCM_FRAME_PROC_P(frame) (SCM_FRAME_FLAGS (frame) & SCM_FRAMEF_PROC)
-#define SCM_FRAME_EVAL_ARGS_P(frame) (SCM_FRAME_FLAGS (frame) & SCM_FRAMEF_EVAL_ARGS)
-#define SCM_FRAME_OVERFLOW_P(frame) (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_P ((SCM obj));
-SCM scm_make_stack SCM_P ((SCM obj, SCM outer_cut, SCM inner_cut));
-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));
-SCM scm_frame_procedure SCM_P ((SCM frame));
-SCM scm_frame_arguments SCM_P ((SCM frame));
-SCM scm_frame_previous SCM_P ((SCM frame));
-SCM scm_frame_next SCM_P ((SCM frame));
-SCM scm_frame_real_p SCM_P ((SCM frame));
-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));
+SCM scm_stack_p (SCM obj);
+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);
+
+SCM scm_frame_p (SCM obj);
+SCM scm_last_stack_frame (SCM obj);
+SCM scm_frame_number (SCM frame);
+SCM scm_frame_source (SCM frame);
+SCM scm_frame_procedure (SCM frame);
+SCM scm_frame_arguments (SCM frame);
+SCM scm_frame_previous (SCM frame);
+SCM scm_frame_next (SCM frame);
+SCM scm_frame_real_p (SCM frame);
+SCM scm_frame_procedure_p (SCM frame);
+SCM scm_frame_evaluating_args_p (SCM frame);
+SCM scm_frame_overflow_p (SCM frame);
+
+
+void scm_init_stacks (void);
 
 #endif /* STACKSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/