From 521b9f31b1c94979399c3dfbec56bc30bf3f2e44 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Fri, 7 Sep 1990 18:39:51 +0000
Subject: [PATCH] Eliminate uses of `entity' datatype.  Use new `apply-hook'
 datatype instead.

---
 v7/src/edwin/autold.scm | 26 ++++++++++++++------------
 v7/src/edwin/decls.scm  |  3 +--
 v7/src/edwin/ed-ffi.scm |  3 +--
 v7/src/edwin/edwin.pkg  |  3 +--
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/v7/src/edwin/autold.scm b/v7/src/edwin/autold.scm
index b0622f75b..15c7cdc0f 100644
--- a/v7/src/edwin/autold.scm
+++ b/v7/src/edwin/autold.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/autold.scm,v 1.47 1989/08/14 09:14:45 cph Exp $
+;;;	$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/autold.scm,v 1.48 1990/09/07 18:39:34 cph Rel $
 ;;;
 ;;;	Copyright (c) 1986, 1989 Massachusetts Institute of Technology
 ;;;
@@ -49,23 +49,25 @@
 ;;;; Definitions
 
 (define (make-autoloading-procedure library-name get-procedure)
-  (define entity
-    (make-entity (lambda arguments
-		   ((ref-command load-library) library-name 'NO-WARN)
-		   (let ((procedure (get-procedure)))
-		     (set-entity-procedure! entity procedure)
-		     (apply procedure (cdr arguments))))
-		 (cons autoloading-procedure-tag library-name)))
-  entity)
+  (letrec ((apply-hook
+	    (make-apply-hook
+	     (lambda arguments
+	       ((ref-command load-library) library-name 'NO-WARN)
+	       (let ((procedure (get-procedure)))
+		 (set-apply-hook-procedure! apply-hook procedure)
+		 (apply procedure arguments)))
+	     (cons autoloading-procedure-tag library-name))))
+    apply-hook))
 
 (define autoloading-procedure-tag "autoloading-procedure-tag")
 
 (define (autoloading-procedure? object)
-  (and (entity? object)
-       (eq? autoloading-procedure-tag (car (entity-extra object)))))
+  (and (apply-hook? object)
+       (eq? autoloading-procedure-tag (car (apply-hook-extra object)))))
 
 (define-integrable (autoloading-procedure/library-name procedure)
-  (cdr (entity-extra procedure)))
+  (cdr (apply-hook-extra procedure)))
+
 (define (define-autoload-procedure name package library-name)
   (let ((environment (->environment package)))
     (local-assignment environment
diff --git a/v7/src/edwin/decls.scm b/v7/src/edwin/decls.scm
index 416fdb3c5..cc8c2d125 100644
--- a/v7/src/edwin/decls.scm
+++ b/v7/src/edwin/decls.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/decls.scm,v 1.11 1990/08/31 20:11:55 markf Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/decls.scm,v 1.12 1990/09/07 18:39:41 cph Exp $
 
 Copyright (c) 1989 Massachusetts Institute of Technology
 
@@ -87,7 +87,6 @@ MIT in each case. |#
 	      "comtab"
 	      "cterm"
 	      "display"
-	      "entity"
 	      "image"
 	      "macros"
 	      "make"
diff --git a/v7/src/edwin/ed-ffi.scm b/v7/src/edwin/ed-ffi.scm
index 72f6a5dc9..4bf82582c 100644
--- a/v7/src/edwin/ed-ffi.scm
+++ b/v7/src/edwin/ed-ffi.scm
@@ -71,8 +71,7 @@
 	       class-syntax-table)
     ("edtstr"  (edwin)
 	       edwin-syntax-table)
-    ("entity"  (edwin)
-	       syntax-table/system-internal)    ("evlcom"  (edwin)
+    ("evlcom"  (edwin)
 	       edwin-syntax-table)
     ("filcom"  (edwin)
 	       edwin-syntax-table)
diff --git a/v7/src/edwin/edwin.pkg b/v7/src/edwin/edwin.pkg
index 71a27042f..d9fbda9b1 100644
--- a/v7/src/edwin/edwin.pkg
+++ b/v7/src/edwin/edwin.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/edwin.pkg,v 1.15 1990/08/31 20:18:01 markf Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/edwin.pkg,v 1.16 1990/09/07 18:39:51 cph Exp $
 
 Copyright (c) 1989 Massachusetts Institute of Technology
 
@@ -39,7 +39,6 @@ MIT in each case. |#
 (define-package (edwin)
   (files "utils"
 	 "nvector"
-	 "entity"
 	 "ring"
 	 "strtab"
 	 "strpad"
-- 
2.25.1