changeset 237:be5cd4c5ecc2

remove redundent superclass from a constituent class

Ignore-this: 158b4e6ccccbb6813ae62265e9f4e147

darcs-hash:20100404213647-16a00-806286cc3ea93c4a2cbfb8ae03df5c2d5feb991f.gz

committer: Jamie Forth <[e-mail]>

--- a/base/classes.lisp	Thu Feb 24 11:23:18 2011 +0000
+++ b/base/classes.lisp	Thu Feb 24 11:23:18 2011 +0000
@@ -80,6 +80,7 @@
 
 (defclass event (anchored-period) ()
   (:documentation "Notelike object"))
+
 (defclass linked-event (amuse-object)
   ((composition :reader composition
 		:writer %set-composition
@@ -99,27 +100,34 @@
 
 (defclass pitched-event (event pitch) ()
   (:documentation "Event with pitch information"))
+
 (defclass standard-pitched-event (pitched-event
 				  standard-anchored-period) ()
   (:documentation "Event with pitch information"))
+
 (defclass chromatic-pitched-event (pitched-event chromatic-pitch) ()
   (:documentation "Event with chromatic pitch information"))
+
 (defclass standard-chromatic-pitched-event (chromatic-pitched-event
 					    standard-anchored-period) ()
   (:documentation "Event with chromatic pitch information and
   standard-period"))
+
 (defclass diatonic-pitched-event (pitched-event diatonic-pitch) ()
   (:documentation "Event with diatonic pitch information"))
+
 (defclass standard-diatonic-pitched-event (diatonic-pitched-event
 					   standard-anchored-period) ()
   (:documentation "Event with diatonic pitch information and
   standard-period"))
+
 (defclass percussive-event (event) ()
   (:documentation "Unpitched percussion Event. There's an issue
 with this name - is there a reason why this is unpitched
 necessarily, or why I'm not counting piano, etc in this? Perhaps
 what I mean is that it should be renamed unpitched-event?
 Actually, is this necessary? Isn't this just an event?"))
+
 (defclass standard-percussive-event (event standard-anchored-period) ()
   (:documentation "Unpitched percussion Event. There's an issue
 with this name - is there a reason why this is unpitched
@@ -205,6 +213,7 @@
 
 (defclass constituent (anchored-period) ()
   (:documentation "Base class for constituents"))
+
 (defclass standard-constituent (constituent standard-anchored-period) ()
   (:documentation "Base class for constituents using standard
   time representation"))
@@ -213,14 +222,13 @@
   ;; this won't work if lisp implementation doesn't support extensible
   ;; sequences.
   ())
+
 (defclass standard-time-ordered-constituent (time-ordered-constituent
-					     standard-constituent
-					     list-slot-sequence)
+					     standard-constituent)
   ;; this won't work if lisp implementation doesn't support extensible
   ;; sequences.
   ())
 
-
 (defclass composition (time-ordered-constituent) ()
   (:documentation "Base class for compositions"))
 
@@ -228,9 +236,11 @@
 				standard-time-ordered-constituent) ()
   (:documentation "Base class for compositions using standard
   time representation"))
+
 (defclass monody (composition) ()
   (:documentation "Class for indicating suitability for analysis
   requiring a monody"))
+
 (defclass standard-monody (monody standard-composition) ())
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;