From 9882ea199196202be10bcf4bfbfea3669efae421 Mon Sep 17 00:00:00 2001 From: Mikael Djurfeldt Date: Sun, 22 Sep 1996 22:41:40 +0000 Subject: [PATCH] * arbiters.c (prinarb), async.c (print_async), debug.c (prindebugobj, prinmemoized), eval.c (prinprom, prinmacro), filesys.c (scm_fd_print, scm_dir_print), kw.c (print_kw), mallocs.c (prinmalloc), numbers.c, numbers.h (scm_floprint, scm_bigprint), smob.h (scm_smobfuns), srcprop.c (prinsrcprops), throw.c (prinjb), unif.c, unif.h (scm_raprin1, rapr1), variable.c (prin_var): Changed argument `int writing' to `scm_print_state *pstate'. --- libguile/arbiters.c | 8 +++---- libguile/async.c | 6 +++--- libguile/debug.c | 19 +++++++++++------ libguile/filesys.c | 12 +++++------ libguile/kw.c | 6 +++--- libguile/mallocs.c | 6 +++--- libguile/throw.c | 6 +++--- libguile/unif.c | 52 ++++++++++++++++++++++----------------------- libguile/variable.c | 10 ++++----- 9 files changed, 65 insertions(+), 60 deletions(-) diff --git a/libguile/arbiters.c b/libguile/arbiters.c index 3088a3537..da7b5dccc 100644 --- a/libguile/arbiters.c +++ b/libguile/arbiters.c @@ -58,19 +58,19 @@ static long scm_tc16_arbiter; #ifdef __STDC__ static int -prinarb (SCM exp, SCM port, int writing) +prinarb (SCM exp, SCM port, scm_print_state *pstate) #else static int -prinarb (exp, port, writing) +prinarb (exp, port, pstate) SCM exp; SCM port; - int writing; + scm_print_state *pstate; #endif { scm_gen_puts (scm_regular_string, "#', port); return !0; } diff --git a/libguile/async.c b/libguile/async.c index 4776f1137..739b4c29b 100644 --- a/libguile/async.c +++ b/libguile/async.c @@ -302,13 +302,13 @@ scm_deliver_signal (num) #ifdef __STDC__ static int -print_async (SCM exp, SCM port, int writing) +print_async (SCM exp, SCM port, scm_print_state *pstate) #else static int -print_async (exp, port, writing) +print_async (exp, port, pstate) SCM exp; SCM port; - int writing; + scm_print_state *pstate; #endif { scm_gen_puts (scm_regular_string, "#', port); return 1; } @@ -379,11 +382,13 @@ long scm_tc16_debugobj; #ifdef __STDC__ static int -prindebugobj (SCM obj, SCM port, int writing) +prindebugobj (SCM obj, SCM port, scm_print_state *pstate) #else static int -prindebugobj (writing) - SCM obj, SCM port, int writing; +prindebugobj (pstate) + SCM obj; + SCM port; + scm_print_state *pstate; #endif { scm_gen_puts (scm_regular_string, "# 0) - scm_iprin1 (ra, port, writing); + scm_iprin1 (ra, port, pstate); for (j += inc; n-- > 0; j += inc) { scm_gen_putc (' ', port); SCM_ARRAY_BASE (ra) = j; - scm_iprin1 (ra, port, writing); + scm_iprin1 (ra, port, pstate); } break; } @@ -2326,14 +2326,14 @@ tail: for (i = SCM_ARRAY_DIMS (ra)[k].lbnd; i < SCM_ARRAY_DIMS (ra)[k].ubnd; i++) { scm_gen_putc ('(', port); - rapr1 (ra, j, k + 1, port, writing); + rapr1 (ra, j, k + 1, port, pstate); scm_gen_puts (scm_regular_string, ") ", port); j += inc; } if (i == SCM_ARRAY_DIMS (ra)[k].ubnd) { /* could be zero size. */ scm_gen_putc ('(', port); - rapr1 (ra, j, k + 1, port, writing); + rapr1 (ra, j, k + 1, port, pstate); scm_gen_putc (')', port); } break; @@ -2350,21 +2350,21 @@ tail: goto tail; default: if (n-- > 0) - scm_iprin1 (scm_uniform_vector_ref (ra, SCM_MAKINUM (j)), port, writing); + scm_iprin1 (scm_uniform_vector_ref (ra, SCM_MAKINUM (j)), port, pstate); for (j += inc; n-- > 0; j += inc) { scm_gen_putc (' ', port); - scm_iprin1 (scm_cvref (ra, j, SCM_UNDEFINED), port, writing); + scm_iprin1 (scm_cvref (ra, j, SCM_UNDEFINED), port, pstate); } break; case scm_tc7_string: if (n-- > 0) - scm_iprin1 (SCM_MAKICHR (SCM_CHARS (ra)[j]), port, writing); - if (writing) + scm_iprin1 (SCM_MAKICHR (SCM_CHARS (ra)[j]), port, pstate); + if (SCM_WRITINGP (pstate)) for (j += inc; n-- > 0; j += inc) { scm_gen_putc (' ', port); - scm_iprin1 (SCM_MAKICHR (SCM_CHARS (ra)[j]), port, writing); + scm_iprin1 (SCM_MAKICHR (SCM_CHARS (ra)[j]), port, pstate); } else for (j += inc; n-- > 0; j += inc) @@ -2408,12 +2408,12 @@ tail: { SCM z = scm_makflo (1.0); SCM_FLO (z) = ((float *) SCM_VELTS (ra))[j]; - scm_floprint (z, port, writing); + scm_floprint (z, port, pstate); for (j += inc; n-- > 0; j += inc) { scm_gen_putc (' ', port); SCM_FLO (z) = ((float *) SCM_VELTS (ra))[j]; - scm_floprint (z, port, writing); + scm_floprint (z, port, pstate); } } break; @@ -2423,12 +2423,12 @@ tail: { SCM z = scm_makdbl (1.0 / 3.0, 0.0); SCM_REAL (z) = ((double *) SCM_VELTS (ra))[j]; - scm_floprint (z, port, writing); + scm_floprint (z, port, pstate); for (j += inc; n-- > 0; j += inc) { scm_gen_putc (' ', port); SCM_REAL (z) = ((double *) SCM_VELTS (ra))[j]; - scm_floprint (z, port, writing); + scm_floprint (z, port, pstate); } } break; @@ -2438,13 +2438,13 @@ tail: SCM cz = scm_makdbl (0.0, 1.0), z = scm_makdbl (1.0 / 3.0, 0.0); SCM_REAL (z) = SCM_REAL (cz) = (((double *) SCM_VELTS (ra))[2 * j]); SCM_IMAG (cz) = ((double *) SCM_VELTS (ra))[2 * j + 1]; - scm_floprint ((0.0 == SCM_IMAG (cz) ? z : cz), port, writing); + scm_floprint ((0.0 == SCM_IMAG (cz) ? z : cz), port, pstate); for (j += inc; n-- > 0; j += inc) { scm_gen_putc (' ', port); SCM_REAL (z) = SCM_REAL (cz) = ((double *) SCM_VELTS (ra))[2 * j]; SCM_IMAG (cz) = ((double *) SCM_VELTS (ra))[2 * j + 1]; - scm_floprint ((0.0 == SCM_IMAG (cz) ? z : cz), port, writing); + scm_floprint ((0.0 == SCM_IMAG (cz) ? z : cz), port, pstate); } } break; @@ -2455,13 +2455,13 @@ tail: #ifdef __STDC__ int -scm_raprin1 (SCM exp, SCM port, int writing) +scm_raprin1 (SCM exp, SCM port, scm_print_state *pstate) #else int -scm_raprin1 (exp, port, writing) +scm_raprin1 (exp, port, pstate) SCM exp; SCM port; - int writing; + scm_print_state *pstate; #endif { SCM v = exp; @@ -2480,7 +2480,7 @@ tail: { scm_gen_puts (scm_regular_string, "', port); return 1; } @@ -2554,7 +2554,7 @@ tail: #endif /*SCM_FLOATS*/ } scm_gen_putc ('(', port); - rapr1 (exp, base, 0, port, writing); + rapr1 (exp, base, 0, port, pstate); scm_gen_putc (')', port); return 1; } @@ -2664,13 +2664,13 @@ scm_init_unif () #ifdef __STDC__ int -scm_raprin1 (SCM exp, SCM port, int writing) +scm_raprin1 (SCM exp, SCM port, scm_print_state *pstate) #else int -scm_raprin1 (exp, port, writing) +scm_raprin1 (exp, port, pstate) SCM exp; SCM port; - int writing; + scm_print_state *pstate; #endif { return 0; diff --git a/libguile/variable.c b/libguile/variable.c index fe70d24f9..f0cb78120 100644 --- a/libguile/variable.c +++ b/libguile/variable.c @@ -62,13 +62,13 @@ free_var (obj) #ifdef __STDC__ static int -prin_var (SCM exp, SCM port, int writing) +prin_var (SCM exp, SCM port, scm_print_state *pstate) #else static int -prin_var (exp, port, writing) +prin_var (exp, port, pstate) SCM exp; SCM port; - int writing; + scm_print_state *pstate; #endif { scm_gen_puts (scm_regular_string, "#', port); return 1;