* Makefile.am (libguile_la_SOURCES): Remove backtrace.c, debug.c,

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

diff --git a/libguile/print.h b/libguile/print.h
index 5660fc1..d16d4f6 100644 (file)
--- a/libguile/print.h
+++ b/libguile/print.h
@@ -44,39 +44,57 @@
  */
 \f
 
-#include "__scm.h"
+#include "libguile/__scm.h"
 
+#include "libguile/options.h"
 \f
 extern scm_option scm_print_opts[];
 
-#define SCM_PRINT_PROCNAMES_P  ((int) scm_print_opts[0].val)
-#define SCM_PRINT_CLOSURE      ((SCM) scm_print_opts[1].val)
+#define SCM_PRINT_CLOSURE      ((SCM) scm_print_opts[0].val)
+#define SCM_PRINT_SOURCE_P     ((int) scm_print_opts[1].val)
 #define SCM_N_PRINT_OPTIONS 2
 
-#ifdef __STDC__
-extern SCM scm_print_options (SCM setting);
-extern void scm_intprint (long n, int radix, SCM port);
-extern void scm_ipruk (char *hdr, SCM ptr, SCM port);
-extern void scm_iprlist (char *hdr, SCM exp, char tlr, SCM port, int writing);
-extern void scm_iprin1 (SCM exp, SCM port, int writing);
-extern SCM scm_write (SCM obj, SCM port);
-extern SCM scm_display (SCM obj, SCM port);
-extern SCM scm_newline(SCM port);
-extern SCM scm_write_char (SCM chr, SCM port);
-extern void scm_init_print (void);
+/* State information passed around during printing.
+ */
+#define SCM_PRINT_STATE(obj) ((scm_print_state *) SCM_STRUCT_DATA (obj))
+
+#define RESET_PRINT_STATE(pstate) \
+{ \
+  pstate->list_offset = 0; \
+  pstate->top = 0; \
+}
+
+#define SCM_WRITINGP(pstate) ((pstate)->writingp)
+#define SCM_SET_WRITINGP(pstate, x) { (pstate)->writingp = (x); }
 
-#else /* STDC */
-extern SCM scm_print_options ();
-extern void scm_intprint ();
-extern void scm_ipruk ();
-extern void scm_iprlist ();
-extern void scm_iprin1 ();
-extern SCM scm_write ();
-extern SCM scm_display ();
-extern SCM scm_newline();
-extern SCM scm_write_char ();
-extern void scm_init_print ();
+#define SCM_PRINT_STATE_LAYOUT "sruwuwuwuwpwuwuwuruopr"
+typedef struct scm_print_state {
+  SCM handle;                  /* Struct handle */
+  unsigned long writingp;      /* Writing? */
+  unsigned long fancyp;                /* Fancy printing? */
+  unsigned long level;         /* Max level */
+  unsigned long length;                /* Max number of objects per level */
+  SCM hot_ref;                 /* Hot reference */
+  unsigned long list_offset;
+  unsigned long top;           /* Top of reference stack */
+  unsigned long ceiling;       /* Max size of reference stack */
+  SCM *ref_stack;              /* Stack of references used during
+                                  circular reference detection */
+  SCM ref_vect;
+} scm_print_state;
 
-#endif /* STDC */
+extern SCM scm_print_options SCM_P ((SCM setting));
+SCM scm_make_print_state SCM_P ((void));
+void scm_free_print_state SCM_P ((SCM print_state));
+extern void scm_intprint SCM_P ((long n, int radix, SCM port));
+extern void scm_ipruk SCM_P ((char *hdr, SCM ptr, SCM port));
+extern void scm_iprlist SCM_P ((char *hdr, SCM exp, int tlr, SCM port, scm_print_state *pstate));
+extern void scm_prin1 SCM_P ((SCM exp, SCM port, int writingp));
+extern void scm_iprin1 SCM_P ((SCM exp, SCM port, scm_print_state *pstate));
+extern SCM scm_write SCM_P ((SCM obj, SCM port));
+extern SCM scm_display SCM_P ((SCM obj, SCM port));
+extern SCM scm_newline SCM_P ((SCM port));
+extern SCM scm_write_char SCM_P ((SCM chr, SCM port));
+extern void scm_init_print SCM_P ((void));
 
 #endif  /* PRINTH */