Quiet the last CREF complaint on Unix.
authorMatt Birkholz <puck@birchwood-abbey.net>
Wed, 22 Oct 2014 23:12:31 +0000 (16:12 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Fri, 14 Nov 2014 00:53:03 +0000 (17:53 -0700)
Convert references to compiler global variables into
environment-lookup combinations.

src/runtime/swank.scm

index 13931fa530c96b5b320589c37ca8bb60eb1488e8..efef453ca1e9705b68ccd797a45a7f551db5c5c1 100644 (file)
@@ -349,7 +349,9 @@ USA.
     (call-compiler
      (lambda ()
        (let ((env (buffer-env)))
-        (scode-eval (compile-scode (syntax `(begin ,@sexps) env) #t)
+        (scode-eval ((environment-lookup #f 'compile-scode)
+                     (syntax `(begin ,@sexps) env)
+                     #t)
                     env))))))
 
 (define (snarf-string string)
@@ -374,7 +376,7 @@ USA.
    (lambda ()
      (with-output-to-repl socket
        (lambda ()
-        (compile-file file)))))
+        ((environment-lookup #f 'compile-file) file)))))
   (if (elisp-true? load?)
       (swank:load-file socket
                       (pathname-new-type file "com"))))
@@ -388,7 +390,7 @@ USA.
   socket
   (with-output-to-string
     (lambda ()
-      (compiler:disassemble
+      ((environment-lookup #f 'compiler:disassemble)
        (eval (read-from-string string)
             (buffer-env))))))
 
@@ -1064,7 +1066,7 @@ swank:xref
         (stream (iline "block" (compiled-entry/block o))
                 (with-output-to-string
                   (lambda ()
-                    (compiler:disassemble o)))))))
+                    ((environment-lookup #f 'compiler:disassemble) o)))))))
 
 (define (inspect-code-block block)
   (let loop ((i (compiled-code-block/constants-start block)))
@@ -1075,7 +1077,7 @@ swank:xref
                (iline "env" (compiled-code-block/environment block))
                (with-output-to-string
                  (lambda ()
-                   (compiler:disassemble block)))))))
+                   ((environment-lookup #f 'compiler:disassemble) block)))))))
 
 (define (inspect-scode o)
   (stream (pprint-to-string o)))