Add stream printing context.

This is some infrastructure which will support *print-circle*.

* lib.h (struct strm_ctx): Forward declared.
(struct cobj_ops): Add context parameter to print function
pointer.
(cobj_print_op, obj_print_impl): Add context parameter to
declarations.

* hash.c (hash_print_op): Take context argument and
pass it down in obj_print_impl calls.

* lib.c (cobj_print_op, out_quasi_str): Likewise
(obj_print_impl): Likewise, and also pass to
COBJ print method.
(obj_print, obj_pprint): Pass null pointer
as context argument to obj_print_impl.

* regex.c (regex_print): Take context parameter and ignore it.

* socket.c (dgram_print): Likewise.

* stream.h (struct strm_ctx): New struct type.
(struct strm_base): New ctx member, pointer to struct
strm_ctx.
(stream_print_op): Add context parameter to declaration.
(get_set_ctx, get_ctx): Declared.

* stream.c (strm_base_init): Add null pointer to initializer.
(strm_base_cleanup): Add assertion against context pointer
being non-null: that indicates that some stream operation
installed a context pointer and neglected to restore it to
null before returning, which is bad because context will be
stack allocated.
(stream_print_op, stdio_stream_print, cat_stream_print): Take
context parameter and ignore it.
(get_set_ctx, get_ctx): New functions.

* struct.c (struct_type_print): Take context parameter and
ignore it.
(struct_inst_print): Take context parameter and pass
down to obj_print_impl.

1 files changed, 6 insertions, 6 deletions

diff --git a/hash.c b/hash.c
index b98ac2ff..cd49db16 100644
--- a/hash.c
+++ b/hash.c
@@ -374,7 +374,7 @@ static cnum hash_hash_op(val obj, int *count)
   return out;
 }
 
-static void hash_print_op(val hash, val out, val pretty)
+static void hash_print_op(val hash, val out, val pretty, struct strm_ctx *ctx)
 {
   struct hash *h = coerce(struct hash *, hash->co.handle);
   int need_space = 0;
@@ -398,13 +398,13 @@ static void hash_print_op(val hash, val out, val pretty)
     need_space = 1;
     switch (h->flags) {
     case hash_weak_both:
-      obj_print_impl(weak_keys_k, out, pretty);
+      obj_print_impl(weak_keys_k, out, pretty, ctx);
       /* fallthrough */
     case hash_weak_vals:
-      obj_print_impl(weak_vals_k, out, pretty);
+      obj_print_impl(weak_vals_k, out, pretty, ctx);
       break;
     case hash_weak_keys:
-      obj_print_impl(weak_keys_k, out, pretty);
+      obj_print_impl(weak_keys_k, out, pretty, ctx);
       break;
     default:
       break;
@@ -413,9 +413,9 @@ static void hash_print_op(val hash, val out, val pretty)
   if (h->userdata) {
     if (need_space)
       put_char(chr(' '), out);
-    obj_print_impl(userdata_k, out, pretty);
+    obj_print_impl(userdata_k, out, pretty, ctx);
     put_char(chr(' '), out);
-    obj_print_impl(h->userdata, out, pretty);
+    obj_print_impl(h->userdata, out, pretty, ctx);
   }
   put_string(lit(")"), out);
   maphash(curry_123_23(func_n3(print_key_val), out), hash);