Changeset 9467

Timestamp:

May 13, 2008, 4:38:06 PM (17 years ago)

Author:

marco baringer

Message:

Make define-condition's slot argument required (as per the hyperspec)

Location:

branches/working-0711/ccl

Files:

• level-1/l1-error-system.lisp (modified) (7 diffs)
• lib/macros.lisp (modified) (1 diff)

branches/working-0711/ccl/level-1/l1-error-system.lisp

@@ -60 +60 @@
                        (print-not-readable-stream c))))))
 
-(define-condition simple-warning (simple-condition warning))
+(define-condition simple-warning (simple-condition warning) ())
 
 (define-condition compiler-warning (warning)
@@ -71 +71 @@
   (:report report-compiler-warning))
 
-(define-condition style-warning (compiler-warning))
-(define-condition undefined-function-reference (style-warning))
-(define-condition macro-used-before-definition (compiler-warning))
-(define-condition invalid-arguments (style-warning))
-(define-condition invalid-arguments-global (style-warning))
-
-(define-condition simple-error (simple-condition error))
-
-(define-condition simple-storage-condition (simple-condition storage-condition))
-(define-condition stack-overflow-condition (simple-storage-condition))
+(define-condition style-warning (compiler-warning) ())
+(define-condition undefined-function-reference (style-warning) ())
+(define-condition macro-used-before-definition (compiler-warning) ())
+(define-condition invalid-arguments (style-warning) ())
+(define-condition invalid-arguments-global (style-warning) ())
+
+(define-condition simple-error (simple-condition error) ())
+
+(define-condition simple-storage-condition (simple-condition storage-condition) ())
+(define-condition stack-overflow-condition (simple-storage-condition) ())
 
 (define-condition invalid-memory-access (storage-condition)
@@ -176 +176 @@
                      (type-error-expected-type c)))))
 
-(define-condition simple-type-error (simple-condition type-error))
-
-
-
-(define-condition program-error (error))
+(define-condition simple-type-error (simple-condition type-error) ())
+
+
+
+(define-condition program-error (error) ())
 (define-condition simple-program-error (simple-condition program-error)
   ((context :initarg :context :reader simple-program-error-context :initform nil)))
@@ -191 +191 @@
                              :format-arguments args))))
 
-(define-condition simple-destructuring-error (simple-program-error))
+(define-condition simple-destructuring-error (simple-program-error) ())
 
 (define-condition wrong-number-of-arguments (program-error)
@@ -199 +199 @@
   (:report report-argument-mismatch))
        
-(define-condition too-many-arguments (wrong-number-of-arguments))
-
-(define-condition too-few-arguments (wrong-number-of-arguments))
+(define-condition too-many-arguments (wrong-number-of-arguments) ())
+
+(define-condition too-few-arguments (wrong-number-of-arguments) ())
 
 (defun report-argument-mismatch (c s)
@@ -242 +242 @@
              (format nil "~a" c)))))
 
-(define-condition control-error (error))
+(define-condition control-error (error) ())
 
 (define-condition cant-throw-error (control-error)
@@ -479 +479 @@
                          operands))))))
 
-(define-condition division-by-zero (arithmetic-error))
+(define-condition division-by-zero (arithmetic-error) ())
   
-(define-condition floating-point-underflow (arithmetic-error))
-(define-condition floating-point-overflow (arithmetic-error))
-(define-condition floating-point-inexact (arithmetic-error))
-(define-condition floating-point-invalid-operation (arithmetic-error))
+(define-condition floating-point-underflow (arithmetic-error) ())
+(define-condition floating-point-overflow (arithmetic-error) ())
+(define-condition floating-point-inexact (arithmetic-error) ())
+(define-condition floating-point-invalid-operation (arithmetic-error) ())
 
 (define-condition compiler-bug (simple-error)

branches/working-0711/ccl/lib/macros.lisp

@@ -2060 +2060 @@
 ;;; which tests *print-escape* ?  Scary if so ...
 
-(defmacro define-condition (name (&rest supers) &optional ((&rest slots)) &body options)
+(defmacro define-condition (name (&rest supers) (&rest slots) &body options)
   "DEFINE-CONDITION Name (Parent-Type*) (Slot-Spec*) Option*
    Define NAME as a condition type. This new type inherits slots and its