Changeset 14012

Timestamp:

07/19/12 19:41:41 (8 years ago)

Author:

rschlatte

Message:

Enable usage of method combinations with options

• e.g., (defgeneric foo (x) (:method-combination and :most-specific-last))

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• clos.lisp (modified) (2 diffs)
• print-object.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/clos.lisp

@@ -902 +902 @@
 
 (define-primordial-class method-combination (metaobject)
-  ((sys::name :initform nil)
+  ((sys::name :initarg :name :initform nil)
    (sys::%documentation :initarg :documentation :initform nil)
    (options :initarg :options :initform nil)))
 
 (define-primordial-class short-method-combination (method-combination)
-  (operator
-   identity-with-one-argument))
+  ((operator :initarg :operator)
+   (identity-with-one-argument :initarg :identity-with-one-argument)))
 
 (define-primordial-class long-method-combination (method-combination)
-  (sys::lambda-list
-   method-group-specs
-   args-lambda-list
-   generic-function-symbol
-   function
-   arguments
-   declarations
-   forms))
+  ((sys::lambda-list :initarg :lambda-list)
+   (method-group-specs :initarg :method-group-specs)
+   (args-lambda-list :initarg :args-lambda-list)
+   (generic-function-symbol :initarg :generic-function-symbol)
+   (function :initarg :function)
+   (arguments :initarg :arguments)
+   (declarations :initarg :declarations)
+   (forms :initarg :forms)))
 
 (define-primordial-class standard-accessor-method (standard-method)
@@ -1034 +1034 @@
           (getf (cddr whole) :operator name)))
     `(progn
-       ;; Class short-method-combination is defined in StandardClass.java.
        (let ((instance (std-allocate-instance
                         (find-class 'short-method-combination))))

trunk/abcl/src/org/armedbear/lisp/print-object.lisp

@@ -80 +80 @@
   (print-unreadable-object (method-combination stream :identity t)
     (format stream "~A ~S" (class-name (class-of method-combination))
-            (mop::method-combination-name method-combination)))
+            (ignore-errors (mop::method-combination-name method-combination))))
   method-combination)