From 8466d8cfa486fb30d1755c4261b781135083787b Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Mon, 20 Feb 2017 00:05:29 -0800 Subject: Import Upstream version 3a1 --- s48-0_57.init | 85 ++++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 58 insertions(+), 27 deletions(-) (limited to 's48-0_57.init') diff --git a/s48-0_57.init b/s48-0_57.init index 1654cca..672d559 100644 --- a/s48-0_57.init +++ b/s48-0_57.init @@ -33,23 +33,19 @@ ;;; (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) 'Scheme48) ;;; (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://s48.org/") ;;; (scheme-implementation-version) should return a string describing ;;; the version of the scheme implementation loading this file. - (define scheme-implementation-version (let ((version (getenv "S48_VERSION"))) (lambda () version))) @@ -57,14 +53,12 @@ ;;; (implementation-vicinity) should be defined to be the pathname of ;;; the directory where any auxiliary files to your Scheme ;;; implementation reside. - (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. - (define library-vicinity (let ((vic (getenv "SCHEME_LIBRARY_PATH"))) (lambda () vic))) @@ -72,21 +66,20 @@ ;;; (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))) - -(let* ((siv (scheme-implementation-version)) - (num-ver (and siv (string->number siv)))) - (cond ((not num-ver)) - ((>= num-ver 0.54) - (set! system #f)))) +;;; +;;; Ivan Shmakov points out that evaluating (getenv "HOME") when +;;; compiling captures the installer's home directory. So delay until +;;; HOME-VICINITY is called. +(define (home-vicinity) + (let ((home (getenv "HOME"))) + (and home + (if (eqv? #\/ (string-ref home (+ -1 (string-length home)))) + home + (string-append home "/"))))) ;;; *FEATURES* should be set to a list of symbols describing features ;;; of this implementation. See Template.scm for the list of feature ;;; names. - (define *features* '( source ;can load scheme source files @@ -96,7 +89,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 @@ -110,11 +103,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!, @@ -125,7 +118,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 @@ -193,6 +186,37 @@ (s48-force-output (if (null? arg) (current-output-port) (car arg)))) +(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) (eqv? 0 (system (sprintf #f cmd url)))) + (or (try "netscape-remote -remote 'openURL(%s)'") + (try "netscape -remote 'openURL(%s)'") + (try "netscape '%s'&") + (try "netscape '%s'"))) + ;;; "rationalize" adjunct procedures. (define (find-ratio x e) (let ((rat (rationalize x e))) @@ -221,11 +245,21 @@ (define (atan y . x) (if (null? x) (two-arg:atan y 1) (two-arg:atan y (car x)))) +;;; Workaround inexact->exact and exact->inexact bugs. +(define inexact->exact + (let ((i->e inexact->exact)) + (lambda (z) + (if (exact? z) z (i->e z))))) +(define exact->inexact + (let ((e->i exact->inexact)) + (lambda (z) + (if (inexact? z) z (e->i z))))) + ;;; MOST-POSITIVE-FIXNUM is used in modular.scm (define most-positive-fixnum #x1FFFFFFF) ;;; Return argument -(define (identity x) x) +(define identity values) ;;; SLIB:EVAL is single argument eval using the top-level (user) environment. (define slib:eval @@ -294,7 +328,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 . args) @@ -331,17 +365,14 @@ ;;; (SLIB:LOAD-SOURCE "foo") should load "foo.scm" or with whatever ;;; suffix all the module files in SLIB have. See feature 'SOURCE. - (define (slib:load-source f) (load (string-append f (scheme-file-suffix)))) ;;; (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 load) ;;; At this point SLIB:LOAD must be able to load SLIB files. - (define slib:load slib:load-source) ;;; Scheme48 complains that these are not defined (even though they @@ -377,5 +408,5 @@ ,collect ,batch off -,dump slib.image "(slib 2d2)" +,dump slib.image "(slib 3a1)" ,exit -- cgit v1.2.3