2002-07-20 Han-Wen <hanwen@cs.uu.nl>

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

diff --git a/libguile/print.c b/libguile/print.c
index 31b12e5..63389f1 100644 (file)
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -62,6 +62,7 @@
 #include "libguile/strings.h"
 #include "libguile/strports.h"
 #include "libguile/vectors.h"
+#include "libguile/lang.h"
 
 #include "libguile/validate.h"
 #include "libguile/print.h"
@@ -74,7 +75,7 @@
 
 char *scm_isymnames[] =
 {
-  /* This table must agree with the declarations */
+  /* This table must agree with the list of SCM_IM_ constants in tags.h */
   "#@and",
   "#@begin",
   "#@case",
@@ -113,17 +114,17 @@ char *scm_isymnames[] =
   /* Multi-language support */
   
   "#@nil-cond",
-  "#@nil-ify",
-  "#@t-ify",
-  "#@0-cond",
-  "#@0-ify",
-  "#@1-ify",
   "#@bind",
   
   "#@delay",
   "#@call-with-values",
 
-  "#<unbound>"
+  "#<unbound>",
+
+  /* Elisp nil value.  This is its Scheme name; whenever it's printed
+     in Elisp, it should appear as the symbol `nil'. */
+
+  "#nil"
 };
 
 scm_t_option scm_print_opts[] = {
@@ -215,7 +216,7 @@ make_print_state (void)
     = scm_make_struct (scm_print_state_vtable, SCM_INUM0, SCM_EOL);
   scm_print_state *pstate = SCM_PRINT_STATE (print_state);
   pstate->ref_vect = scm_c_make_vector (PSTATE_SIZE, SCM_UNDEFINED);
-  pstate->ref_stack = SCM_VELTS (pstate->ref_vect);
+  pstate->ref_stack = SCM_WRITABLE_VELTS (pstate->ref_vect);
   pstate->ceiling = SCM_VECTOR_LENGTH (pstate->ref_vect);
   return print_state;
 }
@@ -249,10 +250,8 @@ scm_free_print_state (SCM print_state)
    */
   pstate->fancyp = 0;
   pstate->revealed = 0;
-  SCM_NEWCELL (handle);
   SCM_DEFER_INTS;
-  SCM_SET_CELL_WORD_0 (handle, print_state);
-  SCM_SET_CELL_WORD_1 (handle, print_state_pool);
+  handle = scm_cons (print_state, print_state_pool);
   print_state_pool = handle;
   SCM_ALLOW_INTS;
 }
@@ -261,23 +260,22 @@ static void
 grow_ref_stack (scm_print_state *pstate)
 {
   unsigned long int old_size = SCM_VECTOR_LENGTH (pstate->ref_vect);
-  SCM *old_elts = SCM_VELTS (pstate->ref_vect);
+  SCM const *old_elts = SCM_VELTS (pstate->ref_vect);
   unsigned long int new_size = 2 * pstate->ceiling;
   SCM new_vect = scm_c_make_vector (new_size, SCM_UNDEFINED);
-  SCM *new_elts = SCM_VELTS (new_vect);
   unsigned long int i;
 
   for (i = 0; i != old_size; ++i)
-    new_elts [i] = old_elts [i];
+    SCM_VECTOR_SET (new_vect, i, old_elts [i]);
 
   pstate->ref_vect = new_vect;
-  pstate->ref_stack = new_elts;
+  pstate->ref_stack = SCM_WRITABLE_VELTS(new_vect);
   pstate->ceiling = new_size;
 }
 
 
 static void
-print_circref (SCM port,scm_print_state *pstate,SCM ref)
+print_circref (SCM port, scm_print_state *pstate, SCM ref)
 {
   register long i;
   long self = pstate->top - 1;
@@ -462,6 +460,7 @@ scm_iprin1 (SCM exp, SCM port, scm_print_state *pstate)
                SCM_NEWSMOB (pwps,
                             scm_tc16_port_with_ps,
                             SCM_UNPACK (scm_cons (port, pstate->handle)));
+               pstate->revealed = 1;
                scm_call_generic_2 (print, exp, pwps);
              }
            else
@@ -527,10 +526,23 @@ scm_iprin1 (SCM exp, SCM port, scm_print_state *pstate)
            scm_lfwrite (SCM_STRING_CHARS (exp), SCM_STRING_LENGTH (exp), port);
          break;
        case scm_tc7_symbol:
-         scm_print_symbol_name (SCM_SYMBOL_CHARS (exp),
-                                SCM_SYMBOL_LENGTH (exp),
-                                port);
-         scm_remember_upto_here_1 (exp);
+         if (SCM_SYMBOL_INTERNED_P (exp))
+           {
+             scm_print_symbol_name (SCM_SYMBOL_CHARS (exp),
+                                    SCM_SYMBOL_LENGTH (exp),
+                                    port);
+             scm_remember_upto_here_1 (exp);
+           }
+         else
+           {
+             scm_puts ("#<uninterned-symbol ", port);
+             scm_print_symbol_name (SCM_SYMBOL_CHARS (exp),
+                                    SCM_SYMBOL_LENGTH (exp),
+                                    port);
+             scm_putc (' ', port);
+             scm_intprint ((long)exp, 16, port);
+             scm_putc ('>', port);
+           }
          break;
        case scm_tc7_variable:
          scm_i_variable_print (exp, port, pstate);
@@ -744,7 +756,7 @@ scm_ipruk (char *hdr, SCM ptr, SCM port)
 /* Print a list.
  */
 void 
-scm_iprlist (char *hdr,SCM exp,int tlr,SCM port,scm_print_state *pstate)
+scm_iprlist (char *hdr, SCM exp, int tlr, SCM port, scm_print_state *pstate)
 {
   register SCM hare, tortoise;
   long floor = pstate->top - 2;
@@ -782,7 +794,7 @@ scm_iprlist (char *hdr,SCM exp,int tlr,SCM port,scm_print_state *pstate)
       /* CHECK_INTS; */
       scm_iprin1 (SCM_CAR (exp), port, pstate);
     }
-  if (!SCM_NULLP (exp))
+  if (!SCM_NULL_OR_NIL_P (exp))
     {
       scm_puts (" . ", port);
       scm_iprin1 (exp, port, pstate);
@@ -823,7 +835,7 @@ fancy_printing:
        scm_iprin1 (SCM_CAR (exp), port, pstate);
       }
   }
-  if (!SCM_NULLP (exp))
+  if (!SCM_NULL_OR_NIL_P (exp))
     {
       scm_puts (" . ", port);
       scm_iprin1 (exp, port, pstate);
@@ -956,6 +968,7 @@ SCM_DEFINE (scm_simple_format, "simple-format", 2, 0, 1,
            start = p + 1;
            continue;
          case '%':
+           scm_lfwrite (start, p - start - 1, destination);
            scm_newline (destination);
            start = p + 1;
            continue;
@@ -991,13 +1004,14 @@ SCM_DEFINE (scm_simple_format, "simple-format", 2, 0, 1,
 
 SCM_DEFINE (scm_newline, "newline", 0, 1, 0, 
             (SCM port),
-           "Send a newline to @var{port}.")
+           "Send a newline to @var{port}.\n"
+           "If @var{port} is omitted, send to the current output port.")
 #define FUNC_NAME s_scm_newline
 {
   if (SCM_UNBNDP (port))
     port = scm_cur_outp;
 
-  SCM_VALIDATE_OPORT_VALUE (1,port);
+  SCM_VALIDATE_OPORT_VALUE (1, port);
 
   scm_putc ('\n', SCM_COERCE_OUTPORT (port));
   return SCM_UNSPECIFIED;
@@ -1012,8 +1026,8 @@ SCM_DEFINE (scm_write_char, "write-char", 1, 1, 0,
   if (SCM_UNBNDP (port))
     port = scm_cur_outp;
 
-  SCM_VALIDATE_CHAR (1,chr);
-  SCM_VALIDATE_OPORT_VALUE (2,port);
+  SCM_VALIDATE_CHAR (1, chr);
+  SCM_VALIDATE_OPORT_VALUE (2, port);
 
   scm_putc ((int) SCM_CHAR (chr), SCM_COERCE_OUTPORT (port));
 #ifdef HAVE_PIPE
@@ -1064,8 +1078,8 @@ SCM_DEFINE (scm_port_with_print_state, "port-with-print-state", 2, 0, 0,
 #define FUNC_NAME s_scm_port_with_print_state
 {
   SCM pwps;
-  SCM_VALIDATE_OPORT_VALUE (1,port);
-  SCM_VALIDATE_PRINTSTATE (2,pstate);
+  SCM_VALIDATE_OPORT_VALUE (1, port);
+  SCM_VALIDATE_PRINTSTATE (2, pstate);
   port = SCM_COERCE_OUTPORT (port);
   SCM_NEWSMOB (pwps, scm_tc16_port_with_ps, SCM_UNPACK (scm_cons (port, pstate)));
   return pwps;
@@ -1108,9 +1122,7 @@ scm_init_print ()
   scm_set_smob_mark (scm_tc16_port_with_ps, scm_markcdr);
   scm_set_smob_print (scm_tc16_port_with_ps, port_with_ps_print);
   
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/print.x"
-#endif
 }
 
 /*