* ports.h, ports.c (scm_unread_string): New procedure.

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

diff --git a/libguile/print.h b/libguile/print.h
index d16d4f6..149d976 100644 (file)
--- a/libguile/print.h
+++ b/libguile/print.h
@@ -2,7 +2,7 @@
 
 #ifndef PRINTH
 #define PRINTH
-/*     Copyright (C) 1995,1996 Free Software Foundation, Inc.
+/*     Copyright (C) 1995,1996,1998 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
@@ -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.
@@ -40,8 +41,7 @@
  *
  * If you write modifications of your own for GUILE, it is your choice
  * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.  
- */
+ * If you do not wish that, delete this exception notice.  */
 \f
 
 #include "libguile/__scm.h"
@@ -56,6 +56,9 @@ extern scm_option scm_print_opts[];
 
 /* State information passed around during printing.
  */
+#define SCM_PRINT_STATE_P(obj) (SCM_STRUCTP(obj) \
+                               && (SCM_STRUCT_VTABLE(obj) \
+                                   == scm_print_state_vtable))
 #define SCM_PRINT_STATE(obj) ((scm_print_state *) SCM_STRUCT_DATA (obj))
 
 #define RESET_PRINT_STATE(pstate) \
@@ -67,9 +70,16 @@ extern scm_option scm_print_opts[];
 #define SCM_WRITINGP(pstate) ((pstate)->writingp)
 #define SCM_SET_WRITINGP(pstate, x) { (pstate)->writingp = (x); }
 
-#define SCM_PRINT_STATE_LAYOUT "sruwuwuwuwpwuwuwuruopr"
+#define SCM_COERCE_OUTPORT(p) ((SCM_NIMP (p) \
+                               && SCM_CONSP (p) \
+                               && SCM_PRINT_STATE_P (SCM_CDR (p))) \
+                              ? SCM_CAR (p) \
+                              : p)
+
+#define SCM_PRINT_STATE_LAYOUT "sruwuwuwuwuwpwuwuwuruopr"
 typedef struct scm_print_state {
   SCM handle;                  /* Struct handle */
+  int revealed;                 /* Has the state escaped to Scheme? */
   unsigned long writingp;      /* Writing? */
   unsigned long fancyp;                /* Fancy printing? */
   unsigned long level;         /* Max level */
@@ -83,6 +93,8 @@ typedef struct scm_print_state {
   SCM ref_vect;
 } scm_print_state;
 
+extern SCM scm_print_state_vtable;
+
 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));
@@ -95,6 +107,12 @@ 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 SCM scm_printer_apply SCM_P ((SCM proc, SCM exp, SCM port,
+                                    scm_print_state *));
+extern int scm_valid_oport_value_p SCM_P ((SCM val));
 extern void scm_init_print SCM_P ((void));
 
+#ifdef GUILE_DEBUG
+extern SCM scm_current_pstate SCM_P ((void));
+#endif 
 #endif  /* PRINTH */