Mercurial > hg > amuse

changeset 125:c179481a7bd0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
base/: amuse-object conflict resolution darcs-hash:20070730140034-c0ce4-db16a854a6f284121d3b2cdb1d46560a0377cc42.gz
author Marcus Pearce <m.pearce@gold.ac.uk>
date Mon, 30 Jul 2007 15:00:34 +0100
parents b0a1760ab0dd
children efaa02d21690
files base/classes.lisp
diffstat 1 files changed, 4 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/base/classes.lisp	Mon Jul 30 14:36:02 2007 +0100
+++ b/base/classes.lisp	Mon Jul 30 15:00:34 2007 +0100
@@ -2,18 +2,12 @@
 
 ;; top-level amuse object 
 
-(defclass constituent (anchored-period) ())
-(defclass time-ordered-constituent (constituent list-slot-sequence)
-  ;; this won't work if lisp implementation doesn't support extensible
-  ;; sequences.
-  ())
-(defclass composition (time-ordered-constituent) ())
-(defclass monody (composition) ())
+(defclass amuse-object () ())
 
 ;; types of information-specifiers
 
-(defclass identifier () ()) ;; for composition specification
-(defclass moment-designator () ()
+(defclass identifier (amuse-object) ()) ;; for composition specification
+(defclass moment-designator (amuse-object) ()
   (:documentation "Object indicating a point in time"))
 (defclass period-designator (amuse-object) ()
   (:documentation "Object indicating a region of time"))
@@ -124,3 +118,4 @@
   ())
 (defclass composition (time-ordered-constituent) ())
 (defclass monody (composition) ())
+