From b2f0570a86b27683ad51f2fdda0f2ca1f1fc2812 Mon Sep 17 00:00:00 2001
From: mainzelm <mainzelm>
Date: Tue, 19 Nov 2002 12:16:08 +0000
Subject: [PATCH] + when importing scheme, hide the procedures which are about
 to be   overwritten

+ introduce structure scheme-with-scsh which exports the compound
  interface of scheme and scsh. Instead of the fragile (open scsh
  scheme) you can now use (open scheme-with-scsh).

+ removed superfluous partial-s48-ports
---
 scsh/scsh-package.scm | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/scsh/scsh-package.scm b/scsh/scsh-package.scm
index ae43c6d..3ea08f4 100644
--- a/scsh/scsh-package.scm
+++ b/scsh/scsh-package.scm
@@ -113,17 +113,6 @@
 	bitwise)
   (files endian))
 
-(define-structure partial-s48-ports
-  (export current-input-port current-output-port
-	  newline
-	  current-error-port
-
-	  $current-input-port
-	  $current-output-port
-	  $current-error-port
-	  $current-noise-port)
-  (open ports i/o))
-
 ;;; The scsh-level-0 package is for implementation convenience.
 ;;; The scsh startup and top-level modules need access to scsh
 ;;; procedures, but they export procedures that are themselves
@@ -192,7 +181,6 @@
 	ascii
 	records
 	extended-ports
-	partial-s48-ports
 	ports
 	build
 	bigbit
@@ -226,10 +214,16 @@
 	thread-fluids			; For exec-path-list
 	loopholes		; For my bogus CALL-TERMINALLY implementation.
 
-	scheme
-	
+	(modify scheme (hide call-with-input-file
+			     call-with-output-file
+			     with-input-from-file
+			     with-output-to-file
+			     open-input-file
+			     open-output-file))
+			     
 	low-interrupt            ; for sighandler and procobj
-	i/o                  ; all these seem to be for scsh-0.6 JMG
+	;; all these seem to be for scsh-0.6 JMG
+	i/o
 	i/o-internal
 	channels channel-i/o
 	low-channels
@@ -330,7 +324,12 @@
 	low-interrupt
 	sigevents
 	primitives
-	scheme)
+	(modify scheme (hide call-with-input-file
+			     call-with-output-file
+			     with-input-from-file
+			     with-output-to-file
+			     open-input-file
+			     open-output-file)))
   (access threads-internal)
   (files startup))
 
@@ -485,6 +484,17 @@
 ;  (optimize auto-integrate)
   )
 
+(define-structure scheme-with-scsh
+  (compound-interface (interface-of scsh)
+		      (interface-of scheme))
+  (open scsh
+	(modify scheme (hide call-with-input-file
+			     call-with-output-file
+			     with-input-from-file
+			     with-output-to-file
+			     open-input-file
+			     open-output-file))))
+
 (define-structure scsh-here-string-hax (export)
   (open reading
 	receiving