diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-03-08 23:04:06 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-03-08 23:04:06 +0100 |
commit | f307fbcec2cbaaa95b8c861395133b519c7519cf (patch) | |
tree | 8f08599fb60cfdcd98de0f03a465e70e962112bd /libguile/print.c | |
parent | 1eefa363bd7f0db07a907c773c890b78ff6415a9 (diff) | |
parent | 6c59f901499937fe3779ef1f543646754f843679 (diff) | |
download | guile-f307fbcec2cbaaa95b8c861395133b519c7519cf.tar.gz |
Merge branch 'master' into boehm-demers-weiser-gc
Conflicts:
libguile/gc-card.c
libguile/gc-mark.c
Diffstat (limited to 'libguile/print.c')
-rw-r--r-- | libguile/print.c | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/libguile/print.c b/libguile/print.c index 7906200ee..1852cf19a 100644 --- a/libguile/print.c +++ b/libguile/print.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-1999,2000,2001, 2002, 2003, 2004, 2006, 2008 Free Software Foundation, Inc. +/* Copyright (C) 1995-1999,2000,2001, 2002, 2003, 2004, 2006, 2008, 2009 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -671,30 +671,7 @@ iprin1 (SCM exp, SCM port, scm_print_state *pstate) scm_puts (scm_i_symbol_chars (SCM_SNAME (exp)), port); scm_putc ('>', port); break; -#ifdef CCLO - case scm_tc7_cclo: - { - SCM proc = SCM_CCLO_SUBR (exp); - if (scm_is_eq (proc, scm_f_gsubr_apply)) - { - /* Print gsubrs as primitives */ - SCM name = scm_procedure_name (exp); - scm_puts ("#<primitive-procedure", port); - if (scm_is_true (name)) - { - scm_putc (' ', port); - scm_puts (scm_i_symbol_chars (name), port); - } - } - else - { - scm_puts ("#<compiled-closure ", port); - scm_iprin1 (proc, port, pstate); - } - scm_putc ('>', port); - } - break; -#endif + case scm_tc7_pws: scm_puts ("#<procedure-with-setter", port); { |