Import Upstream version 2d2upstream/2d2

1 files changed, 18 insertions, 12 deletions

diff --git a/scsh.init b/scsh.init
index 04d4818..35e8c6f 100644
--- a/scsh.init
+++ b/scsh.init
@@ -13,12 +13,12 @@
 
 (define (scheme-implementation-type) 'Scsh)
 
-;;; (scheme-implementation-home-page) should return a (string) URL
-;;; (Uniform Resource Locator) for this scheme implementation's home
+;;; (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://swissnet.ai.mit.edu/scsh/")
+  "http://swissnet.ai.mit.edu/ftpdir/scsh/")
 
 ;;; (scheme-implementation-version) should return a string describing
 ;;; the version the scheme implementation loading this file.
@@ -58,6 +58,7 @@
 	rev4-report			;conforms to
 ;	rev3-report			;conforms to
 	ieee-p1178			;conforms to
+;	srfi				;srfi-0, COND-EXPAND finds all srfi-*
 ;	sicp				;runs code from Structure and
 					;Interpretation of Computer
 					;Programs by Abelson and Sussman.
@@ -91,7 +92,6 @@
 ;	object-hash			;has OBJECT-HASH
 
 ;	sort
-;	queue				;queues
 ;	pretty-print
 ;	object->string
 	format
@@ -101,10 +101,6 @@
 ;	system				;posix (system <string>)
 	getenv				;posix (getenv <string>)
 ;	program-arguments		;returns list of strings (argv)
-;	Xwindows			;X support
-;	curses				;screen management package
-;	termcap				;terminal description package
-;	terminfo			;sysV terminal description
 ;	current-time			;returns time in seconds since 1/1/1970
 	))
 
@@ -134,6 +130,13 @@
 ;;; CALL-WITH-INPUT-STRING and CALL-WITH-OUTPUT-STRING are the string
 ;;; port versions of CALL-WITH-*PUT-FILE.
 
+;;; "rationalize" adjunct procedures.
+(define (find-ratio x e)
+  (let ((rat (rationalize x e)))
+    (list (numerator rat) (denominator rat))))
+(define (find-ratio-between x y)
+  (find-ratio (/ (+ x y) 2) (/ (- x y) 2)))
+
 ;;; CHAR-CODE-LIMIT is one greater than the largest integer which can
 ;;; be returned by CHAR->INTEGER.
 (define char-code-limit 256)
@@ -206,12 +209,15 @@
 
 (define slib:warn
   (lambda args
-    (let ((port (current-error-port)))
-      (display "Warn: " port)
-      (for-each (lambda (x) (display x port)) args))))
+    (let ((cep (current-error-port)))
+      (if (provided? 'trace) (print-call-stack cep))
+      (display "Warn: " cep)
+      (for-each (lambda (x) (display x cep)) args))))
 
 ;;; define an error procedure for the library
-(define slib:error error)
+(define (slib:error . args)
+  (if (provided? 'trace) (print-call-stack (current-error-port)))
+  (apply error args))
 
 ;;; define these as appropriate for your system.
 (define slib:tab (ascii->char 9))