Port Rules to MIT Scheme 11.2.

load.scm

@@ -20,11 +20,12 @@
 ;;;; Loading Rules
 
 (define (self-relatively thunk)
-  (if (current-eval-unit #f)
-      (with-working-directory-pathname
-       (directory-namestring (current-load-pathname))
-       thunk)
-      (thunk)))
+  (let ((place (ignore-errors current-load-pathname)))
+    (if (pathname? place)
+	(with-working-directory-pathname
+	 (directory-namestring place)
+	 thunk)
+	(thunk))))
 
 (define (load-relative filename)
   (self-relatively (lambda () (load filename))))

rules.scm

@@ -169,8 +169,8 @@
 	      (lambda (name required optional rest body)
 		name body
 		(append required
-		 (if (null? optional) '() `(#!OPTIONAL ,@optional))
-		 (if rest `(#!REST ,rest) '()))))
+		 (if (null? optional) '() `(#!optional ,@optional))
+		 (if rest `(#!rest ,rest) '()))))
 	    (if (default-object? default-argl)
 		"No debugging information available for this procedure."
 		default-argl)))))

simplifiers.scm

@@ -173,7 +173,7 @@
           `(/ ,(simplify-sums
                 `(+ ,n
                     ,(simplify-products
-                      (* ,d ,(simplify-sums `(+ ,@a1 ,@a2))))))
+                      `(* ,d ,(simplify-sums `(+ ,@a1 ,@a2))))))
               ,d)))))
 
 (define quotient-of-sums->sum-of-quotients

support/auto-compilation.scm

@@ -36,27 +36,20 @@
 (define (load-relative filename #!optional environment)
   (self-relatively (lambda () (load filename environment))))
 
-(define (compiled-code-type)
-  ;; Trying to support the C backend
-  (if (lexical-unbound?
-       (nearest-repl/environment)
-       'compiler:compiled-code-pathname-type)
-      "com"
-      (compiler:compiled-code-pathname-type)))
-
 ;; The environment argument is the one to take macro definitions from
 ;; for sf.
 (define (cf-conditionally filename #!optional environment)
   (define (default-environment)
-    (if (current-eval-unit #f)
-        (current-load-environment)
-        (nearest-repl/environment)))
+    (let ((place (ignore-errors current-load-pathname)))
+     (if (pathname? place)  ;; We are being loaded
+         (current-load-environment)
+         (nearest-repl/environment))))
   (if (default-object? environment)
       (set! environment (default-environment)))
   (fluid-let ((sf/default-syntax-table environment))
-    (sf-conditionally filename))
-  (if (cf-seems-necessary? filename)
-      (compile-bin-file filename)))
+    (sf-conditionally filename)
+    (if (cf-seems-necessary? filename)
+        (compile-bin-file filename))))
 
 (define (compiler-available?)
   (not (lexical-unbound? (nearest-repl/environment) 'cf)))
@@ -69,7 +62,7 @@
   (not (file-processed? filename "scm" "bin")))
 
 (define (cf-seems-necessary? filename)
-  (not (file-processed? filename "bin" (compiled-code-type))))
+  (not (file-processed? filename "bin" "com")))
 
 (define (load-compiled filename #!optional environment)
   (if (compiler-available?)