From 566de7d4516c8c0d161a95dafcbb530601306538 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Tue, 16 Apr 2019 18:36:56 -0700 Subject: streams: force-off indent mode. The fourth indent mode indent-foff (force off) is introduced. * buf.c (buf_print): Turn on data mode indentation if the current mode is not indent-foff, rather than when it is indent-off. * lib.c (obj_print_impl): The unconditional set_indent_mode calls are replaced with test_neq_set_indent_mode so we only set the mode if it is not forced off. * stream.c (formatv): For the ! directive, turn on data mode identation is not indent-foff, rather than when it is indent-off. (put_string, put_char, width_check): Recognize ident-foff as indentation off. (test_neq_set_indent_mode): New function. (stream_init): Register test-neq-set-indent-mode function and indent-foff variable. * stream.h (indent_mode): New enum constant, indent_foff. (test_neq_set_indent_mode): Declared. * struct.c (struct_inst_print): Turn on data mode indentation if the current mode is not indent-foff, rather than when it is indent-off. * txr.1: Documented. --- struct.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'struct.c') diff --git a/struct.c b/struct.c index 6de9044f..494ae025 100644 --- a/struct.c +++ b/struct.c @@ -1445,8 +1445,8 @@ static void struct_inst_print(val obj, val out, val pretty, { struct struct_inst *si = coerce(struct struct_inst *, obj->co.handle); struct struct_type *st = si->type; - val save_mode = test_set_indent_mode(out, num_fast(indent_off), - num_fast(indent_data)); + val save_mode = test_neq_set_indent_mode(out, num_fast(indent_foff), + num_fast(indent_data)); val save_indent, iter, once; int force_br = 0; int compat = opt_compat && opt_compat <= 154; -- cgit v1.2.3