Import Upstream version 3a2upstream/3a2

1 files changed, 107 insertions, 43 deletions

diff --git a/mitscheme.init b/mitscheme.init
index 934de62..9768155 100644
--- a/mitscheme.init
+++ b/mitscheme.init
@@ -19,7 +19,7 @@
 ;;; (Uniform Resource Identifier) for this scheme implementation's home
 ;;; page; or false if there isn't one.
 (define (scheme-implementation-home-page)
-  "http://www.swiss.ai.mit.edu/projects/scheme/")
+  "http://swiss.csail.mit.edu/projects/scheme/")
 
 ;;; (scheme-implementation-version) should return a string describing
 ;;; the version the scheme implementation loading this file.
@@ -66,42 +66,116 @@
 ;;; customize a computer environment for a user.
 (define (home-vicinity)
   (->namestring (user-homedir-pathname)))
-
-;;; *features* should be set to a list of symbols describing features
-;;; of this implementation.  See Template.scm for the list of feature
-;;; names.
+;@
+(define (in-vicinity vicinity file-name)
+  (->namestring (merge-pathnames file-name vicinity)))
+;@
+(define (user-vicinity)
+  (case (software-type)
+    ((VMS)	"[.]")
+    (else	"")))
+
+(define *load-pathname* #f)
+;@
+(define vicinity:suffix?
+  (let ((suffi
+	 (case (software-type)
+	   ((AMIGA)				'(#\: #\/))
+	   ((MACOS THINKC)			'(#\:))
+	   ((MS-DOS WINDOWS ATARIST OS/2)	'(#\\ #\/))
+	   ((NOSVE)				'(#\: #\.))
+	   ((UNIX COHERENT PLAN9)		'(#\/))
+	   ((VMS)				'(#\: #\]))
+	   (else
+	    (slib:warn "require.scm" 'unknown 'software-type (software-type))
+	    "/"))))
+    (lambda (chr) (and (memv chr suffi) #t))))
+;@
+(define (pathname->vicinity pathname)
+  (let loop ((i (- (string-length pathname) 1)))
+    (cond ((negative? i) "")
+	  ((vicinity:suffix? (string-ref pathname i))
+	   (substring pathname 0 (+ i 1)))
+	  (else (loop (- i 1))))))
+(define (program-vicinity)
+  (if *load-pathname*
+      (pathname->vicinity *load-pathname*)
+      (slib:error 'program-vicinity " called; use slib:load to load")))
+;@
+(define sub-vicinity
+  (case (software-type)
+    ((VMS) (lambda
+	       (vic name)
+	     (let ((l (string-length vic)))
+	       (if (or (zero? (string-length vic))
+		       (not (char=? #\] (string-ref vic (- l 1)))))
+		   (string-append vic "[" name "]")
+		   (string-append (substring vic 0 (- l 1))
+				  "." name "]")))))
+    (else (let ((*vicinity-suffix*
+		 (case (software-type)
+		   ((NOSVE) ".")
+		   ((MACOS THINKC) ":")
+		   ((MS-DOS WINDOWS ATARIST OS/2) "\\")
+		   ((UNIX COHERENT PLAN9 AMIGA) "/"))))
+	    (lambda (vic name)
+	      (string-append vic name *vicinity-suffix*))))))
+;@
+(define (make-vicinity <pathname>) <pathname>)
+;@
+(define with-load-pathname
+  (let ((exchange
+	 (lambda (new)
+	   (let ((old *load-pathname*))
+	     (set! *load-pathname* new)
+	     old))))
+    (lambda (path thunk)
+      (let ((old #f))
+	(dynamic-wind
+	    (lambda () (set! old (exchange path)))
+	    thunk
+	    (lambda () (exchange old)))))))
+
+;;@ *FEATURES* is a list of symbols naming the (SLIB) features
+;;; initially supported by this implementation.
 (define *features*
       '(
 	source				;can load scheme source files
-					;(slib:load-source "filename")
+					;(SLIB:LOAD-SOURCE "filename")
 	compiled			;can load compiled files
-					;(slib:load-compiled "filename")
+					;(SLIB:LOAD-COMPILED "filename")
+	vicinity
+	srfi-59
 
 		       ;; Scheme report features
 
 ; **** no, for several reasons
-;	r5rs				;conforms to
+;;;	r5rs				;conforms to
 ; **** no -- special arguments not supported
-;	eval				;R5RS two-argument eval
+;;;	eval				;R5RS two-argument eval
 ; **** sort of -- not integrated with continuations
 	values				;R5RS multiple values
 	dynamic-wind			;R5RS dynamic-wind
-	fluid-let
+;;;	macro				;R5RS high level macros
 	delay				;has DELAY and FORCE
 	multiarg-apply			;APPLY can take more than 2 args.
 	char-ready?
+	rev4-optional-procedures	;LIST-TAIL, STRING-COPY,
+					;STRING-FILL!, and VECTOR-FILL!
+
+      ;; These four features are optional in both R4RS and R5RS
+
+	multiarg/and-			;/ and - can take more than 2 args.
 	rationalize
-	rev4-optional-procedures	;LIST-TAIL, STRING->LIST,
-					;LIST->STRING, STRING-COPY,
-					;STRING-FILL!, LIST->VECTOR,
-					;VECTOR->LIST, and VECTOR-FILL!
+	transcript			;TRANSCRIPT-ON and TRANSCRIPT-OFF
+	with-file			;has WITH-INPUT-FROM-FILE and
+					;WITH-OUTPUT-TO-FILE
 
 	r4rs				;conforms to
-
 ; **** no -- #F and '() are identical
-;	ieee-p1178			;conforms to
+;;;	ieee-p1178			;conforms to
 
-;	r3rs				;conforms to
+;;;	r3rs				;conforms to
 
 	rev2-procedures			;SUBSTRING-MOVE-LEFT!,
 					;SUBSTRING-MOVE-RIGHT!,
@@ -110,18 +184,17 @@
 					;-1+, <?, <=?, =?, >?, >=?
 	object-hash			;has OBJECT-HASH
 
-	multiarg/and-			;/ and - can take more than 2 args.
-	with-file			;has WITH-INPUT-FROM-FILE and
-					;WITH-OUTPUT-TO-FILE
-	transcript			;TRANSCRIPT-ON and TRANSCRIPT-OFF
+	full-continuation		;can return multiple times
 	ieee-floating-point		;conforms to IEEE Standard 754-1985
 					;IEEE Standard for Binary
 					;Floating-Point Arithmetic.
-	full-continuation		;can return multiple times
 
 			;; Other common features
 
-;	srfi				;srfi-0, COND-EXPAND finds all srfi-*
+;;;	srfi				;srfi-0, COND-EXPAND finds all srfi-*
+;;;	sicp				;runs code from Structure and
+					;Interpretation of Computer
+					;Programs by Abelson and Sussman.
 	defmacro			;has Common Lisp DEFMACRO
 	record				;has user defined data structures
 	string-port			;has CALL-WITH-INPUT-STRING and
@@ -130,17 +203,18 @@
 	pretty-print
 	object->string
 ; **** limited subset with (load-option 'format)
-;	format				;Common-lisp output formatting
+;;;	format				;Common-lisp output formatting
 	trace				;has macros: TRACE and UNTRACE
 	compiler			;has (COMPILER)
-;	ed				;(ED) is editor
+;;;	ed				;(ED) is editor
 	system				;posix (system <string>)
 	getenv				;posix (getenv <string>)
-;	program-arguments		;returns list of strings (argv)
+;;;	program-arguments		;returns list of strings (argv)
 	current-time			;returns time in seconds since 1/1/1970
 
 		  ;; Implementation Specific features
 
+	fluid-let
 	queue
 	Xwindows
 	))
@@ -328,17 +402,7 @@
     (begin
       (environment-define (the-environment) 'macro:eval slib:eval)
       (environment-define (the-environment) 'macro:load load)))
-
-(define (slib:eval-load <pathname> evl)
-  (if (not (file-exists? <pathname>))
-      (set! <pathname> (string-append <pathname> (scheme-file-suffix))))
-  (call-with-input-file <pathname>
-    (lambda (port)
-      (let ((old-load-pathname *load-pathname*))
-	(fluid-let ((*load-pathname* <pathname>))
-	  (do ((o (read port) (read port)))
-	      ((eof-object? o))
-	    (evl o)))))))
+;; slib:eval-load definition moved to "require.scm"
 
 ;; Older implementations need this definition.
 (if (lexical-unreferenceable? (the-environment) 'record-modifier)
@@ -349,19 +413,19 @@
   (apply warn args))
 
 ;; define an error procedure for the library
-(define (slib:error . args)
+(define (slib:error first . args)
   (if (provided? 'trace) (print-call-stack (current-error-port)))
-  (apply error args))
+  (case first
+    ((wrong-type-argument) (apply error:wrong-type-argument args))
+    ((bad-range-argument)  (apply error:bad-range-argument args))
+    (else                  (apply error first args))))
 
 ;; define these as appropriate for your system.
 (define slib:tab (name->char "tab"))
 (define slib:form-feed (name->char "page"))
 
-(define (in-vicinity vicinity file-name)
-  (->namestring (merge-pathnames file-name vicinity)))
-
 ;;; Define SLIB:EXIT to be the implementation procedure to exit or
-;;; return if exitting not supported.
+;;; return if exiting not supported.
 (define slib:exit
   (lambda args
     (cond ((null? args) (exit))