Eliminate BKPT macro in favor of procedure. The macro used

(THE-ENVIRONMENT), which screwed the compiler.  The procedure uses the
environment of the first subproblem of the continuation of the call,
which in many cases is the same thing.

The effect of the old BKPT macro can still be achieved by writing

(breakpoint-procedure (the-environment) ...)

diff --git a/v7/src/runtime/macros.scm b/v7/src/runtime/macros.scm
index 167967ce72e6d3c7ec111d827462f0c54dc3f4fc..2c966a4a75343c4e6de5be0a1a0a7f58e882214d 100644 (file)
--- a/v7/src/runtime/macros.scm
+++ b/v7/src/runtime/macros.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: macros.scm,v 1.1 1994/12/09 03:32:03 adams Exp $
+$Id: macros.scm,v 1.2 1998/02/22 08:48:02 cph Exp $
 
-Copyright (c) 1988-1993 Massachusetts Institute of Technology
+Copyright (c) 1988-98 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -42,7 +42,6 @@ MIT in each case. |#
              (syntax-table-define system-global-syntax-table keyword
                transform))
            '(AND
-             BKPT
              CASE
              CONS-STREAM
              DEFINE-INTEGRABLE
@@ -53,7 +52,6 @@ MIT in each case. |#
              QUASIQUOTE
              SEQUENCE)
            (list transform/and
-                 transform/bkpt
                  transform/case
                  transform/cons-stream
                  transform/define-integrable
@@ -87,11 +85,6 @@ MIT in each case. |#
 
 (define (transform/sequence . actions)
   `(BEGIN . ,actions))
-
-(define (transform/bkpt datum . arguments)
-  `(,(make-absolute-reference 'BREAKPOINT-PROCEDURE) (THE-ENVIRONMENT)
-                                                    ,datum
-                                                    ,@arguments))
 \f
 ;;;; Quasiquote
 

diff --git a/v7/src/runtime/rep.scm b/v7/src/runtime/rep.scm
index 927bebcef89656700722f35001152d17c2ab36f9..7f126cfe765519eff9d47eee06815243640482de 100644 (file)
--- a/v7/src/runtime/rep.scm
+++ b/v7/src/runtime/rep.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: rep.scm,v 14.50 1994/08/15 20:11:55 cph Exp $
+$Id: rep.scm,v 14.51 1998/02/22 08:47:47 cph Exp $
 
-Copyright (c) 1988-93 Massachusetts Institute of Technology
+Copyright (c) 1988-98 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -811,11 +811,10 @@ MIT in each case. |#
 \f
 ;;;; Breakpoints
 
-(define (new-bkpt datum . arguments)
+(define (bkpt datum . arguments)
   (apply breakpoint-procedure 'CONTINUATION-ENVIRONMENT datum arguments))
 
 (define (breakpoint-procedure environment datum . arguments)
-  ;; BKPT expands into this.
   (signal-breakpoint #f
                     environment
                     (cmdl-message/active

diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index de926d3235f9a712189de7ef28e9f042b94ab374..e015e8288d682ed3600c8f50db941c4fa0455bce 100644 (file)
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.pkg,v 14.292 1998/02/16 23:00:35 cph Exp $
+$Id: runtime.pkg,v 14.293 1998/02/22 08:47:36 cph Exp $
 
 Copyright (c) 1988-98 Massachusetts Institute of Technology
 
@@ -1990,7 +1990,7 @@ MIT in each case. |#
          abort->nearest
          abort->previous
          abort->top-level
-         ;;bkpt
+         bkpt
          breakpoint
          breakpoint-procedure
          breakpoint/environment

diff --git a/v8/src/runtime/runtime.pkg b/v8/src/runtime/runtime.pkg
index c0defaf048dfedbdc41ef655eb863dc7b780a751..068b90e607024d4c5b06babfac1f44b44ef6adea 100644 (file)
--- a/v8/src/runtime/runtime.pkg
+++ b/v8/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.pkg,v 14.298 1998/02/16 23:00:23 cph Exp $
+$Id: runtime.pkg,v 14.299 1998/02/22 08:47:55 cph Exp $
 
 Copyright (c) 1988-98 Massachusetts Institute of Technology
 
@@ -1994,7 +1994,7 @@ MIT in each case. |#
          abort->nearest
          abort->previous
          abort->top-level
-         ;;bkpt
+         bkpt
          breakpoint
          breakpoint-procedure
          breakpoint/environment