Rename and export MAKE-NON-CHANNEL-PORT-{SOURCE,SINK}.

diff --git a/v7/src/runtime/genio.scm b/v7/src/runtime/genio.scm
index 774cddb458cb0513e5f88e084016f9d4ec32a282..72e4fb67c1fbce0c278b7545867f52c34ca3d929 100644 (file)
--- a/v7/src/runtime/genio.scm
+++ b/v7/src/runtime/genio.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: genio.scm,v 1.57 2008/01/30 20:02:31 cph Exp $
+$Id: genio.scm,v 1.58 2008/02/02 01:48:51 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -613,7 +613,7 @@ USA.
                (lambda (string start end)
                  (channel-read channel string start end))))
 
-(define (make-non-channel-source has-input? read-substring)
+(define (make-non-channel-port-source has-input? read-substring)
   (let ((port #f)
        (open? #t))
     (make-gsource (lambda () #f)
@@ -650,7 +650,7 @@ USA.
              (lambda (string start end)
                (channel-write channel string start end))))
 
-(define (make-non-channel-sink write-substring)
+(define (make-non-channel-port-sink write-substring)
   (let ((port #f)
        (open? #t))
     (make-gsink (lambda () #f)

diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index 77392828afaefb04df2fe6a8a7745601181fd6b2..891d25260f7c1bbfd4ce2952fb69be1136d0d34a 100644 (file)
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.pkg,v 14.631 2008/02/02 01:19:13 cph Exp $
+$Id: runtime.pkg,v 14.632 2008/02/02 01:48:52 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -1752,7 +1752,9 @@ USA.
          generic-io/close-output
          generic-io/flush-output
          generic-io/read-char
-         make-generic-i/o-port)
+         make-generic-i/o-port
+         make-non-channel-port-source
+         make-non-channel-port-sink)
   (export (runtime console-i/o-port)
          input-buffer-contents
          make-gstate
@@ -1768,14 +1770,11 @@ USA.
          port-input-buffer
          port-output-buffer)
   (export (runtime string-input)
-         make-gstate
-         make-non-channel-source)
+         make-gstate)
   (export (runtime string-output)
-         make-gstate
-         make-non-channel-sink)
+         make-gstate)
   (export (runtime truncated-string-output)
-         make-gstate
-         make-non-channel-sink)
+         make-gstate)
   (initialization (initialize-package!)))
 
 (define-package (runtime gensym)

diff --git a/v7/src/runtime/strnin.scm b/v7/src/runtime/strnin.scm
index 15e2bd47b62d0fda7645f70c5590d41589b8e040..71ae4f405d6034234018a2064adeab27ec933540 100644 (file)
--- a/v7/src/runtime/strnin.scm
+++ b/v7/src/runtime/strnin.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: strnin.scm,v 14.21 2008/01/30 20:02:35 cph Exp $
+$Id: strnin.scm,v 14.22 2008/02/02 01:48:54 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -58,7 +58,7 @@ USA.
 
 (define (make-string-source string start end)
   (let ((index start))
-    (make-non-channel-source
+    (make-non-channel-port-source
      (lambda ()
        (fix:< index end))
      (lambda (string* start* end*)

diff --git a/v7/src/runtime/strott.scm b/v7/src/runtime/strott.scm
index ad1e12252ee936234d003cd70ea243299e688ece..8e8df4e5652e49c5383aa29c82d406ea3899e549 100644 (file)
--- a/v7/src/runtime/strott.scm
+++ b/v7/src/runtime/strott.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: strott.scm,v 14.18 2008/01/30 20:02:35 cph Exp $
+$Id: strott.scm,v 14.19 2008/02/02 01:48:55 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -112,7 +112,7 @@ USA.
        (set! index 0)
        (k (cons #t s))))
 
-    (values (make-non-channel-sink
+    (values (make-non-channel-port-sink
             (lambda (string start end)
               (without-interrupts
                (lambda ()

diff --git a/v7/src/runtime/strout.scm b/v7/src/runtime/strout.scm
index 9276f831e18b3bd536a61d5dea104860f319a709..89ae4a89454ca0db1f3ad3277909e9f1153dd3ed 100644 (file)
--- a/v7/src/runtime/strout.scm
+++ b/v7/src/runtime/strout.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: strout.scm,v 14.29 2008/01/30 20:02:35 cph Exp $
+$Id: strout.scm,v 14.30 2008/02/02 01:48:56 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -111,7 +111,7 @@ USA.
             n
             (loop (fix:+ n n))))))
 
-    (values (make-non-channel-sink
+    (values (make-non-channel-port-sink
             (lambda (string start end)
               (without-interrupts
                (lambda ()