Changeset 9666 for release/1.2/source

Timestamp:

Jun 3, 2008, 5:54:15 PM (11 years ago)

Author:

gz

Message:

Propagate r9328 to here

File:

• release/1.2/source/compiler/nx0.lisp (modified) (4 diffs)

release/1.2/source/compiler/nx0.lisp

@@ -1264 +1264 @@
        (,handler (catch 'program-error-handler (return-from ,tag (progn ,@body)))))))
 
+(defun runtime-program-error-form (c)
+  `(signal-program-error "Invalid program: ~a" ,(princ-to-string c)))
+
 (defun nx1-compile-lambda (name lambda-form &optional
                                  (p (make-afunc))
@@ -1320 +1323 @@
     (with-program-error-handler
         (lambda (c)
-          (setf (afunc-acode p) (nx1-lambda () `((error ',c)) nil)))
+          (setf (afunc-acode p) (nx1-lambda () `(,(runtime-program-error-form c)) nil)))
       (handler-bind ((warning (lambda (c)
                                 (nx1-whine :program-error c)
@@ -1332 +1335 @@
                                       (throw 'program-error-handler c))))
         (multiple-value-bind (body decls)
-            (with-program-error-handler (lambda (c) `(error ',c))
+            (with-program-error-handler (lambda (c) (runtime-program-error-form c))
               (parse-body (%cddr lambda-form) *nx-lexical-environment* t))
           (setf (afunc-acode p) (nx1-lambda (%cadr lambda-form) body decls)))))
@@ -1618 +1621 @@
   (let ((form (with-program-error-handler
                   (lambda (c)
-                    (nx-transform `(error ',c) env))
+                    (nx-transform (runtime-program-error-form c) env))
                 (nx-transform original env))))
     (nx1-transformed-form form env)))