Changeset 882

Timestamp:

Sep 25, 2004, 2:36:06 PM (20 years ago)

Author:

Gary Byers

Message:

DEFCLASS macro: handle :DOCUMENTATION as a single option, if provided.
Don't default superclasses (from Tim Moore.). Pass class name, not class,
in :METACLASS option.

Location:

trunk/ccl

Files:

• lib/macros.lisp (modified) (4 diffs)
• lisp-kernel/darwin/Makefile (modified) (1 diff)

trunk/ccl/lib/macros.lisp

@@ -1588 +1588 @@
                                  (typep (cadr option) 'symbol))
                       (illegal-option option))
-                    `(:metaclass (find-class ',(cadr option))))
+                    `(:metaclass  ',(cadr option)))
+                   (:documentation
+                    `(:documentation ',(cadr option)))
                    (t
                     (list `',option-name `',(cdr option))))))
@@ -1657 +1659 @@
                         (duplicate-options slot)
                         (setq documentation-p t))
-                      (setq documentation (require-type (cadr options) 'string)))
+                      (setq documentation (cadr options)))
                      (t
                       (let* ((pair (or (assq (car options) other-options)
@@ -1670 +1672 @@
                    ,@(when writers `(:writers ',writers))
                    ,@(when type-p `(:type ',type))
-                   ,@(when documentation `(:documentation ,documentation))
+                   ,@(when documentation-p `(:documentation ,documentation))
                    ,@(mapcan #'(lambda (opt)
                                  `(',(car opt) ',(cdr opt))) other-options)))))
-        (let* ((direct-superclasses (or superclasses '(standard-object)))
+        (let* ((direct-superclasses superclasses)
                (direct-slot-specs (mapcar #'canonicalize-slot-spec slots))
                (other-options (apply #'append (mapcar #'canonicalize-defclass-option class-options ))))
@@ -1728 +1730 @@
                         (memq keyword (prog1 option-keywords (push keyword option-keywords))))             
                    (signal-program-error "Duplicate option: ~s to ~s" keyword 'defgeneric))
-                  ((eq keyword :method-name)    ; used by generic-flet
-                   (if function-name (bad-option o))
-                   (setq function-name (cadr o)))
                   ((eq keyword :method-combination)
                    (unless (symbolp (cadr o))

trunk/ccl/lisp-kernel/darwin/Makefile

@@ -52 +52 @@
 CDEFINES = -DDARWIN $(BROKEN_PREPROCESSOR_WORKAROUND) -DOPENMCL_MAJOR_VERSION=$(OPENMCL_MAJOR_VERSION) -DOPENMCL_MINOR_VERSION=$(OPENMCL_MINOR_VERSION)
 CDEBUG = -g
-COPT = -O2
+COPT = #-O2
 
 .s.o: