From a57ddfa4a4af11e8de6b1c5302f1211b2ae5ea4c Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Wed, 13 Feb 2002 01:06:02 +0000 Subject: [PATCH] Rename MAKE-NULL-TOP-LEVEL-ENVIRONMENT to MAKE-ROOT-TOP-LEVEL-ENVIRONMENT. Eliminate alias for EXTEND-INTERPRETER-ENVIRONMENT. --- v7/src/compiler/etc/disload.scm | 6 +++--- v7/src/edwin/intmod.scm | 6 +++--- v7/src/imail/fake-env.scm | 2 +- v7/src/runtime/option.scm | 6 +++--- v7/src/runtime/runtime.pkg | 7 +++---- v7/src/runtime/uenvir.scm | 6 +++--- v7/src/runtime/xeval.scm | 4 ++-- v7/src/swat/scheme/load.scm | 2 +- 8 files changed, 19 insertions(+), 20 deletions(-) diff --git a/v7/src/compiler/etc/disload.scm b/v7/src/compiler/etc/disload.scm index b54ca029f..2dc6376d9 100644 --- a/v7/src/compiler/etc/disload.scm +++ b/v7/src/compiler/etc/disload.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: disload.scm,v 1.11 2001/12/20 18:01:28 cph Exp $ +$Id: disload.scm,v 1.12 2002/02/13 01:05:22 cph Exp $ -Copyright (c) 1993, 1999, 2001 Massachusetts Institute of Technology +Copyright (c) 1993, 1999, 2001, 2002 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 @@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (disassembler (package/add-child! parent 'disassembler - (extend-interpreter-environment parenv)))) + (extend-top-level-environment parenv)))) (let ((disenv (package/environment disassembler)) (global system-global-environment) (compinfo (package/environment diff --git a/v7/src/edwin/intmod.scm b/v7/src/edwin/intmod.scm index 89774d19d..16321c99f 100644 --- a/v7/src/edwin/intmod.scm +++ b/v7/src/edwin/intmod.scm @@ -1,8 +1,8 @@ ;;; -*-Scheme-*- ;;; -;;; $Id: intmod.scm,v 1.115 2001/12/19 05:25:39 cph Exp $ +;;; $Id: intmod.scm,v 1.116 2002/02/13 01:05:37 cph Exp $ ;;; -;;; Copyright (c) 1986, 1989-2001 Massachusetts Institute of Technology +;;; Copyright (c) 1986, 1989-2002 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 @@ -77,7 +77,7 @@ With two C-u's, creates a new REPL buffer with a new evaluation environment. repl-buffer)))) (if (>= argument 16) (make-new - (extend-interpreter-environment system-global-environment)) + (extend-top-level-environment system-global-environment)) (or (and (< argument 4) (current-repl-buffer* buffer)) (make-new user-initial-environment)))))))) diff --git a/v7/src/imail/fake-env.scm b/v7/src/imail/fake-env.scm index a578a08e4..f72aa543b 100644 --- a/v7/src/imail/fake-env.scm +++ b/v7/src/imail/fake-env.scm @@ -3,7 +3,7 @@ (let ((package (name->package parent))) (package/add-child! package name - (extend-interpreter-environment + (extend-top-level-environment (package/environment package))))))) (new-child '(EDWIN) 'IMAIL) (new-child '(EDWIN IMAIL) 'IMAP-RESPONSE) diff --git a/v7/src/runtime/option.scm b/v7/src/runtime/option.scm index 464be922d..8f2217c54 100644 --- a/v7/src/runtime/option.scm +++ b/v7/src/runtime/option.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Id: option.scm,v 14.39 2001/12/19 20:50:44 cph Exp $ +$Id: option.scm,v 14.40 2002/02/13 01:04:50 cph Exp $ -Copyright (c) 1988-2001 Massachusetts Institute of Technology +Copyright (c) 1988-2002 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 @@ -54,7 +54,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA find-option)) (define (make-load-environment) - (extend-interpreter-environment system-global-environment)) + (extend-top-level-environment system-global-environment)) (fluid-let ((*parser-canonicalize-symbols?* #t)) (if (memq name loaded-options) diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg index 56ed880f4..9ee538377 100644 --- a/v7/src/runtime/runtime.pkg +++ b/v7/src/runtime/runtime.pkg @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: runtime.pkg,v 14.409 2002/02/12 15:14:21 cph Exp $ +$Id: runtime.pkg,v 14.410 2002/02/13 01:03:13 cph Exp $ Copyright (c) 1988-2002 Massachusetts Institute of Technology @@ -1323,13 +1323,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA environment-safe-lookup environment? (extend-ic-environment extend-top-level-environment) - (extend-interpreter-environment extend-top-level-environment) extend-top-level-environment guarantee-environment ic-environment? interpreter-environment? - (make-null-interpreter-environment make-null-top-level-environment) - make-null-top-level-environment + (make-null-interpreter-environment make-root-top-level-environment) + make-root-top-level-environment system-global-environment? (top-level-environment? interpreter-environment?)) (export (runtime advice) diff --git a/v7/src/runtime/uenvir.scm b/v7/src/runtime/uenvir.scm index d0d4182cc..33a75c3a6 100644 --- a/v7/src/runtime/uenvir.scm +++ b/v7/src/runtime/uenvir.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: uenvir.scm,v 14.55 2002/02/12 21:17:30 cph Exp $ +$Id: uenvir.scm,v 14.56 2002/02/13 01:02:55 cph Exp $ Copyright (c) 1988-1999, 2001, 2002 Massachusetts Institute of Technology @@ -421,12 +421,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (if (default-object? values) 'DEFAULT values) 'EXTEND-TOP-LEVEL-ENVIRONMENT)) -(define (make-null-top-level-environment #!optional names values) +(define (make-root-top-level-environment #!optional names values) (%extend-top-level-environment (object-new-type (object-type #f) (fix:xor (object-datum #f) 1)) (if (default-object? names) '() names) (if (default-object? values) 'DEFAULT values) - 'MAKE-NULL-TOP-LEVEL-ENVIRONMENT)) + 'MAKE-ROOT-TOP-LEVEL-ENVIRONMENT)) (define (%extend-top-level-environment environment names values procedure) (if (not (list-of-type? names symbol?)) diff --git a/v7/src/runtime/xeval.scm b/v7/src/runtime/xeval.scm index 12e42bd69..23ab70ee0 100644 --- a/v7/src/runtime/xeval.scm +++ b/v7/src/runtime/xeval.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: xeval.scm,v 1.9 2002/01/05 06:15:10 cph Exp $ +$Id: xeval.scm,v 1.10 2002/02/13 01:06:02 cph Exp $ Copyright (c) 1989-1999, 2001, 2002 Massachusetts Institute of Technology @@ -66,7 +66,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (if (environment-has-parent? environment) (loop bound-names (environment-parent environment)) (finish bound-names - (make-null-interpreter-environment)))))))) + (make-root-top-level-environment)))))))) (define (difference items items*) (list-transform-negative items diff --git a/v7/src/swat/scheme/load.scm b/v7/src/swat/scheme/load.scm index 72582f337..e1c542c86 100644 --- a/v7/src/swat/scheme/load.scm +++ b/v7/src/swat/scheme/load.scm @@ -19,7 +19,7 @@ -(let ((swat-env (extend-interpreter-environment system-global-environment))) +(let ((swat-env (extend-top-level-environment system-global-environment))) (package/add-child! (find-package '()) 'SWAT swat-env) -- 2.25.1