diff options
author | Andy Wingo <wingo@pobox.com> | 2012-01-10 00:41:42 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-01-10 00:41:42 +0100 |
commit | 91ee7515da0bad91330ce5c87b250d6cf12a2789 (patch) | |
tree | ce023c92c0d9bf895c1265b107b270c35ba59b94 /libguile/print.c | |
parent | 0bdd43515eb3c62839512181cf33e5aea383e661 (diff) | |
parent | 0e947e1d14597651c5762a4209225c472bdaef45 (diff) | |
download | guile-91ee7515da0bad91330ce5c87b250d6cf12a2789.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/__scm.h
libguile/array-map.c
libguile/procprop.c
libguile/tags.h
module/ice-9/deprecated.scm
module/ice-9/psyntax-pp.scm
module/ice-9/psyntax.scm
test-suite/standalone/test-num2integral.c
test-suite/tests/regexp.test
Diffstat (limited to 'libguile/print.c')
-rw-r--r-- | libguile/print.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libguile/print.c b/libguile/print.c index d8dd24c06..a1c36eb94 100644 --- a/libguile/print.c +++ b/libguile/print.c @@ -651,14 +651,20 @@ iprin1 (SCM exp, SCM port, scm_print_state *pstate) case scm_tc7_with_fluids: scm_i_with_fluids_print (exp, port, pstate); break; - case scm_tc7_wvect: + case scm_tc7_array: ENTER_NESTED_DATA (pstate, exp, circref); - scm_puts_unlocked ("#w(", port); - goto common_vector_printer; - + scm_i_print_array (exp, port, pstate); + break; case scm_tc7_bytevector: scm_i_print_bytevector (exp, port, pstate); break; + case scm_tc7_bitvector: + scm_i_print_bitvector (exp, port, pstate); + break; + case scm_tc7_wvect: + ENTER_NESTED_DATA (pstate, exp, circref); + scm_puts_unlocked ("#w(", port); + goto common_vector_printer; case scm_tc7_vector: ENTER_NESTED_DATA (pstate, exp, circref); scm_puts_unlocked ("#(", port); |