Changeset 282

Timestamp:

Jan 13, 2004, 5:01:36 PM (21 years ago)

Author:

Gary Byers

Message:

PARSE-ERROR isn't a STREAM-ERROR. Tail-call ERROR from SIGNAL-PROGRAM-ERROR, to keep it out of backtrace. UNDEFINED-FUNCTION-CALL: lose FUNCTION-NAME slot,
use CELL-ERROR-NAME instead.

Location:

trunk/ccl/level-1

Files:

• l1-error-signal.lisp (modified) (1 diff)
• l1-error-system.lisp (modified) (4 diffs)

trunk/ccl/level-1/l1-error-signal.lisp

@@ -78 +78 @@
                  (call-special-operator-or-macro
                   (make-condition condition-name
-                                  :function-name (car errargs)
+                                  :name (car errargs)
                                   :function-arguments (cadr errargs)))
                  (sequence-index-type-error

trunk/ccl/level-1/l1-error-system.lisp

@@ -176 +176 @@
 
 (defun signal-program-error (string &rest args)
-  (error (make-condition 'simple-program-error
-                         :format-control (if (fixnump string) (%rsc-string string) string)
-                         :format-arguments args)))
+  (let* ((e #'error))
+    (funcall e
+             (make-condition 'simple-program-error
+                             :format-control (if (fixnump string) (%rsc-string string) string)
+                             :format-arguments args))))
 
 (define-condition simple-destructuring-error (simple-program-error))
@@ -327 +329 @@
 (define-condition stream-error (error)
   ((stream :initarg :stream :reader stream-error-stream)))
-(define-condition parse-error (stream-error) ())
+(define-condition parse-error (error) ())
+(define-condition parse-integer-not-integer-string (parse-error)
+  ((string :initarg :string))
+  (:report (lambda (c s)
+             (format s "Not an integer string: ~s" (slot-value c 'string)))))
+
 (define-condition reader-error (parse-error) ())
 (define-condition end-of-file (stream-error) ()
@@ -383 +390 @@
   ((error-type :initform "Undefined function")))
 (define-condition undefined-function-call (control-error undefined-function)
-  ((function-name :initarg :function-name :reader undefined-function-call-name)
-   (function-arguments :initarg :function-arguments :reader undefined-function-call-arguments))
+  ((function-arguments :initarg :function-arguments :reader undefined-function-call-arguments))
   (:report (lambda (c s) (format s "Undefined function ~S called with arguments ~:S ."
-                                 (undefined-function-call-name c)
+                                 (cell-error-name c)
                                  (undefined-function-call-arguments c)))))
 
 (define-condition call-special-operator-or-macro (undefined-function-call)
   ()
-  (:report (lambda (c s) (format s "Special operator or global macro-function ~s can't be FUNCALLed or APPLYed" (undefined-function-call-name c)))))
+  (:report (lambda (c s) (format s "Special operator or global macro-function ~s can't be FUNCALLed or APPLYed" (cell-error-name c)))))
 
   
@@ -823 +829 @@
     (dbg function-name))   ; user should never see this
   (let ((condition (make-condition 'undefined-function-call
-                                   :function-name function-name
+                                   :name function-name
                                    :function-arguments args)))
     (restart-case (%error condition nil frame-ptr)