From ca047bc7432f0060e7a82a272bdc05045ee4884d Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Thu, 20 Dec 2001 18:06:22 +0000 Subject: [PATCH] Eliminate references to MAKE-ENVIRONMENT. --- v7/src/compiler/etc/disload.scm | 4 ++-- v7/src/compiler/fggen/canon.scm | 5 ++--- v7/src/edwin/schmod.scm | 3 +-- v7/src/runtime/infutl.scm | 5 ++--- v7/src/runtime/macros.scm | 9 +-------- v7/src/runtime/runtime.pkg | 3 +-- v7/src/runtime/syntax.scm | 5 +---- v7/src/runtime/unsyn.scm | 14 +------------- v7/src/sf/gconst.scm | 3 +-- 9 files changed, 12 insertions(+), 39 deletions(-) diff --git a/v7/src/compiler/etc/disload.scm b/v7/src/compiler/etc/disload.scm index ca325fde6..b54ca029f 100644 --- a/v7/src/compiler/etc/disload.scm +++ b/v7/src/compiler/etc/disload.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: disload.scm,v 1.10 2001/12/19 01:49:45 cph Exp $ +$Id: disload.scm,v 1.11 2001/12/20 18:01:28 cph Exp $ Copyright (c) 1993, 1999, 2001 Massachusetts Institute of Technology @@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (disassembler (package/add-child! parent 'disassembler - (eval '(make-environment) parenv)))) + (extend-interpreter-environment parenv)))) (let ((disenv (package/environment disassembler)) (global system-global-environment) (compinfo (package/environment diff --git a/v7/src/compiler/fggen/canon.scm b/v7/src/compiler/fggen/canon.scm index 3eee1f211..cc7298493 100644 --- a/v7/src/compiler/fggen/canon.scm +++ b/v7/src/compiler/fggen/canon.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: canon.scm,v 1.17 2001/12/20 16:28:22 cph Exp $ +$Id: canon.scm,v 1.18 2001/12/20 18:04:49 cph Exp $ Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology @@ -760,8 +760,7 @@ ARBITRARY: The expression may be executed more than once. It (scode/make-absolute-reference '*MAKE-ENVIRONMENT) (cons* (scode/make-variable environment-variable) (list->vector - (cons lambda-tag:make-environment - names)) + (cons lambda-tag:unnamed names)) (map scode/make-variable names))))) (if (and (scode/the-environment? body) diff --git a/v7/src/edwin/schmod.scm b/v7/src/edwin/schmod.scm index 43431caf9..d04e6c57b 100644 --- a/v7/src/edwin/schmod.scm +++ b/v7/src/edwin/schmod.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Id: schmod.scm,v 1.56 2001/12/20 16:13:18 cph Exp $ +;;; $Id: schmod.scm,v 1.57 2001/12/20 18:01:59 cph Exp $ ;;; ;;; Copyright (c) 1986, 1989-2001 Massachusetts Institute of Technology ;;; @@ -167,7 +167,6 @@ The following commands evaluate Scheme expressions: (LET-SYNTAX . 1) (LOCAL-DECLARE . 1) (MACRO . 1) - (MAKE-ENVIRONMENT . 0) (NAMED-LAMBDA . 1) (CALL-WITH-APPEND-FILE . 1) diff --git a/v7/src/runtime/infutl.scm b/v7/src/runtime/infutl.scm index 31f125d66..cb3d86c5c 100644 --- a/v7/src/runtime/infutl.scm +++ b/v7/src/runtime/infutl.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: infutl.scm,v 1.65 2001/08/10 17:09:23 cph Exp $ +$Id: infutl.scm,v 1.66 2001/12/20 18:05:07 cph Exp $ Copyright (c) 1988-2001 Massachusetts Institute of Technology @@ -32,8 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (,lambda-tag:internal-lambda . LAMBDA) (,lambda-tag:internal-lexpr . LAMBDA) (,lambda-tag:let . LET) - (,lambda-tag:fluid-let . FLUID-LET) - (,lambda-tag:make-environment . MAKE-ENVIRONMENT))) + (,lambda-tag:fluid-let . FLUID-LET))) (set! wrappers-with-memoized-debugging-info (make-population)) (add-secondary-gc-daemon! discard-debugging-info!) (initialize-uncompressed-files!) diff --git a/v7/src/runtime/macros.scm b/v7/src/runtime/macros.scm index be7d05116..79ec406cd 100644 --- a/v7/src/runtime/macros.scm +++ b/v7/src/runtime/macros.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: macros.scm,v 1.4 2001/12/20 06:34:37 cph Exp $ +$Id: macros.scm,v 1.5 2001/12/20 18:03:05 cph Exp $ Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology @@ -37,7 +37,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA DO LET* LETREC - MAKE-ENVIRONMENT QUASIQUOTE SEQUENCE) (list transform/and @@ -47,7 +46,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA transform/do transform/let* transform/letrec - transform/make-environment transform/quasiquote transform/sequence))) @@ -67,11 +65,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (define (transform/cons-stream head tail) `(,(make-absolute-reference 'CONS) ,head (DELAY ,tail))) -(define (transform/make-environment . body) - `((NAMED-LAMBDA (,lambda-tag:make-environment) - ,@body - (THE-ENVIRONMENT)))) - (define (transform/sequence . actions) `(BEGIN . ,actions)) diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg index 532896433..38ae66b23 100644 --- a/v7/src/runtime/runtime.pkg +++ b/v7/src/runtime/runtime.pkg @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: runtime.pkg,v 14.395 2001/12/20 16:28:22 cph Exp $ +$Id: runtime.pkg,v 14.396 2001/12/20 18:03:39 cph Exp $ Copyright (c) 1988-2001 Massachusetts Institute of Technology @@ -3751,7 +3751,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA hook/syntax-expression lambda-tag:fluid-let lambda-tag:let - lambda-tag:make-environment lambda-tag:unnamed make-syntax-closure syntax diff --git a/v7/src/runtime/syntax.scm b/v7/src/runtime/syntax.scm index 0ae79bf64..38dfe238e 100644 --- a/v7/src/runtime/syntax.scm +++ b/v7/src/runtime/syntax.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: syntax.scm,v 14.42 2001/12/20 16:13:18 cph Exp $ +$Id: syntax.scm,v 14.43 2001/12/20 18:05:34 cph Exp $ Copyright (c) 1988-2001 Massachusetts Institute of Technology @@ -658,9 +658,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA (define-integrable lambda-tag:fluid-let ((ucode-primitive string->symbol) "#[fluid-let-procedure]")) - -(define-integrable lambda-tag:make-environment - ((ucode-primitive string->symbol) "#[make-environment]")) ;;;; Lambda List Parser diff --git a/v7/src/runtime/unsyn.scm b/v7/src/runtime/unsyn.scm index d69df8ce0..90bba4b55 100644 --- a/v7/src/runtime/unsyn.scm +++ b/v7/src/runtime/unsyn.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: unsyn.scm,v 14.22 2001/12/20 16:28:22 cph Exp $ +$Id: unsyn.scm,v 14.23 2001/12/20 18:03:24 cph Exp $ Copyright (c) 1988-2001 Massachusetts Institute of Technology @@ -406,18 +406,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA operands body ordinary-combination)) - ((and (eq? name lambda-tag:make-environment) - (the-environment? - (car - (last-pair (sequence-actions body))))) - (with-bindings - required '() #F - (lambda (body) - `(MAKE-ENVIRONMENT - ,@(unsyntax-objects - (except-last-pair - (sequence-actions body))))) - body)) (else (ordinary-combination))) (ordinary-combination))))) (else diff --git a/v7/src/sf/gconst.scm b/v7/src/sf/gconst.scm index b8ad6403f..355244e78 100644 --- a/v7/src/sf/gconst.scm +++ b/v7/src/sf/gconst.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: gconst.scm,v 4.26 2001/09/25 16:53:25 cph Exp $ +$Id: gconst.scm,v 4.27 2001/12/20 18:06:22 cph Exp $ Copyright (c) 1987-2001 Massachusetts Institute of Technology @@ -167,7 +167,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA INTERRUPT-MASK/TIMER-OK LAMBDA-TAG:FLUID-LET LAMBDA-TAG:LET - LAMBDA-TAG:MAKE-ENVIRONMENT LAMBDA-TAG:UNNAMED LEXICAL-ASSIGNMENT LEXICAL-REFERENCE -- 2.25.1