[Corelinux-clcvs] CVS: clfw/src/testdrivers/exf1 examp1.cpp,1.23,1.24

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

Update of /cvsroot/corelinux/clfw/src/testdrivers/exf1
In directory slayer.i.sourceforge.net:/tmp/cvs-serv9356/src/testdrivers/exf1

Modified Files:
	examp1.cpp 
Log Message:
122619 Fatten MetaClass interface

Index: examp1.cpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/src/testdrivers/exf1/examp1.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** examp1.cpp	2000/11/15 23:07:21	1.23
--- examp1.cpp	2000/11/17 13:07:09	1.24
***************
*** 41,44 ****
--- 41,46 ----
  //
  
+ #define LIBRARY_LOAD_FRAMWORK
+ 
  #if   !defined(__CLFWCOMMON_HPP)                 
  #include <clfw/ClfwCommon.hpp>
***************
*** 85,88 ****
--- 87,92 ----
  #endif
  
+ #include    INCL_Library
+ 
  using namespace corelinux;
  
***************
*** 120,124 ****
  //
  
! // Getter 
  
  template < class T > T &getValue( char *name, FrameworkEntityPtr aFE )
--- 124,130 ----
  //
  
! //
! // Attribute Getter 
! //
  
  template < class T > T &getValue( char *name, FrameworkEntityPtr aFE )
***************
*** 131,135 ****
  }
  
! // Setter
  
  template < class T > void setValue
--- 137,143 ----
  }
  
! //
! // Attribute Setter
! //
  
  template < class T > void setValue
***************
*** 147,236 ****
  template < class T > void  dumpParents( T *aMPtr )
  {
-    Iterator<T *> *aIterator(aMPtr->createParentIterator());
- 
     cout  << endl << "Meta Parent List : " << endl;
  
!    while( aIterator->isValid() )
     {
!       cout
!          << "\tClass    = " << aIterator->getElement()->getInstanceTypeName() 
!             << endl
!          << "\tMetaType = " << aIterator->getElement()->getMetaTypeName() 
!             << endl;
!       aIterator->setNext();
!    }
  
!    aMPtr->destroyIterator( aIterator );
  
  }
  
! // MetaType or MetaClass Members
  
  template < class T > void  dumpInstanceMembers( T *aMPtr )
  {
!    Iterator<MemberDescriptorPtr> *aIterator
!       ( 
!          aMPtr->createMemberIterator() 
!       );
! 
!    while( aIterator->isValid() )
     {
!       MemberDescriptorCptr anElement( aIterator->getElement() );
! 
!       cout << "\tVar name   = " << anElement->theTypeVariableName 
!          << endl;
!       cout << "\tVar type   = " << anElement->theTypeName 
!          << endl;
!       cout << "\tVar size   = " << anElement->theSizeInBytes 
!          << endl;
  
!       if( anElement->theTypePointer != NULLPTR )
        {
!          cout << "\tClass type = " 
!             << anElement->theTypePointer->getInstanceTypeName()
              << endl;
!       }
!       else
!       {
!          cout << "\tNot a FrameworkEntity" << endl;  
!       }
  
!       if( anElement->theGetter != NULLPTR )
!       {
!          cout  << "\tHas getter " << endl;
!       }
!       else
!       {
!          ;  // do nothing
!       }
!       if( anElement->theSetter != NULLPTR )
!       {
!          cout  << "\tHas setter " << endl;
!       }
!       else
!       {
!          ;  // do nothing
        }
-       aIterator->setNext();
-    }
  
!    aMPtr->destroyIterator( aIterator );
  }
  
  template < class T > void  dumpInstanceFunctions( T *aMPtr )
  {
!    Iterator<DispatchDescriptorPtr> *aIterator
!       ( 
!          aMPtr->createMethodIterator() 
!       );
  
!    while( aIterator->isValid() )
     {
!       cout << "\tFunction name  = " << 
!          aIterator->getElement()->theClassMethodName << endl;
!       aIterator->setNext();
     }
- 
-    aMPtr->destroyIterator( aIterator );
  }
  
--- 155,271 ----
  template < class T > void  dumpParents( T *aMPtr )
  {
     cout  << endl << "Meta Parent List : " << endl;
  
!    if( aMPtr->getParentCount() != 0 )
     {
!       Iterator<T *> *aIterator(aMPtr->createParentIterator());
! 
!       while( aIterator->isValid() )
!       {
!          cout
!             << "\tClass    = " << 
!                aIterator->getElement()->getInstanceTypeName() << endl
!             << "\tMetaType = " 
!                << aIterator->getElement()->getMetaTypeName() << endl;
  
!          aIterator->setNext();
!       }
  
+       aMPtr->destroyIterator( aIterator );
+    }
+    else
+    {
+       ;  // do nothing
+    }
  }
  
! //
! // MetaType or MetaClass Attribute Control Blocks
! //
  
  template < class T > void  dumpInstanceMembers( T *aMPtr )
  {
!    if( aMPtr->getInstanceMemberCount() != 0 )
     {
!       Iterator<MemberDescriptorPtr> *aIterator
!          ( 
!             aMPtr->createMemberIterator() 
!          );
  
!       while( aIterator->isValid() )
        {
!          MemberDescriptorCptr anElement( aIterator->getElement() );
! 
!          cout << "\tVar name   = " << anElement->theTypeVariableName 
              << endl;
!          cout << "\tVar type   = " << anElement->theTypeName 
!             << endl;
!          cout << "\tVar size   = " << anElement->theSizeInBytes 
!             << endl;
  
!          if( anElement->theTypePointer != NULLPTR )
!          {
!             cout << "\tClass type = " 
!                << anElement->theTypePointer->getInstanceTypeName()
!                << endl;
!          }
!          else
!          {
!             cout << "\tNot a FrameworkEntity" << endl;  
!          }
! 
!          if( anElement->theGetter != NULLPTR )
!          {
!             cout  << "\tHas getter " << endl;
!          }
!          else
!          {
!             ;  // do nothing
!          }
!          if( anElement->theSetter != NULLPTR )
!          {
!             cout  << "\tHas setter " << endl;
!          }
!          else
!          {
!             ;  // do nothing
!          }
!          aIterator->setNext();
        }
  
!       aMPtr->destroyIterator( aIterator );
!    }
!    else
!    {
!       ;  // do nothing
!    }
  }
  
+ //
+ // MetaType or MetaClass Dispatch Control Blocks
+ //
+ 
  template < class T > void  dumpInstanceFunctions( T *aMPtr )
  {
!    if( aMPtr->getInstanceFunctionCount() != 0 )
!    {
!       Iterator<DispatchDescriptorPtr> *aIterator
!          ( 
!             aMPtr->createMethodIterator() 
!          );
! 
!       while( aIterator->isValid() )
!       {
!          cout << "\tFunction name  = " << 
!             aIterator->getElement()->theClassMethodName << endl;
!          aIterator->setNext();
!       }
  
!       aMPtr->destroyIterator( aIterator );
!    }
!    else
     {
!       ;  // do nothing
     }
  }
  
***************
*** 254,257 ****
--- 289,296 ----
        dumpOntology();
  
+       Library  aLibrary;
+ 
+       aLibrary.load( "something.so" );
+ 
     }
     catch( AssertionRef aAssert )
***************
*** 337,342 ****
     }
  
!    cout  << aMetaClass->getType()->getMetaTypeName() << " ("
!       << aMetaClass->getType()->getDomainName() << ")" << endl;
  
     Iterator<MetaClassPtr> *aIterator( aMetaClass->createIterator());
--- 376,381 ----
     }
  
!    cout  << aMetaClass->getMetaTypeName() << " ("
!       << aMetaClass->getDomainName() << ")" << endl;
  
     Iterator<MetaClassPtr> *aIterator( aMetaClass->createIterator());
***************
*** 386,394 ****
     //
  
!    dumpMetaTypeInformation( (MetaTypePtr)FrameworkEntity::getTypeDescriptor() );
!    dumpMetaTypeInformation( (MetaTypePtr)Number::getTypeDescriptor() );
!    dumpMetaTypeInformation( (MetaTypePtr)UnsignedNumber::getTypeDescriptor() );
!    dumpMetaTypeInformation( (MetaTypePtr)SignedNumber::getTypeDescriptor() );
!    dumpMetaTypeInformation( (MetaTypePtr)UserType::getTypeDescriptor() );
  
     //
--- 425,433 ----
     //
  
!    dumpMetaTypeInformation( FrameworkEntity::getTypeDescriptor() );
!    dumpMetaTypeInformation( Number::getTypeDescriptor() );
!    dumpMetaTypeInformation( UnsignedNumber::getTypeDescriptor() );
!    dumpMetaTypeInformation( SignedNumber::getTypeDescriptor() );
!    dumpMetaTypeInformation( UserType::getTypeDescriptor() );
  
     //
***************
*** 504,508 ****
     //
  
!    dumpParents<MetaType>( MetaTypePtr( aMTPtr ) );
  
     //
--- 543,547 ----
     //
  
!    dumpParents<MetaType>( aMTPtr );
  
     //
***************
*** 510,514 ****
     //
  
!    dumpInstanceMembers<MetaType>( MetaTypePtr( aMTPtr ) );
  
     //
--- 549,553 ----
     //
  
!    dumpInstanceMembers<MetaType>( aMTPtr  );
  
     //
***************
*** 516,520 ****
     //
  
!    dumpInstanceFunctions<MetaType>( MetaTypePtr( aMTPtr ) );
  
  }
--- 555,559 ----
     //
  
!    dumpInstanceFunctions<MetaType>( aMTPtr  );
  
  }