From 4684239efa63dc1b2c1cbe37ef7d3062029f5532 Mon Sep 17 00:00:00 2001
From: Bryan Newbold <bnewbold@robocracy.org>
Date: Mon, 20 Feb 2017 00:05:40 -0800
Subject: Import Upstream version 3b1

---
 umbscheme.init | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'umbscheme.init')

diff --git a/umbscheme.init b/umbscheme.init
index 37cd4f2..b2f6891 100644
--- a/umbscheme.init
+++ b/umbscheme.init
@@ -28,11 +28,13 @@
 ;;; (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/lib/umb-scheme/")
-    ((vms)	"scheme$src:")
-    ((ms-dos)	"C:\\scheme\\")))
+(define implementation-vicinity
+  (let ((impl-path
+	 (case (software-type)
+	   ((unix) "/usr/lib/umb-scheme/")
+	   ((vms) "scheme$src:")
+	   ((ms-dos) "C:\\scheme\\"))))
+    (lambda () impl-path)))
 
 ;;; (library-vicinity) should be defined to be the pathname of the
 ;;; directory where files of Scheme library functions reside.
@@ -91,8 +93,7 @@
 ;@
 (define sub-vicinity
   (case (software-type)
-    ((vms) (lambda
-	       (vic name)
+    ((vms) (lambda (vic name)
 	     (let ((l (string-length vic)))
 	       (if (or (zero? (string-length vic))
 		       (not (char=? #\] (string-ref vic (- l 1)))))
@@ -132,6 +133,7 @@
 					;(SLIB:LOAD-COMPILED "filename")
 	vicinity
 	srfi-59
+	srfi-96
 
 		       ;; Scheme report features
    ;; R5RS-compliant implementations should provide all 9 features.
@@ -175,7 +177,7 @@
 
 			;; Other common features
 
-;;;	srfi				;srfi-0, COND-EXPAND finds all srfi-*
+;;;	srfi-0				;srfi-0, COND-EXPAND finds all srfi-*
 ;;;	sicp				;runs code from Structure and
 					;Interpretation of Computer
 					;Programs by Abelson and Sussman.
@@ -306,11 +308,7 @@
        (string-append "slib:G" (number->string *gensym-counter*))))))
 
 (define defmacro:eval slib:eval)
-(define defmacro:load load)
-
-(define (defmacro:load <pathname>)
-  (slib:eval-load <pathname> defmacro:eval))
-;; slib:eval-load definition moved to "require.scm"
+(define defmacro:load slib:load-source)
 
 (define slib:warn
   (lambda args
-- 
cgit v1.2.3