Skip to content
Snippets Groups Projects
Commit 4e74ef84 authored by toy's avatar toy
Browse files

From Eric Marsden (additional change in main.lisp noted by Christophe

Rhodes):

  * When you load or execute code that didn't compile correctly, you
    should get a PROGRAM-ERROR rather than a generic ERROR.
parent 946539f4
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain. ;;; Carnegie Mellon University, and has been placed in the public domain.
;;; ;;;
(ext:file-comment (ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ir1tran.lisp,v 1.129 2002/08/09 21:26:48 toy Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ir1tran.lisp,v 1.130 2002/08/12 16:08:13 toy Exp $")
;;; ;;;
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
...@@ -348,8 +348,9 @@ ...@@ -348,8 +348,9 @@
(defmacro ir1-error-bailout (defmacro ir1-error-bailout
((start cont form ((start cont form
&optional &optional
(proxy ``(error "Execution of a form compiled with errors:~% ~S" (proxy ``(error 'simple-program-error
',,form))) :format-control "Execution of a form compiled with errors:~% ~S"
:format-arguments (list ',,form))))
&body body) &body body)
(let ((skip (gensym))) (let ((skip (gensym)))
`(block ,skip `(block ,skip
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain. ;;; Carnegie Mellon University, and has been placed in the public domain.
;;; ;;;
(ext:file-comment (ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/main.lisp,v 1.125 2002/08/09 21:21:15 toy Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/main.lisp,v 1.126 2002/08/12 16:08:14 toy Exp $")
;;; ;;;
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
...@@ -1082,8 +1082,9 @@ ...@@ -1082,8 +1082,9 @@
(*compiler-error-bailout* (*compiler-error-bailout*
#'(lambda () #'(lambda ()
(convert-and-maybe-compile (convert-and-maybe-compile
`(error "Execution of a form compiled with errors:~% ~S" `(error 'simple-program-error
',form) :format-control "Execution of a form compiled with errors:~% ~S"
:format-arguments (list ',form))
path) path)
(throw 'process-form-error-abort nil)))) (throw 'process-form-error-abort nil))))
(if (atom form) (if (atom form)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment