Import Upstream version 3a1upstream/3a1

1 files changed, 47 insertions, 22 deletions

diff --git a/elk.init b/elk.init
index 598b935..13fde42 100644
--- a/elk.init
+++ b/elk.init
@@ -1,4 +1,4 @@
-;;;"elk.init" Initialisation file for SLIB for ELK 2.1	-*- Scheme -*-
+;;;"elk.init" Initialisation file for SLIB for ELK 3.0	-*- Scheme -*-
 ;;; Author: Aubrey Jaffer
 ;;;
 ;;; This code is in the public domain.
@@ -16,39 +16,33 @@
 
 ;;; (software-type) should be set to the generic operating system type.
 ;;; UNIX, VMS, MACOS, AMIGA and MS-DOS are supported.
-
 (define (software-type) 'UNIX)
 
 ;;; (scheme-implementation-type) should return the name of the scheme
 ;;; implementation loading this file.
-
 (define (scheme-implementation-type) 'Elk)
 
 ;;; (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)
   "http://www.informatik.uni-bremen.de/~net/elk/")
 
 ;;; (scheme-implementation-version) should return a string describing
 ;;; the version the scheme implementation loading this file.
-
 (define (scheme-implementation-version) "3.0")
 
 ;;; (implementation-vicinity) should be defined to be the pathname of
 ;;; the directory where any auxillary files to your Scheme
 ;;; implementation reside.
-
 (define (implementation-vicinity)
   (case (software-type)
-    ((UNIX)	 "/usr/local/lib/elk-2.1/scm/")
+    ((UNIX)	 "/usr/local/lib/elk/runtime/scm/")
     ((VMS)	"scheme$src:")
     ((MS-DOS)	"C:\\scheme\\")))
 
 ;;; (library-vicinity) should be defined to be the pathname of the
 ;;; directory where files of Scheme library functions reside.
-
 (require 'unix)
 (define getenv unix-getenv)
 (define system unix-system)
@@ -67,14 +61,18 @@
 ;;; (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
-  (let ((home-path (getenv "HOME")))
-    (lambda () home-path)))
+(define (home-vicinity)
+  (let ((home (getenv "HOME")))
+    (and home
+	 (case (software-type)
+	   ((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)))))
 
 ;;; *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
@@ -84,7 +82,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
@@ -98,11 +96,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!,
@@ -113,7 +111,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
@@ -152,7 +150,6 @@
 ; EXACT? appears to always return #f which isn't very useful.
 ; Approximating it with INTEGER? at least means that some
 ; of the code in the library will work correctly
-
 (define exact? integer?)  ; WARNING: redefining EXACT?
 
 (define (inexact? arg)
@@ -202,6 +199,37 @@
     (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)
+  (define (try cmd end) (zero? (system (string-append cmd url end))))
+  (or (try "netscape-remote -remote 'openURL(" ")'")
+      (try "netscape -remote 'openURL(" ")'")
+      (try "netscape '" "'&")
+      (try "netscape '" "'")))
+
 ;;; CHAR-CODE-LIMIT is one greater than the largest integer which can
 ;;; be returned by CHAR->INTEGER.
 (define char-code-limit 256)
@@ -268,7 +296,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
@@ -323,7 +351,6 @@
 ; _(global-environment)_ if none is explicitly specified.
 ; If this is not done, definitions in files loaded by other files will
 ; not be loaded in the correct environment.
-
 (define slib:load-source
   (let ((primitive-load load))
     (lambda (<pathname> . rest)
@@ -333,14 +360,12 @@
 ;;; (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
   (let ((primitive-load load))
     (lambda (<pathname> . rest)
       (apply primitive-load (string->symbol (string-append name ".o")) rest))))
 
 ;;; At this point SLIB:LOAD must be able to load SLIB files.
-
 (define slib:load slib:load-source)	;WARNING: redefining LOAD
 
 (slib:load (in-vicinity (library-vicinity) "require"))