Change BKPT back to a macro so it can put the REPL in the appropriate

environment.

diff --git a/v7/src/runtime/error.scm b/v7/src/runtime/error.scm
index d918ddf35b966e8c813f70973ffcb7c2bb6e5498..873448da25d612ad40fcd2329cb015a50dd40b82 100644 (file)
--- a/v7/src/runtime/error.scm
+++ b/v7/src/runtime/error.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/error.scm,v 14.30 1992/02/25 22:54:36 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/error.scm,v 14.31 1992/04/06 05:49:26 cph Exp $
 
 Copyright (c) 1988-92 Massachusetts Institute of Technology
 
@@ -456,7 +456,9 @@ MIT in each case. |#
       (if (let ((types break-on-signals-types))
            (and (not (null? types))
                 (intersect-generalizations? types)))
-         (bkpt "BKPT entered because of BREAK-ON-SIGNALS:" condition))
+         (breakpoint-procedure 'INHERIT
+                               "BKPT entered because of BREAK-ON-SIGNALS:"
+                               condition))
       (do ((frames dynamic-handler-frames (cdr frames)))
          ((null? frames))
        (if (let ((types (caar frames)))

diff --git a/v7/src/runtime/rep.scm b/v7/src/runtime/rep.scm
index e4906e66ba94ac0b1bc805dd977902b57f24ca39..b27edf30a97d233b7183632c2c84414b3f040839 100644 (file)
--- a/v7/src/runtime/rep.scm
+++ b/v7/src/runtime/rep.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/rep.scm,v 14.26 1992/03/25 21:57:48 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/rep.scm,v 14.27 1992/04/06 05:49:12 cph Exp $
 
 Copyright (c) 1988-92 Massachusetts Institute of Technology
 
@@ -702,11 +702,8 @@ MIT in each case. |#
                       (if (default-object? message) "Break!" message)
                       "break>"))))
 
-(define (bkpt datum . arguments)
-  (apply breakpoint-procedure 'INHERIT datum arguments))
-
 (define (breakpoint-procedure environment datum . arguments)
-  ;; For upwards compatibility.
+  ;; BKPT expands into this.
   (with-simple-restart 'CONTINUE "Return from BKPT."
     (lambda ()
       (read-eval-print environment
@@ -714,7 +711,7 @@ MIT in each case. |#
                        (lambda (port)
                          (newline port)
                          (format-error-message datum arguments port)))
-                      "break>"))))
+                      "bkpt>"))))
 
 (define (ve environment)
   (read-eval-print (->environment environment) false 'INHERIT))

diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index 5bda388fa18dd3ea1d6b8b3e5d3738060870af59..5adb318e3d30d4d4fa6d045f42ed37ecc57efcfb 100644 (file)
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/runtime.pkg,v 14.142 1992/04/02 07:53:22 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/runtime.pkg,v 14.143 1992/04/06 05:49:19 cph Exp $
 
 Copyright (c) 1988-92 Massachusetts Institute of Technology
 
@@ -1672,7 +1672,6 @@ MIT in each case. |#
          abort->nearest
          abort->previous
          abort->top-level
-         bkpt
          breakpoint
          breakpoint-procedure
          cmdl-interrupt/abort-nearest

diff --git a/v8/src/runtime/runtime.pkg b/v8/src/runtime/runtime.pkg
index d720464416c3dba58edcc2d7d9dc3c36958e6ced..bf92f22986378a2f1504425d70b1cb5a838fbe65 100644 (file)
--- a/v8/src/runtime/runtime.pkg
+++ b/v8/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/runtime.pkg,v 14.142 1992/04/02 07:53:22 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/runtime.pkg,v 14.143 1992/04/06 05:49:19 cph Exp $
 
 Copyright (c) 1988-92 Massachusetts Institute of Technology
 
@@ -1672,7 +1672,6 @@ MIT in each case. |#
          abort->nearest
          abort->previous
          abort->top-level
-         bkpt
          breakpoint
          breakpoint-procedure
          cmdl-interrupt/abort-nearest