Changeset 274

Timestamp:

Jan 13, 2004, 4:50:52 PM (21 years ago)

Author:

Gary Byers

Message:

DEFCLASS: allow NIL as slot :type, expand into (new)
ENSURE-CLASS-FOR-DEFCLASS. Signal a PROGRAM-ERROR in
DEFINE-METHOD-COMBINATION. Can't have a macro named CL:METHOD, so
change its name to CCL::REFERENCE-METHOD for the time being.

File:

• trunk/ccl/lib/macros.lisp (modified) (5 diffs)

trunk/ccl/lib/macros.lisp

@@ -1626 +1626 @@
                         (duplicate-options slot)
                         (setq type-p t))
-                      (when (null (cadr options)) (signal-program-error "Illegal options ~S" options))
+                      ;(when (null (cadr options)) (signal-program-error "Illegal options ~S" options))
                       (setq type (cadr options)))
                      (:initform
@@ -1672 +1672 @@
                 ,@(mapcar #'(lambda (s) `(note-function-info ',s nil ,env))
                           signatures)))
-            (progn
-              (record-source-file ',class-name 'class)
-              (ensure-class ',class-name
+              (ensure-class-for-defclass ',class-name
                             :direct-superclasses ',direct-superclasses
                             :direct-slots ,`(list ,@direct-slot-specs)
-                            ,@other-options))))))))
+                            ,@other-options)))))))
 
 (defmacro define-method-combination (name &rest rest &environment env)
@@ -1711 +1709 @@
         options methods option-keywords method-class)
     (flet ((bad-option (o)
-             (error "Bad option: ~s to ~s." o 'defgeneric)))
+             (signal-program-error "Bad option: ~s to ~s." o 'defgeneric)))
       (dolist (o options-and-methods)
         (let ((keyword (car o))
@@ -1718 +1716 @@
             (push `(,defmethod ,function-name ,@(%cdr o)) methods)
             (cond ((memq keyword (prog1 option-keywords (push keyword option-keywords)))
-                   (error "Duplicate option: ~s to ~s" keyword 'defgeneric))
+                   (signal-program-error "Duplicate option: ~s to ~s" keyword 'defgeneric))
                   ((eq keyword :method-name)    ; used by generic-flet
                    (if function-name (bad-option o))
@@ -2441 +2439 @@
 
 ; I wanted to call this ":method"
-(defmacro method (gf &rest qualifiers-and-specializers)
+(defmacro reference-method (gf &rest qualifiers-and-specializers)
   (let ((qualifiers (butlast qualifiers-and-specializers))
         (specializers (car (last qualifiers-and-specializers))))