Merge with BBN

diff --git a/v7/src/runtime/debug.scm b/v7/src/runtime/debug.scm
index 355d2278c2a35b54473f591dd144e0d1bf7181f3..a8ff6b61fd65c4a829ea62dceb56fd7195587b73 100644 (file)
--- a/v7/src/runtime/debug.scm
+++ b/v7/src/runtime/debug.scm
@@ -37,7 +37,7 @@
 
 ;;;; Debugger
 
-;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/debug.scm,v 1.84 1987/01/15 02:55:47 cph Exp $
+;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/debug.scm,v 13.40 1987/01/21 21:37:09 jinx Exp $
 
 (in-package debugger-package
 (declare (usual-integrations))

diff --git a/v7/src/runtime/equals.scm b/v7/src/runtime/equals.scm
index 79029e8ff13d0a36860771286864138a30576338..e305ae21abc4c51eea038e77ece1ed39838ba268 100644 (file)
--- a/v7/src/runtime/equals.scm
+++ b/v7/src/runtime/equals.scm
@@ -37,7 +37,7 @@
 
 ;;;; Equality
 
-;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/equals.scm,v 1.10 1986/12/16 19:36:12 cph Exp $
+;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/equals.scm,v 13.40 1987/01/21 21:37:25 jinx Exp $
 
 (declare (usual-integrations))
 \f

diff --git a/v7/src/runtime/gc.scm b/v7/src/runtime/gc.scm
index a51071ea7e79bc89bbcb08ca831c027029d945a5..4b8ffce1ed02fbae74ad60043c6fa591a05b1f1b 100644 (file)
--- a/v7/src/runtime/gc.scm
+++ b/v7/src/runtime/gc.scm
@@ -37,7 +37,7 @@
 
 ;;;; Garbage Collector
 
-;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/gc.scm,v 1.92 1987/01/05 17:25:05 cph Exp $
+;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/gc.scm,v 13.40 1987/01/21 21:38:21 jinx Exp $
 
 (declare (usual-integrations)
         (compilable-primitive-functions

diff --git a/v7/src/runtime/list.scm b/v7/src/runtime/list.scm
index 23475858cb9e436ba4a0a3dec687a1ee4fc650c0..0c3c4136f835d0e9552bb073ab3f96aeba7bf32e 100644 (file)
--- a/v7/src/runtime/list.scm
+++ b/v7/src/runtime/list.scm
@@ -37,7 +37,7 @@
 
 ;;;; List Operations
 
-;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/list.scm,v 1.64 1986/12/16 19:36:45 cph Exp $
+;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/list.scm,v 13.40 1987/01/21 21:39:50 jinx Exp $
 
 (declare (usual-integrations))
 \f

diff --git a/v7/src/runtime/numpar.scm b/v7/src/runtime/numpar.scm
index 43471e17b06898d4524a8aab1122c6cee3768b89..6fdc808738d528499333156a01cdff6f45b0f6c4 100644 (file)
--- a/v7/src/runtime/numpar.scm
+++ b/v7/src/runtime/numpar.scm
@@ -37,7 +37,7 @@
 
 ;;;; Number Parser
 
-;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/numpar.scm,v 1.6 1987/01/08 22:39:48 cph Exp $
+;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/numpar.scm,v 13.40 1987/01/21 21:40:27 jinx Exp $
 
 (declare (usual-integrations))
 \f

diff --git a/v7/src/runtime/output.scm b/v7/src/runtime/output.scm
index 5a701e147684bdf3eaaef61fc820c471ba5297d8..7f714c717b04fabe7cd835321ad5efb759ddce8a 100644 (file)
--- a/v7/src/runtime/output.scm
+++ b/v7/src/runtime/output.scm
@@ -37,7 +37,7 @@
 
 ;;;; Output
 
-;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/output.scm,v 1.33 1986/12/20 01:26:33 cph Exp $
+;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/output.scm,v 13.40 1987/01/21 21:40:41 jinx Exp $
 
 (declare (usual-integrations))
 \f

diff --git a/v7/src/runtime/rep.scm b/v7/src/runtime/rep.scm
index 78d6506df12fa850be87bd509ac922986cb35543..d7343faa0fb7373418439a4df0b4b69ec0ccbc79 100644 (file)
--- a/v7/src/runtime/rep.scm
+++ b/v7/src/runtime/rep.scm
@@ -99,12 +99,14 @@
     (set! current-state (driver current-state))
     (loop))
 
-  (push-command-hook startup-hook driver initial-state
-   (lambda (startup-hook driver initial-state each-time)
-     (fluid-let ((current-level (1+ current-level))
-                (previous-driver-hook nearest-driver-hook)
-                (nearest-driver-hook)
-                (current-state initial-state))
+  (fluid-let ((current-level (1+ current-level))
+             (previous-driver-hook nearest-driver-hook)
+             (nearest-driver-hook)
+             (current-state))
+    (push-command-hook
+     startup-hook driver initial-state
+     (lambda (startup-hook driver initial-state each-time)
+       (set! current-state initial-state)
        (restart startup-hook each-time))))))
 \f
 (set! with-rep-continuation
@@ -323,4 +325,5 @@
 (set! printer-history
       (history-reader rep-state-printer-history 'PRINTER-HISTORY))
 
+)
 )
\ No newline at end of file

diff --git a/v7/src/runtime/unpars.scm b/v7/src/runtime/unpars.scm
index 95acc7865e73a962c8e20efeae8cb3fcbdef9cc3..227beb7aaac6682ac246601b1814db3ac4315326 100644 (file)
--- a/v7/src/runtime/unpars.scm
+++ b/v7/src/runtime/unpars.scm
@@ -63,7 +63,7 @@
              (*unparse-string (access :write-string port))
              (*unparser-list-depth* 0)
              (*slashify* slashify))
-    (*unparse-object object)))
+    (*unparse-object-or-future object)))
 
 (define (*unparse-object-or-future object)
   (if (future? object)
@@ -297,4 +297,5 @@
 (define-type 'COMPLEX unparse-number)
 
 ;;; end UNPARSER-PACKAGE.
+))
 ))
\ No newline at end of file