[Corelinux-clcvs] CVS: clfw/clfw MetaClass.hpp,1.1,1.2 MetaSpace.hpp,1.3,1.4 Ontology.hpp,1.4,1.5

[Frank V. C. <fr...@us...>]

Update of /cvsroot/corelinux/clfw/clfw
In directory slayer.i.sourceforge.net:/tmp/cvs-serv1096/clfw

Modified Files:
	MetaClass.hpp MetaSpace.hpp Ontology.hpp 
Log Message:
116737 Ontology work

Index: MetaClass.hpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/clfw/MetaClass.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MetaClass.hpp	2000/11/15 01:14:31	1.1
--- MetaClass.hpp	2000/11/15 04:33:01	1.2
***************
*** 41,45 ****
     /**
     MetaClass is the aggregate node information about a MetaType in
!    a Ontology, which for now is limited to hierarchical information
     */
  
--- 41,45 ----
     /**
     MetaClass is the aggregate node information about a MetaType in
!    a Ontology, which for now is limited to hierarchical information. 
     */
  
***************
*** 71,74 ****
--- 71,82 ----
                 bool  operator==( MetaClassCref ) const;
  
+                /// Return the object type for this meta class
+ 
+                CharCptr getTypeName( void ) const;
+ 
+                /// Return the name of the meta class
+ 
+                CharCptr getMetaName( void ) const;
+ 
                 /**
                 Retrieve the MetaType associated with this
***************
*** 115,118 ****
--- 123,152 ----
  
                 /**
+                Create a iterator over the parents of this composite
+                @return Iterator<MetaClassCptr> pointer
+                */
+ 
+       virtual  Iterator<MetaClassCptr>* createParentIterator( void )
+                         throw( InvalidCompositeException );
+ 
+                /**
+                Create a iterator over the data member declarations of
+                this composite
+                @return Iterator<MemberDescriptorCptr> pointer
+                */
+ 
+       virtual  Iterator<MemberDescriptorCptr> *createMemberIterator( void )
+                         throw( InvalidCompositeException );
+ 
+                /**
+                Create a iterator over the methods of
+                this composite
+                @return Iterator<DispatchDescriptorCptr> pointer
+                */
+ 
+       virtual  Iterator<DispatchDescriptorCptr> *createMethodIterator( void )
+                         throw( InvalidCompositeException );
+ 
+                /**
                 Destroy the iterator
                 @param Iterator<MetaClassCptr> pointer
***************
*** 122,140 ****
--- 156,202 ----
                          throw( InvalidCompositeException );
  
+                /**
+                Destroy the iterator
+                @param Iterator<MetaClassCptr> pointer
+                */
+ 
+       virtual  void  destroyIterator( Iterator<MemberDescriptorCptr> * )
+                         throw( InvalidCompositeException );
+ 
+                /**
+                Destroy the iterator
+                @param Iterator<MetaClassCptr> pointer
+                */
+ 
+       virtual  void  destroyIterator( Iterator<DispatchDescriptorCptr> * )
+                         throw( InvalidCompositeException );
     protected:
  
     private:
  
+                         /// Default constructor not used
+ 
                          MetaClass( void );
  
+                         /// Copy constructor not used
+ 
                          MetaClass( MetaClassCref );
  
+                         /// Used by Ontology to create a new class
+ 
                          MetaClass( MetaTypeCptr );
  
+                         /// Assignment operator not used
+ 
                 MetaClassRef   operator=( MetaClassCref );
  
     private:
  
+             /// The underlying MetaType
+ 
              MetaTypeCptr   theType;
+ 
+             /// The composite children
+ 
              Children       theChildren;
     };

Index: MetaSpace.hpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/clfw/MetaSpace.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** MetaSpace.hpp	2000/11/15 01:14:31	1.3
--- MetaSpace.hpp	2000/11/15 04:33:01	1.4
***************
*** 30,36 ****
     DECLARE_CLASS( Ontology );
     DECLARE_CLASS( MetaSpace );
  
!    /*!
!      \class MetaSpace manages domain Ontologies
     */
  
--- 30,37 ----
     DECLARE_CLASS( Ontology );
     DECLARE_CLASS( MetaSpace );
+    DECLARE_CLASS( MetaClass );
  
!    /**
!      MetaSpace manages domain Ontologies
     */
  
***************
*** 41,44 ****
--- 42,53 ----
  
                 /**
+                Given a meta type, get it's meta class
+                @param MetaType const pointer to type
+                @return MetaClass const pointer to class
+                */
+ 
+       static   MetaClassCptr  getClassForType( MetaTypeCptr );
+ 
+                /**
                 stores a metatype prior to initialize
                 @param MetaType const pointer to type
***************
*** 51,54 ****
--- 60,64 ----
                 @param char pointer to domain name, or if 
                 null return the corelinux domain
+                @return Ontology pointer
                 */
  
***************
*** 57,61 ****
                 /**
                 Initialize the MetaSpace, creating
!                namespace hierarchies as necessary
                 */
  
--- 67,71 ----
                 /**
                 Initialize the MetaSpace, creating
!                namespace ontologies as necessary
                 */
  
***************
*** 66,77 ****
--- 76,97 ----
  
     private:
+                      /// Default constructor not used
+ 
                       MetaSpace( void );
  
+                      /// Copy constructor not used
+ 
                       MetaSpace( MetaSpaceCref );
  
+                      /// Destructor not used
+ 
                       ~MetaSpace( void );
  
+                /// Assignment operator not used
+ 
                 MetaSpaceRef operator=( MetaSpaceCref );
  
+                /// Equality operator not used
+ 
                 bool  operator==( MetaSpaceCref ) const;
                    
***************
*** 79,84 ****
--- 99,112 ----
     private:
  
+                /// Transient types or ontologies
+ 
        static   VoidPtr     theHead;
+ 
+                /// Flag of initialization
+ 
        static   bool        theInitializedFlag;
+ 
+                /// The default (base) domain (corelinux)
+ 
        static   CharCptr    theDefaultDomain;
  

Index: Ontology.hpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/clfw/Ontology.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Ontology.hpp	2000/11/15 01:14:31	1.4
--- Ontology.hpp	2000/11/15 04:33:01	1.5
***************
*** 48,52 ****
  
     /**
!    An Ontology represents a domain semantic network lattice
     */
  
--- 48,52 ----
  
     /**
!    An Ontology represents a domain semantic network 
     */