Import Upstream version 2d2upstream/2d2

1 files changed, 166 insertions, 50 deletions

diff --git a/scheme48.init b/scheme48.init
index 8258d97..75ab0f5 100644
--- a/scheme48.init
+++ b/scheme48.init
@@ -3,10 +3,38 @@
 ;;;
 ;;; This code is in the public domain.
 
-;;; If you know the magic incantation to make a "," command available
-;;; as a scheme procedure, you can make a nifty slib function to do
-;;; this (like `slib:dump' in "vscm.init").  But for now, type:
-;;;	make slib48
+,batch on
+,load-package floatnums
+,config
+,load =scheme48/misc/packages.scm
+(define-structure slib-primitives
+  (export s48-getenv
+	  s48-system
+	  s48-current-error-port
+	  s48-force-output
+	  s48-with-handler
+	  s48-ascii->char
+	  s48-error)
+  (open scheme signals ascii extended-ports i/o primitives handle
+	unix-getenv			;Comment out for versions >= 0.54
+;;;	posix				;Comment out for versions < 0.54
+	)
+  (begin
+    (define s48-getenv
+      getenv				;Comment out for versions >= 0.54
+;;;      lookup-environment-variable	;Comment out for versions < 0.54
+      )
+    (define s48-system (lambda (c) (vm-extension 96 c)))
+    (define s48-current-error-port current-error-port)
+    (define s48-force-output force-output)
+    (define s48-with-handler with-handler)
+    (define s48-ascii->char ascii->char)
+    (define s48-error error)))
+,user
+,open slib-primitives
+
+(define getenv s48-getenv)
+(define system s48-system)
 
 ;;; (software-type) should be set to the generic operating system type.
 ;;; UNIX, VMS, MACOS, AMIGA and MS-DOS are supported.
@@ -18,38 +46,33 @@
 
 (define (scheme-implementation-type) 'Scheme48)
 
-;;; (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://www.neci.nj.nec.com/homepages/kelsey.html")
+(define (scheme-implementation-home-page) "http://s48.org/")
 
 ;;; (scheme-implementation-version) should return a string describing
 ;;; the version of the scheme implementation loading this file.
 
 (define scheme-implementation-version
-  (cond ((= -86400 (modulo -2177452800 -86400))
-	 (display "scheme48-0.36 has been superseded by")
-	 (newline)
-	 (display "http://swissnet.ai.mit.edu/ftpdir/s48/scheme48-0.46.tgz")
-	 (newline)
-	 (lambda () "0.36"))
-	(else (lambda () "0.46"))))
+  (let ((version (getenv "S48_VERSION")))
+    (lambda () version)))
 
 ;;; (implementation-vicinity) should be defined to be the pathname of
 ;;; the directory where any auxiliary files to your Scheme
 ;;; implementation reside.
 
-;;; [ defined from the Makefile ]
+(define implementation-vicinity
+  (let ((vic (getenv "S48_VICINITY")))
+    (lambda () vic)))
 
 ;;; (library-vicinity) should be defined to be the pathname of the
 ;;; directory where files of Scheme library functions reside.
 
-;;; [ defined from the Makefile ]
-
-(define getenv s48-getenv)
-(define system s48-system)
+(define library-vicinity
+  (let ((vic (getenv "SCHEME_LIBRARY_PATH")))
+    (lambda () vic)))
 
 ;;; (home-vicinity) should return the vicinity of the user's HOME
 ;;; directory, the directory which typically contains files which
@@ -59,6 +82,12 @@
   (let ((home-path (getenv "HOME")))
     (lambda () home-path)))
 
+(let* ((siv (scheme-implementation-version))
+       (num-ver (and siv (string->number siv))))
+  (cond ((not num-ver))
+	((>= num-ver 0.54)
+	 (set! system #f))))
+
 ;;; *FEATURES* should be set to a list of symbols describing features
 ;;; of this implementation.  See Template.scm for the list of feature
 ;;; names.
@@ -69,24 +98,71 @@
 					;(slib:load-source "filename")
 ;	compiled			;can load compiled files
 					;(slib:load-compiled "filename")
+
+		       ;; Scheme report features
+
+	rev5-report			;conforms to
+	eval				;R5RS two-argument eval
+	values				;R5RS multiple values
+	dynamic-wind			;R5RS dynamic-wind
+	macro				;R5RS high level macros
+	delay				;has DELAY and FORCE
+	multiarg-apply			;APPLY can take more than 2 args.
+	char-ready?
+	rationalize
+	rev4-optional-procedures	;LIST-TAIL, STRING->LIST,
+					;LIST->STRING, STRING-COPY,
+					;STRING-FILL!, LIST->VECTOR,
+					;VECTOR->LIST, and VECTOR-FILL!
+
 	rev4-report			;conforms to
+
 	ieee-p1178			;conforms to
-	rev4-optional-procedures
-	multiarg/and-
-	multiarg-apply
-	rationalize
-	delay				;has delay and force
-	with-file
-	char-ready?			;has
-	eval				;proposed 2-argument eval
-	values				;proposed multiple values
-	dynamic-wind			;proposed dynamic-wind
+
+;	rev3-report			;conforms to
+
+;	rev2-procedures			;SUBSTRING-MOVE-LEFT!,
+					;SUBSTRING-MOVE-RIGHT!,
+					;SUBSTRING-FILL!,
+					;STRING-NULL?, APPEND!, 1+,
+					;-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-FROM-FILE
+;	transcript			;TRANSCRIPT-ON and TRANSCRIPT-OFF
+;	ieee-floating-point		;conforms to IEEE Standard 754-1985
+					;IEEE Standard for Binary
+					;Floating-Point Arithmetic.
 	full-continuation		;can return multiple times
-	macro				;R4RS appendix's DEFINE-SYNTAX
-	system				;posix (system <string>)
+
+			;; Other common features
+
+;	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
+					;CALL-WITH-OUTPUT-STRING
+;	sort
+;	pretty-print
+;	object->string
+;	format				;Common-lisp output formatting
+;	trace				;has macros: TRACE and UNTRACE
+;	compiler			;has (COMPILER)
+;	ed				;(ED) is editor
 	getenv				;posix (getenv <string>)
+;	program-arguments		;returns list of strings (argv)
+;	current-time			;returns time in seconds since 1/1/1970
+		  ;; Implementation Specific features
 	))
 
+(if system				;posix (system <string>)
+    (set! *features* (cons 'system *features*)))
+
 ;;; (OUTPUT-PORT-WIDTH <port>)
 (define (output-port-width . arg) 79)
 
@@ -124,6 +200,13 @@
   (s48-force-output
    (if (null? arg) (current-output-port) (car arg))))
 
+;;; "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 integer->char s48-ascii->char)
@@ -140,6 +223,11 @@
       (let ((ans (modulo n1 n2)))
 	(if (= ans n2) (- ans ans) ans)))))
 
+;;; Workaround atan bug
+(define two-arg:atan atan)
+(define (atan y . x)
+  (if (null? x) (two-arg:atan y 1) (two-arg:atan y (car x))))
+
 ;;; MOST-POSITIVE-FIXNUM is used in modular.scm
 (define most-positive-fixnum #x1FFFFFFF)
 
@@ -164,22 +252,24 @@
   (list (cons 'defmacro
 	      (lambda (name parms . body)
 		`(set! *defmacros* (cons (cons ',name (lambda ,parms ,@body))
-				      *defmacros*))))))
+					 *defmacros*))))))
 (define (defmacro? m) (and (assq m *defmacros*) #t))
 
 (define (macroexpand-1 e)
-  (if (pair? e) (let ((a (car e)))
-		  (cond ((symbol? a) (set! a (assq a *defmacros*))
-				     (if a (apply (cdr a) (cdr e)) e))
-			(else e)))
+  (if (pair? e)
+      (let ((a (car e)))
+	(cond ((symbol? a) (set! a (assq a *defmacros*))
+	       (if a (apply (cdr a) (cdr e)) e))
+	      (else e)))
       e))
 
 (define (macroexpand e)
-  (if (pair? e) (let ((a (car e)))
-		  (cond ((symbol? a)
-			 (set! a (assq a *defmacros*))
-			 (if a (macroexpand (apply (cdr a) (cdr e))) e))
-			(else e)))
+  (if (pair? e)
+      (let ((a (car e)))
+	(cond ((symbol? a)
+	       (set! a (assq a *defmacros*))
+	       (if a (macroexpand (apply (cdr a) (cdr e))) e))
+	      (else e)))
       e))
 
 (define gentemp
@@ -191,11 +281,8 @@
 
 (define base:eval slib:eval)
 (define (defmacro:eval x) (base:eval (defmacro:expand* x)))
-(define (defmacro:expand* x)
-  (require 'defmacroexpand) (apply defmacro:expand* x '()))
 
-(define (defmacro:load <pathname>)
-  (slib:eval-load <pathname> defmacro:eval))
+(define defmacro:load macro:load)
 
 (define (slib:eval-load <pathname> evl)
   (if (not (file-exists? <pathname>))
@@ -211,12 +298,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 s48-error)
+(define (slib:error . args)
+  (if (provided? 'trace) (print-call-stack (current-error-port)))
+  (apply s48-error args))
 
 ;;; define these as appropriate for your system.
 (define slib:tab (s48-ascii->char 9))
@@ -269,4 +359,30 @@
 (define transcript-on #f)
 (define transcript-off #f)
 
+;;; Jacques Mequin wins the Spring 2001 SLIB extreme cleverness award:
+(define-syntax defmacro
+  (lambda (e r c)
+    (let* ((e-fields (cdr e))
+	   (macro-name (car e-fields))
+	   (macro-args (cdr e-fields))
+	   (slib-store (eval 'defmacro:eval (interaction-environment))))
+      (slib-store `(defmacro ,macro-name ,@macro-args)))
+    `(define-syntax ,(cadr e)
+       (lambda (em rm cm)
+	 (let ((macro-name ',(cadr e))
+	       (macro-args (cdr em))
+	       (slib-eval (eval 'macroexpand-1 (interaction-environment))))
+	   (slib-eval `(,macro-name ,@macro-args)))))))
+
 (slib:load (in-vicinity (library-vicinity) "require"))
+
+;;; Needed to support defmacro
+(require 'defmacroexpand)
+(define *args* '())
+(define (program-arguments) (cons "scheme48" *args*))
+(set! *catalog* #f)
+
+,collect
+,batch off
+,dump slib.image "(slib 2d2)"
+,exit