Remove double indirection in array-map! with <2 args

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

diff --git a/libguile/print.h b/libguile/print.h
index b4e8292..4c60b52 100644 (file)
--- a/libguile/print.h
+++ b/libguile/print.h
@@ -3,40 +3,38 @@
 #ifndef SCM_PRINT_H
 #define SCM_PRINT_H
 
-/* Copyright (C) 1995,1996,1998,2000,2001, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1998, 2000, 2001, 2003, 2004, 2006, 2008,
+ *   2010, 2012 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3 of
+ * the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library 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
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
  */
 
 \f
 
 #include "libguile/__scm.h"
 
+#include "libguile/chars.h" 
 #include "libguile/options.h"
 \f
-SCM_API scm_t_option scm_print_opts[];
-
-#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_EQ_P (SCM_STRUCT_VTABLE(obj), \
-                                             scm_print_state_vtable)))
+                               && (scm_is_eq (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) \
@@ -55,7 +53,7 @@ do { \
 #define SCM_COERCE_OUTPORT(p) \
   (SCM_PORT_WITH_PS_P (p) ? SCM_PORT_WITH_PS_PORT (p) : p)
 
-#define SCM_PRINT_STATE_LAYOUT "sruwuwuwuwuwpwuwuwuruopr"
+#define SCM_PRINT_STATE_LAYOUT "sruwuwuwuwuwpwuwuwurprpw"
 typedef struct scm_print_state {
   SCM handle;                  /* Struct handle */
   int revealed;                 /* Has the state escaped to Scheme? */
@@ -67,9 +65,10 @@ typedef struct scm_print_state {
   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 ref_vect;                        /* Stack of references used during
+                                  circular reference detection;
+                                  a simple vector. */
+  SCM highlight_objects;        /* List of objects to be highlighted */
 } scm_print_state;
 
 SCM_API SCM scm_print_state_vtable;
@@ -79,10 +78,14 @@ 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 scm_i_port_with_print_state (SCM port, SCM print_state);
-SCM_API void scm_intprint (long n, int radix, SCM port);
+SCM_INTERNAL SCM scm_i_port_with_print_state (SCM port, SCM print_state);
+SCM_INTERNAL void scm_i_display_substring (SCM str, size_t start, size_t end,
+                                          SCM port);
+SCM_API void scm_intprint (scm_t_intmax n, int radix, SCM port);
+SCM_API void scm_uintprint (scm_t_uintmax 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_INTERNAL void scm_i_print_symbol_name (SCM sym, SCM port);
 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);
@@ -95,7 +98,7 @@ 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);
+SCM_INTERNAL void scm_init_print (void);
 
 #ifdef GUILE_DEBUG
 SCM_API SCM scm_current_pstate (void);