# HG changeset patch
# User j.forth <j.forth@gold.ac.uk>
# Date 1243183276 -3600
# Node ID c18f795f4463a9d36a7405c6de91d5d0b8f9dfd2
# Parent  54d79a2c82d27814589e3142bd443f1b546c3b47
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

diff -r 54d79a2c82d2 -r c18f795f4463 amuse.asd
--- 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
diff -r 54d79a2c82d2 -r c18f795f4463 base/generics.lisp
--- 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"))
 
diff -r 54d79a2c82d2 -r c18f795f4463 base/methods.lisp
--- 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)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;