Mercurial > hg > amuse
changeset 193:c18f795f4463
rollback the amuse.asd generics/classes dependency fix
Ignore-this: be4e0351d31f24f5348cc8dc434477dc
Fix properly this time by moving the specialized get-constituents method from generics to methods.
rolling back:
Wed Jan 23 15:55:34 GMT 2008 Jamie Forth <j.forth@gold.ac.uk>
* Fixed amuse.asd dependency - generics depends on classes.
M ./amuse.asd -2 +2
darcs-hash:20090524164116-16a00-2b561eab1a5829a251eb5e9b40357945af13e6a6.gz
| author | j.forth <j.forth@gold.ac.uk> |
|---|---|
| date | Sun, 24 May 2009 17:41:16 +0100 |
| parents | 54d79a2c82d2 |
| children | 548f42fb42f5 |
| files | amuse.asd base/generics.lisp base/methods.lisp |
| diffstat | 3 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/amuse.asd Sun May 24 16:22:50 2009 +0100 +++ b/amuse.asd Sun May 24 17:41:16 2009 +0100 @@ -8,9 +8,9 @@ ((:file "package") (:file "conditions" :depends-on ("package")) (:file "extended-sequence" :depends-on ("package")) - (:file "classes" :depends-on ("package")) + (:file "classes" :depends-on ("package" "generics")) (:file "constructors" :depends-on ("package")) - (:file "generics" :depends-on ("package" "classes")) + (:file "generics" :depends-on ("package")) (:file "methods" :depends-on ("package" "generics" "classes")))) (:module utils :components
--- a/base/generics.lisp Sun May 24 16:22:50 2009 +0100 +++ b/base/generics.lisp Sun May 24 17:41:16 2009 +0100 @@ -7,7 +7,6 @@ identifier")) (defgeneric get-constituents (constituent-identifier) - (:method ((id composition-identifier)) (list (get-composition id))) (:documentation "Returns a list of constituents matching the criteria in identifier"))
--- a/base/methods.lisp Sun May 24 16:22:50 2009 +0100 +++ b/base/methods.lisp Sun May 24 17:41:16 2009 +0100 @@ -512,6 +512,8 @@ (declare (ignore length o initial-element initial-contents icp)) (%recompute-standard-composition-period (call-next-method))) +(defmethod get-constituents ((identifier composition-identifier)) + (list (get-composition identifier))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;