* .cvsignore: add autom4te.cache and *.c.clean.c.

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

diff --git a/libguile/print.h b/libguile/print.h
index fa3d009..9ac0916 100644 (file)
--- a/libguile/print.h
+++ b/libguile/print.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef PRINTH
-#define PRINTH
-/*     Copyright (C) 1995,1996,1998 Free Software Foundation, Inc.
- * 
+#ifndef SCM_PRINT_H
+#define SCM_PRINT_H
+
+/* Copyright (C) 1995,1996,1998,2000,2001 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
  * the Free Software Foundation; either version 2, or (at your option)
  * any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * 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, Inc., 59 Temple Place, Suite 330,
@@ -43,25 +44,23 @@
  * whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.  */
 
-/* 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"
 
 #include "libguile/options.h"
 \f
-extern scm_option scm_print_opts[];
+SCM_API scm_t_option scm_print_opts[];
 
-#define SCM_PRINT_CLOSURE      ((SCM) scm_print_opts[0].val)
+#define SCM_PRINT_CLOSURE      (SCM_PACK (scm_print_opts[0].val))
 #define SCM_PRINT_SOURCE_P     ((int) scm_print_opts[1].val)
 #define SCM_N_PRINT_OPTIONS 2
 
 /* State information passed around during printing.
  */
 #define SCM_PRINT_STATE_P(obj) (SCM_STRUCTP(obj) \
-                               && (SCM_STRUCT_VTABLE(obj) \
-                                   == scm_print_state_vtable))
+                               && (SCM_EQ_P (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) \
@@ -73,13 +72,12 @@ do { \
 #define SCM_WRITINGP(pstate) ((pstate)->writingp)
 #define SCM_SET_WRITINGP(pstate, x) { (pstate)->writingp = (x); }
 
-#define SCM_PORT_WITH_PS_P(p) (SCM_NIMP(p) && (SCM_TYP16 (p) == scm_tc16_port_with_ps))
-#define SCM_PORT_WITH_PS_PORT(p) SCM_CADR (p)
-#define SCM_PORT_WITH_PS_PS(p) SCM_CDDR (p)
+#define SCM_PORT_WITH_PS_P(p)    SCM_TYP16_PREDICATE (scm_tc16_port_with_ps, p)
+#define SCM_PORT_WITH_PS_PORT(p) SCM_CAR (SCM_CELL_OBJECT_1 (p))
+#define SCM_PORT_WITH_PS_PS(p)   SCM_CDR (SCM_CELL_OBJECT_1 (p))
 
-#define SCM_COERCE_OUTPORT(p) (SCM_NIMP (p) && SCM_PORT_WITH_PS_P (p) \
-                              ? SCM_PORT_WITH_PS_PORT (p) \
-                              : p)
+#define SCM_COERCE_OUTPORT(p) \
+  (SCM_PORT_WITH_PS_P (p) ? SCM_PORT_WITH_PS_PORT (p) : p)
 
 #define SCM_PRINT_STATE_LAYOUT "sruwuwuwuwuwpwuwuwuruopr"
 typedef struct scm_print_state {
@@ -98,35 +96,35 @@ typedef struct scm_print_state {
   SCM ref_vect;
 } scm_print_state;
 
-extern SCM scm_print_state_vtable;
-
-/* ? scm or long?  print.h and print.c disagree */
-extern long scm_tc16_port_with_ps;
-
-extern SCM scm_print_options (SCM setting);
-SCM scm_make_print_state (void);
-void scm_free_print_state (SCM print_state);
-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, int tlr, SCM port, scm_print_state *pstate);
-extern void scm_prin1 (SCM exp, SCM port, int writingp);
-extern void scm_iprin1 (SCM exp, SCM port, scm_print_state *pstate);
-extern SCM scm_write (SCM obj, SCM port);
-extern SCM scm_display (SCM obj, SCM port);
-extern SCM scm_simple_format (SCM port, SCM message, SCM args);
-extern SCM scm_newline (SCM port);
-extern SCM scm_write_char (SCM chr, SCM port);
-extern SCM scm_printer_apply (SCM proc, SCM exp, SCM port,
-                              scm_print_state *);
-extern SCM scm_port_with_print_state (SCM port, SCM pstate);
-extern SCM scm_get_print_state (SCM port);
-extern int scm_valid_oport_value_p (SCM val);
-extern void scm_init_print (void);
+SCM_API SCM scm_print_state_vtable;
+
+SCM_API scm_t_bits scm_tc16_port_with_ps;
+
+SCM_API SCM scm_print_options (SCM setting);
+SCM_API SCM scm_make_print_state (void);
+SCM_API void scm_free_print_state (SCM print_state);
+SCM_API void scm_intprint (long n, int radix, SCM port);
+SCM_API void scm_ipruk (char *hdr, SCM ptr, SCM port);
+SCM_API void scm_iprlist (char *hdr, SCM exp, int tlr, SCM port, scm_print_state *pstate);
+SCM_API void scm_print_symbol_name (const char *str, size_t len, SCM port);
+SCM_API void scm_prin1 (SCM exp, SCM port, int writingp);
+SCM_API void scm_iprin1 (SCM exp, SCM port, scm_print_state *pstate);
+SCM_API SCM scm_write (SCM obj, SCM port);
+SCM_API SCM scm_display (SCM obj, SCM port);
+SCM_API SCM scm_simple_format (SCM port, SCM message, SCM args);
+SCM_API SCM scm_newline (SCM port);
+SCM_API SCM scm_write_char (SCM chr, SCM port);
+SCM_API SCM scm_printer_apply (SCM proc, SCM exp, SCM port, scm_print_state *);
+SCM_API SCM scm_port_with_print_state (SCM port, SCM pstate);
+SCM_API SCM scm_get_print_state (SCM port);
+SCM_API int scm_valid_oport_value_p (SCM val);
+SCM_API void scm_init_print (void);
 
 #ifdef GUILE_DEBUG
-extern SCM scm_current_pstate (void);
+SCM_API SCM scm_current_pstate (void);
 #endif 
-#endif  /* PRINTH */
+
+#endif  /* SCM_PRINT_H */
 
 /*
   Local Variables: