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

---
 scheme2c.init | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'scheme2c.init')

diff --git a/scheme2c.init b/scheme2c.init
index 80b91d1..4f98f81 100644
--- a/scheme2c.init
+++ b/scheme2c.init
@@ -29,11 +29,14 @@
 ;;; the version the scheme implementation loading this file.
 (define (scheme-implementation-version) "?01nov91")
 
-(define (implementation-vicinity)
-  (case (software-type)
-    ((unix)	"/usr/local/lib/scheme/")
-    ((vms)	"scheme$src:")
-    ((ms-dos)	"C:\\scheme\\")))
+(define implementation-vicinity
+  (let ((impl-path
+	 (case (software-type)
+	   ((unix) "/usr/local/src/scheme/")
+	   ((vms) "scheme$src:")
+	   ((ms-dos) "C:\\scheme\\")
+	   (else ""))))
+    (lambda () impl-path)))
 
 ;;; (library-vicinity) should be defined to be the pathname of the
 ;;; directory where files of Scheme library functions reside.
@@ -95,8 +98,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)))))
@@ -136,6 +138,7 @@
 					;(SLIB:LOAD-COMPILED "filename")
 	vicinity
 	srfi-59
+	srfi-96
 
 		       ;; Scheme report features
    ;; R5RS-compliant implementations should provide all 9 features.
@@ -182,11 +185,11 @@
 
 			;; 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.
-;;;	defmacro			;has Common Lisp DEFMACRO
+	defmacro			;has Common Lisp DEFMACRO
 ;;;	record				;has user defined data structures
 	string-port			;has CALL-WITH-INPUT-STRING and
 					;CALL-WITH-OUTPUT-STRING
@@ -343,7 +346,6 @@
 ;;; If your implementation provides R4RS macros:
 ;(define macro:eval slib:eval)
 ;(define macro:load load)
-;; slib:eval-load definition moved to "require.scm"
 
 (define slib:warn
   (lambda args
-- 
cgit v1.2.3