Import Upstream version 3a1upstream/3a1

1 files changed, 32 insertions, 15 deletions

diff --git a/macscheme.init b/macscheme.init
index 72d9259..152d456 100644
--- a/macscheme.init
+++ b/macscheme.init
@@ -7,45 +7,37 @@
 
 ;;; (software-type) should be set to the generic operating system type.
 ;;; UNIX, VMS, MACOS, AMIGA and MS-DOS are supported.
-
 (define (software-type) 'MACOS)
 
 ;;; (scheme-implementation-type) should return the name of the scheme
 ;;; implementation loading this file.
-
 (define (scheme-implementation-type) 'MacScheme)
 
 ;;; (scheme-implementation-home-page) should return a (string) URI
 ;;; (Uniform Resource Identifier) for this scheme implementation's home
 ;;; page; or false if there isn't one.
-
 (define (scheme-implementation-home-page) #f)
 
 ;;; (scheme-implementation-version) should return a string describing
 ;;; the version the scheme implementation loading this file.
-
 (define (scheme-implementation-version) "4.2")
 
 ;;; (implementation-vicinity) should be defined to be the pathname of
 ;;; the directory where any auxillary files to your Scheme
 ;;; implementation reside.
-
 (define (implementation-vicinity) "Macintosh.HD:MacScheme 4.2:")
 
 ;;; (library-vicinity) should be defined to be the pathname of the
 ;;; directory where files of Scheme library functions reside.
-
 (define (library-vicinity) "Macintosh.HD:MacScheme 4.2:slib:")
 
 ;;; (home-vicinity) should return the vicinity of the user's HOME
 ;;; directory, the directory which typically contains files which
 ;;; customize a computer environment for a user.
-
 (define (home-vicinity) #f)
 
 ;;; *FEATURES* should be set to a list of symbols describing features
 ;;; of this implementation.  Suggestions for features are:
-
 (define *features*
       '(
 	source				;can load scheme source files
@@ -55,7 +47,7 @@
 
 		       ;; Scheme report features
 
-;	rev5-report			;conforms to
+;	r5rs				;conforms to
 ;	eval				;R5RS two-argument eval
 ;	values				;R5RS multiple values
 ;	dynamic-wind			;R5RS dynamic-wind
@@ -69,11 +61,11 @@
 					;STRING-FILL!, LIST->VECTOR,
 					;VECTOR->LIST, and VECTOR-FILL!
 
-	rev4-report			;conforms to
+	r4rs				;conforms to
 
 	ieee-p1178			;conforms to
 
-	rev3-report			;conforms to
+	r3rs				;conforms to
 
 ;	rev2-procedures			;SUBSTRING-MOVE-LEFT!,
 					;SUBSTRING-MOVE-RIGHT!,
@@ -84,7 +76,7 @@
 
 	multiarg/and-			;/ and - can take more than 2 args.
 	with-file			;has WITH-INPUT-FROM-FILE and
-					;WITH-OUTPUT-FROM-FILE
+					;WITH-OUTPUT-TO-FILE
 ;	transcript			;TRANSCRIPT-ON and TRANSCRIPT-OFF
 	ieee-floating-point		;conforms to IEEE Standard 754-1985
 					;IEEE Standard for Binary
@@ -158,6 +150,33 @@
     (close-input-port insp)
     res))
 
+(define (make-exchanger obj)
+  (lambda (rep) (let ((old obj)) (set! obj rep) old)))
+(define (open-file filename modes)
+  (case modes
+    ((r rb) (open-input-file filename))
+    ((w wb) (open-output-file filename))
+    (else (slib:error 'open-file 'mode? modes))))
+(define (port? obj) (or (input-port? port) (output-port? port)))
+(define (call-with-open-ports . ports)
+  (define proc (car ports))
+  (cond ((procedure? proc) (set! ports (cdr ports)))
+	(else (set! ports (reverse ports))
+	      (set! proc (car ports))
+	      (set! ports (reverse (cdr ports)))))
+  (let ((ans (apply proc ports)))
+    (for-each close-port ports)
+    ans))
+(define (close-port port)
+  (cond ((input-port? port)
+	 (close-input-port port)
+	 (if (output-port? port) (close-output-port port)))
+	((output-port? port) (close-output-port port))
+	(else (slib:error 'close-port 'port? port))))
+
+(define (browse-url url)
+  (slib:warn "define BROWSE-URL in macscheme.init"))
+
 ;;; "rationalize" adjunct procedures.
 (define (find-ratio x e)
   (let ((rat (rationalize x e)))
@@ -236,7 +255,7 @@
     (let ((cep (current-error-port)))
       (if (provided? 'trace) (print-call-stack cep))
       (display "Warn: " cep)
-      (for-each (lambda (x) (display x cep)) args))))
+      (for-each (lambda (x) (display #\  cep) (write x cep)) args))))
 
 ;;; define an error procedure for the library
 (define slib:error
@@ -279,11 +298,9 @@
 ;;; (SLIB:LOAD-COMPILED "foo") should load the file that was produced
 ;;; by compiling "foo.scm" if this implementation can compile files.
 ;;; See feature 'COMPILED.
-
 (define slib:load-compiled load)
 
 ;;; At this point SLIB:LOAD must be able to load SLIB files.
-
 (define slib:load slib:load-source)
 
 (slib:load (in-vicinity (library-vicinity) "require"))