From 4550e1ba79c8d991b32ed35f2680e3c18623fa5f Mon Sep 17 00:00:00 2001 From: Lassi Kortela Date: Sun, 25 Aug 2019 12:45:48 +0300 Subject: [PATCH] Rename SCR_WIDTH to print_width --- c/flisp.c | 2 +- c/print.h | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/c/flisp.c b/c/flisp.c index b3bd3da..43ac20b 100644 --- a/c/flisp.c +++ b/c/flisp.c @@ -2622,7 +2622,7 @@ static void lisp_init(size_t initial_heapsize) Fsym = symbol("F"); set(printprettysym = symbol("*print-pretty*"), FL_T); set(printreadablysym = symbol("*print-readably*"), FL_T); - set(printwidthsym = symbol("*print-width*"), fixnum(SCR_WIDTH)); + set(printwidthsym = symbol("*print-width*"), fixnum(print_width)); set(printlengthsym = symbol("*print-length*"), FL_F); set(printlevelsym = symbol("*print-level*"), FL_F); builtins_table_sym = symbol("*builtins*"); diff --git a/c/print.h b/c/print.h index 2d03da8..656d358 100644 --- a/c/print.h +++ b/c/print.h @@ -7,7 +7,7 @@ static int print_princ; static int print_pretty; // *print-width* -- maximum line length when indenting, ignored when not -static int SCR_WIDTH = 80; +static int print_width = 80; // *print-length* -- truncate lists after N items and write "..." static fixnum_t print_length; @@ -48,7 +48,7 @@ static int outindent(int n, struct ios *f) int n0; // move back to left margin if we get too indented - if (n > SCR_WIDTH - 12) + if (n > print_width - 12) n = 2; n0 = n; ios_putc('\n', f); @@ -330,12 +330,12 @@ static void print_pair(struct ios *f, value_t v) est = lengthestimate(car_(cd)); nextsmall = smallp(car_(cd)); thistiny = tinyp(car_(v)); - ind = (((VPOS > lastv) || (HPOS > SCR_WIDTH / 2 && !nextsmall && + ind = (((VPOS > lastv) || (HPOS > print_width / 2 && !nextsmall && !thistiny && n > 0)) || - (HPOS > SCR_WIDTH - 4) || + (HPOS > print_width - 4) || - (est != -1 && (HPOS + est > SCR_WIDTH - 2)) || + (est != -1 && (HPOS + est > print_width - 2)) || ((head == LAMBDA) && !nextsmall) || @@ -487,9 +487,9 @@ void fl_print_child(struct ios *f, value_t v) outc(' ', f); } else { est = lengthestimate(vector_elt(v, i + 1)); - if (HPOS > SCR_WIDTH - 4 || - (est != -1 && (HPOS + est > SCR_WIDTH - 2)) || - (HPOS > SCR_WIDTH / 2 && + if (HPOS > print_width - 4 || + (est != -1 && (HPOS + est > print_width - 2)) || + (HPOS > print_width / 2 && !smallp(vector_elt(v, i + 1)) && !tinyp(vector_elt(v, i)))) newindent = outindent(newindent, f); @@ -862,7 +862,7 @@ static void set_print_width(void) pw = symbol_value(printwidthsym); if (!isfixnum(pw)) return; - SCR_WIDTH = numval(pw); + print_width = numval(pw); } void fl_print(struct ios *f, value_t v)