From 4a3983fd1da9851fabb209272a06c37b3eddaecc Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sat, 20 Apr 1991 06:10:10 +0000
Subject: [PATCH] Can't integrate scode-eval any longer, since it's now a
 compound procedure.  This was overlooked by accident because "usicon" used
 scode-constant? to test whether the constants in "gconst" were reasonable --
 and this predicate returns true for compiled procedures. Now the predicate
 used is something more discriminating, which should not permit unreasonable
 values in the .bin file.

---
 v7/src/sf/gconst.scm |  5 ++---
 v7/src/sf/usicon.scm | 26 +++++++++++++++++++++++---
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/v7/src/sf/gconst.scm b/v7/src/sf/gconst.scm
index 603a95817..dab0582db 100644
--- a/v7/src/sf/gconst.scm
+++ b/v7/src/sf/gconst.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/gconst.scm,v 4.9 1990/10/16 21:06:53 cph Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/gconst.scm,v 4.10 1991/04/20 06:09:48 cph Exp $
 
-Copyright (c) 1987, 1989, 1990 Massachusetts Institute of Technology
+Copyright (c) 1987-91 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -204,7 +204,6 @@ MIT in each case. |#
     PROCESS-TIME-CLOCK
     READ-BITS!
     REAL-TIME-CLOCK
-    SCODE-EVAL
     SET-CAR!
     SET-CDR!
     SET-CELL-CONTENTS!
diff --git a/v7/src/sf/usicon.scm b/v7/src/sf/usicon.scm
index 75903f202..be231852d 100644
--- a/v7/src/sf/usicon.scm
+++ b/v7/src/sf/usicon.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/usicon.scm,v 4.1 1988/06/13 12:30:46 cph Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/usicon.scm,v 4.2 1991/04/20 06:10:10 cph Exp $
 
-Copyright (c) 1987 Massachusetts Institute of Technology
+Copyright (c) 1987-91 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -52,7 +52,27 @@ MIT in each case. |#
 	(map (lambda (name)
 	       (let ((object
 		      (lexical-reference system-global-environment name)))
-		 (if (not (scode-constant? object))
+		 (if (not (memq (microcode-type/code->name
+				 (object-type object))
+				'(BIGNUM
+				  CHARACTER
+				  FIXNUM
+				  FLONUM
+				  INTERNED-SYMBOL
+				  NULL
+				  PAIR
+				  PRIMITIVE
+				  QUAD
+				  RATNUM
+				  RECNUM
+				  RETURN-CODE
+				  STRING
+				  TRIPLE
+				  TRUE
+				  UNINTERNED-SYMBOL
+				  VECTOR
+				  VECTOR-16B
+				  VECTOR-1B)))
 		     (error "USUAL-INTEGRATIONS: not a constant" name))
 		 (constant->integration-info object)))
 	     usual-integrations/constant-names))
-- 
2.25.1