Change references to LOCAL-ASSIGNMENT and LEXICAL-* to instead use

procedures in the environment abstraction.

diff --git a/v7/src/sf/usicon.scm b/v7/src/sf/usicon.scm
index fc0b426a68d496bfef2b17aa623755d459d88c2f..91e0d9b5a2d62f17e87dd77bd4a8d5fc1df46e46 100644 (file)
--- a/v7/src/sf/usicon.scm
+++ b/v7/src/sf/usicon.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: usicon.scm,v 4.4 1999/01/02 06:06:43 cph Exp $
+$Id: usicon.scm,v 4.5 2001/12/19 04:02:53 cph Exp $
 
-Copyright (c) 1987-1999 Massachusetts Institute of Technology
+Copyright (c) 1987-1999, 2001 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -16,7 +16,8 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
 |#
 
 ;;;; SCode Optimizer: Usual Integrations: Constants
@@ -24,7 +25,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (declare (usual-integrations)
         (integrate-external "object"))
-\f
+
 (define usual-integrations/constant-names)
 (define usual-integrations/constant-values)
 (define usual-integrations/constant-alist)
@@ -39,7 +40,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   (set! usual-integrations/constant-values
        (map (lambda (name)
               (let ((object
-                     (lexical-reference system-global-environment name)))
+                     (environment-lookup system-global-environment name)))
                 (if (not (memq (microcode-type/code->name
                                 (object-type object))
                                '(BIGNUM
@@ -68,7 +69,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
        (map (lambda (name)
               (cons name
                     (constant/make
-                     false
-                     (lexical-reference system-global-environment name))))
+                     #f
+                     (environment-lookup system-global-environment name))))
             usual-integrations/constant-names))
-  'DONE)
\ No newline at end of file
+  unspecific)
\ No newline at end of file

diff --git a/v7/src/sos/load.scm b/v7/src/sos/load.scm
index 7eb0091ba2f9efb65ddc040c64147058d27cdd04..bf2d90ff5dd9bcd8ba671637f7164f39403a4ba3 100644 (file)
--- a/v7/src/sos/load.scm
+++ b/v7/src/sos/load.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: load.scm,v 1.7 2001/08/17 13:01:25 cph Exp $
+;;; $Id: load.scm,v 1.8 2001/12/19 04:03:54 cph Exp $
 ;;;
 ;;; Copyright (c) 1995-1999, 2001 Massachusetts Institute of Technology
 ;;;
@@ -28,7 +28,7 @@
         (lambda (mname tname)
           (syntax-table/define system-global-syntax-table
                                mname
-                               (lexical-reference environment tname))))))
+                               (environment-lookup environment tname))))))
   (install 'DEFINE-CLASS 'TRANSFORM:DEFINE-CLASS)
   (install 'DEFINE-GENERIC 'TRANSFORM:DEFINE-GENERIC)
   (install 'DEFINE-METHOD 'TRANSFORM:DEFINE-METHOD)