From a448d7d53f2f73c78d004667a90bf4bbd5d96aa8 Mon Sep 17 00:00:00 2001 From: Peter Bex Date: Tue, 18 Jul 2017 21:50:04 +0200 Subject: [PATCH 2/2] Rename with-error-to-* to with-error-output-to-* --- port.scm | 10 +++++----- types.db | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/port.scm b/port.scm index c61a046b..5d58e64a 100644 --- a/port.scm +++ b/port.scm @@ -49,12 +49,12 @@ make-broadcast-port make-concatenated-port set-buffering-mode! - with-error-to-port + with-error-output-to-port with-input-from-port with-input-from-string with-output-to-port with-output-to-string - with-error-to-string) + with-error-output-to-string) (import scheme chicken) (import chicken.foreign @@ -218,8 +218,8 @@ (fluid-let ((##sys#standard-output port)) (thunk) ) ) -(define (with-error-to-port port thunk) - (##sys#check-output-port port #t 'with-error-to-port) +(define (with-error-output-to-port port thunk) + (##sys#check-output-port port #t 'with-error-output-to-port) (fluid-let ((##sys#standard-error port)) (thunk) ) ) @@ -247,7 +247,7 @@ (thunk) (get-output-string ##sys#standard-output) ) ) ) -(define with-error-to-string +(define with-error-output-to-string (lambda (thunk) (fluid-let ((##sys#standard-error (open-output-string))) (thunk) diff --git a/types.db b/types.db index 9f6d4015..2b2fb1cc 100644 --- a/types.db +++ b/types.db @@ -1864,12 +1864,12 @@ (chicken.port#make-broadcast-port (#(procedure #:clean #:enforce) chicken.port#make-broadcast-port (#!rest output-port) output-port)) (chicken.port#make-concatenated-port (#(procedure #:clean #:enforce) chicken.port#make-concatenated-port (port #!rest input-port) input-port)) (chicken.port#set-buffering-mode! (#(procedure #:clean #:enforce) chicken.port#set-buffering-mode! (port symbol #!optional fixnum) undefined)) -(chicken.port#with-error-to-port (#(procedure #:enforce) chicken.port#with-error-to-port (output-port (procedure () . *)) . *)) +(chicken.port#with-error-output-to-port (#(procedure #:enforce) chicken.port#with-error-output-to-port (output-port (procedure () . *)) . *)) (chicken.port#with-input-from-port (#(procedure #:enforce) chicken.port#with-input-from-port (input-port (procedure () . *)) . *)) (chicken.port#with-input-from-string (#(procedure #:enforce) chicken.port#with-input-from-string (string (procedure () . *)) . *)) (chicken.port#with-output-to-port (#(procedure #:enforce) chicken.port#with-output-to-port (output-port (procedure () . *)) . *)) (chicken.port#with-output-to-string (#(procedure #:enforce) chicken.port#with-output-to-string ((procedure () . *)) string)) -(chicken.port#with-error-to-string (#(procedure #:enforce) chicken.port#with-error-to-string ((procedure () . *)) string)) +(chicken.port#with-error-output-to-string (#(procedure #:enforce) chicken.port#with-error-output-to-string ((procedure () . *)) string)) ;; errno -- 2.11.0