Multi-line, indented printing of structure.

* eval.c (op_error): New static function.
(macro_form_p, fboundp): Static to external.
(special_operator_p): New function.
(eval_init): Register macrolet and symacrolet to op_error.
These are recognized and processed by expand, but we want
them in the op table so they are reported by special_operator_p.

* eval.h (fboundp, macro_form_p, special_operator_p): Declared.

* hash.c (print_key_val): Break long lines on spaces
between pairs with stream_width_check.
(hash_print_op): Implement split and indented printing.

* lib.c (obj_print_impl): New static function, resulting
from a merge of obj_print and obj_pprint. Fixes some
wrong-way recursion bugs: obj_pprint recursed into obj_print
in some places. Adds support for multi-line printing of
vectors and lists, with indentation using the new
interfaces in streams.

* stream.c (strm_base_init): Update initializer.
(put_indent, indent_mode_put_string): New static functions.
(put_string): Use indent_mode_put_string in either of the
two indent modes.
(put_char): Implement indent mode.
(get_indent_mode, test_set_indent_mode,
set_indent_mode, get_indent, set_indent,
inc_indent, width_check): New functions.

* stream.h (enum indent_mode): New.
(struct strm_base): indent_on member becomes indent_mode.
New members data_width and code_width.
(get_indent_mode, test_set_indent_mode,
set_indent_mode, get_indent, set_indent,
inc_indent, width_check): Declared.

* tests/009/json.expected: Updated.

* tests/010/seq.expected: Likewise.

* tests/011/macros-2.expected: Likewise.

1 files changed, 16 insertions, 4 deletions

diff --git a/eval.c b/eval.c
index d3605da8..652d198a 100644
--- a/eval.c
+++ b/eval.c
@@ -1109,6 +1109,12 @@ static val eval_prog1(val forms, val env, val ctx_form)
   return retval;
 }
 
+static val op_error(val form, val env)
+{
+  eval_error(form, lit("unexpanded ~s encountered"), car(form), nao);
+  abort();
+}
+
 static val op_quote(val form, val env)
 {
   val d = cdr(form);
@@ -2685,8 +2691,6 @@ static val me_tc(val form, val menv)
               cons(tree_case_s, cons(args, cases)), nao);
 }
 
-static val macro_form_p(val form, val menv);
-
 static val me_opip(val form, val menv)
 {
   val opsym = pop(&form);
@@ -3189,7 +3193,7 @@ val expand(val form, val menv)
   return ret;
 }
 
-static val macro_form_p(val form, val menv)
+val macro_form_p(val form, val menv)
 {
   menv = default_bool_arg(menv);
 
@@ -3421,12 +3425,17 @@ static val boundp(val sym)
   return if2(lookup_var(nil, sym) || lookup_symac(nil, sym), t);
 }
 
-static val fboundp(val sym)
+val fboundp(val sym)
 {
   return if2(lookup_fun(nil, sym) || lookup_mac(nil, sym) ||
              gethash(op_table, sym), t);
 }
 
+val special_operator_p(val sym)
+{
+  return if2(gethash(op_table, sym), t);
+}
+
 static val makunbound(val sym)
 {
   lisplib_try_load(sym),
@@ -4012,6 +4021,9 @@ void eval_init(void)
   sys_load_s = intern(lit("load"), system_package);
   sys_lisp1_value_s = intern(lit("lisp1-value"), system_package);
 
+  with_saved_vars_s = intern(lit("with-saved-vars"), system_package);
+  reg_op(macrolet_s, op_error);
+  reg_op(symacrolet_s, op_error);
   reg_op(quote_s, op_quote);
   reg_op(qquote_s, op_qquote_error);
   reg_op(sys_qquote_s, op_qquote_error);