Import Upstream version 3a3upstream/3a3

1 files changed, 29 insertions, 29 deletions

diff --git a/gambit.init b/gambit.init
index d50edae..5ca0d67 100644
--- a/gambit.init
+++ b/gambit.init
@@ -13,8 +13,8 @@
 ;;; gsi should be invoked with -:s option to Ignore case when reading
 ;;; symbols (per R5RS).
 
-(define (software-type) 'MACOS)		; for MacGambit.
-(define (software-type) 'UNIX)		; for Unix platforms.
+(define (software-type) 'macos)		; for MacGambit.
+(define (software-type) 'unix)		; for Unix platforms.
 
 (define (scheme-implementation-type) 'gambit)
 
@@ -35,11 +35,11 @@
 ;;; implementation reside.
 (define implementation-vicinity
   (case (software-type)
-    ((UNIX)	(lambda () "/usr/local/share/gambc/"))
-    ((VMS)	(lambda () "scheme$src:"))
-    ((MS-DOS)	(lambda () "C:\\scheme\\"))
-    ((WINDOWS)  (lambda () "c:/scheme/"))
-    ((MACOS)
+    ((unix)	(lambda () "/usr/local/share/gambc/"))
+    ((vms)	(lambda () "scheme$src:"))
+    ((ms-dos)	(lambda () "C:\\scheme\\"))
+    ((windows)  (lambda () "c:/scheme/"))
+    ((macos)
      (let ((arg0 (list-ref (argv) 0)))
        (let loop ((i (- (string-length arg0) 1)))
 	 (cond ((negative? i) "")
@@ -61,11 +61,11 @@
 	  ;; Use this path if your scheme does not support GETENV
 	  ;; or if SCHEME_LIBRARY_PATH is not set.
 	  (case (software-type)
-	    ((UNIX) "/usr/local/lib/slib/")
-	    ((MACOS) (string-append (implementation-vicinity) "slib:"))
-	    ((AMIGA) "dh0:scm/Library/")
-	    ((VMS) "lib$scheme:")
-	    ((WINDOWS MS-DOS) "C:\\SLIB\\")
+	    ((unix) "/usr/local/lib/slib/")
+	    ((macos) (string-append (implementation-vicinity) "slib:"))
+	    ((amiga) "dh0:scm/Library/")
+	    ((vms) "lib$scheme:")
+	    ((windows ms-dos) "C:\\SLIB\\")
 	    (else "")))))
     (lambda () library-path)))
 
@@ -76,22 +76,22 @@
   (let ((home (getenv "HOME")))
     (if home
 	(case (software-type)
-	  ((UNIX COHERENT MS-DOS)	;V7 unix has a / on HOME
+	  ((unix coherent ms-dos)	;V7 unix has a / on HOME
 	   (if (eqv? #\/ (string-ref home (+ -1 (string-length home))))
 	       home
 	       (string-append home "/")))
 	  (else home))
 	(case (software-type)
-	  ((VMS)      "~:")
-	  ((WINDOWS)  "~/")
-	  ((MACOS)    "~:")
+	  ((vms)      "~:")
+	  ((windows)  "~/")
+	  ((macos)    "~:")
 	  (else #f)))))
 ;@
 (define in-vicinity string-append)
 ;@
 (define (user-vicinity)
   (case (software-type)
-    ((VMS)	"[.]")
+    ((vms)	"[.]")
     (else	"")))
 
 (define *load-pathname* #f)
@@ -99,12 +99,12 @@
 (define vicinity:suffix?
   (let ((suffi
 	 (case (software-type)
-	   ((AMIGA)				'(#\: #\/))
-	   ((MACOS THINKC)			'(#\:))
-	   ((MS-DOS WINDOWS ATARIST OS/2)	'(#\\ #\/))
-	   ((NOSVE)				'(#\: #\.))
-	   ((UNIX COHERENT PLAN9)		'(#\/))
-	   ((VMS)				'(#\: #\]))
+	   ((amiga)				'(#\: #\/))
+	   ((macos thinkc)			'(#\:))
+	   ((ms-dos windows atarist os/2)	'(#\\ #\/))
+	   ((nosve)				'(#\: #\.))
+	   ((unix coherent plan9)		'(#\/))
+	   ((vms)				'(#\: #\]))
 	   (else
 	    (slib:warn "require.scm" 'unknown 'software-type (software-type))
 	    "/"))))
@@ -123,7 +123,7 @@
 ;@
 (define sub-vicinity
   (case (software-type)
-    ((VMS) (lambda
+    ((vms) (lambda
 	       (vic name)
 	     (let ((l (string-length vic)))
 	       (if (or (zero? (string-length vic))
@@ -133,10 +133,10 @@
 				  "." name "]")))))
     (else (let ((*vicinity-suffix*
 		 (case (software-type)
-		   ((NOSVE) ".")
-		   ((MACOS THINKC) ":")
-		   ((MS-DOS WINDOWS ATARIST OS/2) "\\")
-		   ((UNIX COHERENT PLAN9 AMIGA) "/"))))
+		   ((nosve) ".")
+		   ((macos thinkc) ":")
+		   ((ms-dos windows atarist os/2) "\\")
+		   ((unix coherent plan9 amiga) "/"))))
 	    (lambda (vic name)
 	      (string-append vic name *vicinity-suffix*))))))
 ;@
@@ -391,7 +391,7 @@
 ;;; Here for backward compatability
 (define scheme-file-suffix
   (let ((suffix (case (software-type)
-		  ((NOSVE) "_scm")
+		  ((nosve) "_scm")
 		  (else ".scm"))))
     (lambda () suffix)))