Menu
▾
▴
[Corelinux-clcvs] CVS: clfw/src/libs/clfw Aggregate.cpp,1.1,1.2 Boolean.cpp,1.2,1.3 FrameworkEntity.cpp,1.6,1.7 Integer.cpp,1.4,1.5 MetaType.cpp,1.9,1.10 Number.cpp,1.4,1.5 RealNumber.cpp,1.1,1.2 ShortInteger.cpp,1.3,1.4 SignedNumber.cpp,1.1,1.2 UnsignedInteger.cpp,1.3,1.4 UnsignedNumber.cpp,1.1,1.2 UnsignedShortInteger.cpp,1.2,1.3
|
From: Frank V. C. <fr...@us...> - 2000-10-29 17:09:56
|
Update of /cvsroot/corelinux/clfw/src/libs/clfw In directory slayer.i.sourceforge.net:/tmp/cvs-serv27714/src/libs/clfw Modified Files: Aggregate.cpp Boolean.cpp FrameworkEntity.cpp Integer.cpp MetaType.cpp Number.cpp RealNumber.cpp ShortInteger.cpp SignedNumber.cpp UnsignedInteger.cpp UnsignedNumber.cpp UnsignedShortInteger.cpp Log Message: 119678 Dispatch table for objects Index: Aggregate.cpp =================================================================== RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/Aggregate.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Aggregate.cpp 2000/10/25 22:31:23 1.1 --- Aggregate.cpp 2000/10/29 17:09:52 1.2 *************** *** 54,57 **** --- 54,59 ---- CLOSE_INSTANCEDATA; + DEFINE_DUMMY_DISPATCHTABLE( Aggregate ); + //! we use the abstract macro for MetaTypeAggregate autonaming Index: Boolean.cpp =================================================================== RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/Boolean.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Boolean.cpp 2000/10/23 04:05:53 1.2 --- Boolean.cpp 2000/10/29 17:09:52 1.3 *************** *** 59,62 **** --- 59,64 ---- CLOSE_INSTANCEDATA; + DEFINE_DUMMY_DISPATCHTABLE( Boolean ); + //! we use the standard macro for MetaTypeBoolean autonaming *************** *** 70,78 **** : FrameworkEntity() { ! ; // do nothing } // // Destructor // --- 72,104 ---- : FrameworkEntity() + { + this->setValue(false); + } + + + // + // Copy constructor + // + + Boolean::Boolean( BooleanCref aBoolRef ) + : + FrameworkEntity() { ! this->setValue( aBoolRef.getValue() ); } // + // Value constructor + // + + Boolean::Boolean( bool const &aBoolRef ) + : + FrameworkEntity() + { + this->setValue( aBoolRef ); + } + + + // // Destructor // *************** *** 101,105 **** bool Boolean::operator==( bool const &aBool ) const { ! return ( theValue == aBool ); } --- 127,131 ---- bool Boolean::operator==( bool const &aBool ) const { ! return ( this->getValue() == aBool ); } *************** *** 115,119 **** if( this != &aBoolRef ) { ! theValue = aBoolRef.getValue(); } else --- 141,145 ---- if( this != &aBoolRef ) { ! this->setValue( aBoolRef.getValue() ); } else *************** *** 130,134 **** BooleanRef Boolean::operator=( bool const &aBool ) { ! theValue = aBool; return ( *this ); } --- 156,160 ---- BooleanRef Boolean::operator=( bool const &aBool ) { ! this->setValue(aBool); return ( *this ); } Index: FrameworkEntity.cpp =================================================================== RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/FrameworkEntity.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** FrameworkEntity.cpp 2000/10/22 14:49:16 1.6 --- FrameworkEntity.cpp 2000/10/29 17:09:52 1.7 *************** *** 52,55 **** --- 52,57 ---- CLOSE_INSTANCEDATA; + DEFINE_DUMMY_DISPATCHTABLE( FrameworkEntity ); + //! because we must define MetaTypeRoot and is abstract Index: Integer.cpp =================================================================== RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/Integer.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** Integer.cpp 2000/10/27 12:41:35 1.4 --- Integer.cpp 2000/10/29 17:09:52 1.5 *************** *** 34,37 **** --- 34,38 ---- #endif + namespace corelinux { *************** *** 62,65 **** --- 63,68 ---- DEFINE_INSTANCEDATA( Integer, Value ) CLOSE_INSTANCEDATA; + + DEFINE_DUMMY_DISPATCHTABLE( Integer ); //! we use the standard macro for MetaTypeInteger autonaming Index: MetaType.cpp =================================================================== RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/MetaType.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** MetaType.cpp 2000/10/22 14:49:16 1.9 --- MetaType.cpp 2000/10/29 17:09:52 1.10 *************** *** 26,33 **** #endif - #if !defined(__METATYPE_HPP) - #include <MetaType.hpp> - #endif - #if !defined(__DESCRIPTORNOTFOUND_HPP) #include <DescriptorNotFound.hpp> --- 26,29 ---- *************** *** 55,58 **** --- 51,55 ---- MetaTypeCptr *aParentArray, MemberDescriptorCptr *aMemberArray, + DispatchDescriptorCptr *aDispatchArray, CharCptr aTypeName, CharCptr aMetaTypeName *************** *** 64,72 **** theBaseClasses( aParentArray ), theInstanceMembers( aMemberArray ), theInstanceTypeName( aTypeName ), theMetaTypeName( aMetaTypeName ), theFactoryAllocator( NULLPTR ) { ! ; } --- 61,70 ---- theBaseClasses( aParentArray ), theInstanceMembers( aMemberArray ), + theDispatchFunctions( aDispatchArray ), theInstanceTypeName( aTypeName ), theMetaTypeName( aMetaTypeName ), theFactoryAllocator( NULLPTR ) { ! ; // do nothing } *************** *** 82,85 **** --- 80,84 ---- MetaTypeCptr *aParentArray, MemberDescriptorCptr *aMemberArray, + DispatchDescriptorCptr *aDispatchArray, CharCptr aTypeName, CharCptr aMetaTypeName, *************** *** 92,100 **** theBaseClasses( aParentArray ), theInstanceMembers( aMemberArray ), theInstanceTypeName( aTypeName ), theMetaTypeName( aMetaTypeName ), theFactoryAllocator( aAllocation ) { ! ; } --- 91,100 ---- theBaseClasses( aParentArray ), theInstanceMembers( aMemberArray ), + theDispatchFunctions( aDispatchArray ), theInstanceTypeName( aTypeName ), theMetaTypeName( aMetaTypeName ), theFactoryAllocator( aAllocation ) { ! ; // do nothing } *************** *** 169,172 **** --- 169,179 ---- } + // Get the list of function dispatch descriptors + + DispatchDescriptorCptr *const MetaType::getInstanceFunctions( void ) const + { + return theDispatchFunctions; + } + // Get the class name *************** *** 371,374 **** --- 378,382 ---- } } + } Index: Number.cpp =================================================================== RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/Number.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** Number.cpp 2000/10/23 04:05:53 1.4 --- Number.cpp 2000/10/29 17:09:52 1.5 *************** *** 54,57 **** --- 54,59 ---- CLOSE_INSTANCEDATA; + DEFINE_DUMMY_DISPATCHTABLE( Number ); + //! we use the abstract macro for MetaTypeNumber autonaming Index: RealNumber.cpp =================================================================== RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/RealNumber.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** RealNumber.cpp 2000/10/14 11:41:26 1.1 --- RealNumber.cpp 2000/10/29 17:09:52 1.2 *************** *** 59,62 **** --- 59,64 ---- CLOSE_INSTANCEDATA; + DEFINE_DUMMY_DISPATCHTABLE( RealNumber ); + //! we use the standard macro for MetaTypeRealNumber autonaming *************** *** 68,71 **** --- 70,75 ---- RealNumber::RealNumber( void ) + : + Number() { ; // do nothing *************** *** 73,76 **** --- 77,102 ---- // + // Constructor + // + + RealNumber::RealNumber( RealNumberCref aRealRef ) + : + Number() + { + this->setValue( aRealRef.getValue() ); + } + + // + // Value Constructor + // + + RealNumber::RealNumber( RealCref aRealRef ) + : + Number() + { + this->setValue( aRealRef ); + } + + // // Destructor // *************** *** 78,82 **** RealNumber::~RealNumber( void ) { ! ; } --- 104,108 ---- RealNumber::~RealNumber( void ) { ! ; // do nothing } *************** *** 94,97 **** --- 120,132 ---- // + // Value equality + // + + bool RealNumber::operator==( RealCref aReal ) const + { + return ( this->getValue() == aReal ); + } + + // // Assignment operator // *************** *** 104,108 **** if( this != &aRealRef ) { ! theValue = aRealRef.getValue(); } else --- 139,143 ---- if( this != &aRealRef ) { ! this->setValue( aRealRef.getValue() ); } else *************** *** 113,119 **** } RealNumberRef RealNumber::operator=( RealCref aReal ) { ! theValue = aReal; return ( *this ); } --- 148,158 ---- } + // + // Value assignment + // + RealNumberRef RealNumber::operator=( RealCref aReal ) { ! this->setValue( aReal ); return ( *this ); } Index: ShortInteger.cpp =================================================================== RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/ShortInteger.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** ShortInteger.cpp 2000/10/27 12:41:35 1.3 --- ShortInteger.cpp 2000/10/29 17:09:52 1.4 *************** *** 63,66 **** --- 63,68 ---- CLOSE_INSTANCEDATA; + DEFINE_DUMMY_DISPATCHTABLE( ShortInteger ); + //! we use the standard macro for MetaTypeInteger autonaming Index: SignedNumber.cpp =================================================================== RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/SignedNumber.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** SignedNumber.cpp 2000/10/23 04:05:53 1.1 --- SignedNumber.cpp 2000/10/29 17:09:52 1.2 *************** *** 58,61 **** --- 58,63 ---- CLOSE_INSTANCEDATA; + DEFINE_DUMMY_DISPATCHTABLE( SignedNumber ); + //! we use the standard macro for MetaTypeSignedNumber autonaming Index: UnsignedInteger.cpp =================================================================== RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/UnsignedInteger.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** UnsignedInteger.cpp 2000/10/27 12:41:35 1.3 --- UnsignedInteger.cpp 2000/10/29 17:09:52 1.4 *************** *** 64,67 **** --- 64,69 ---- CLOSE_INSTANCEDATA; + DEFINE_DUMMY_DISPATCHTABLE( UnsignedInteger ); + //! we use the standard macro for MetaTypeInteger autonaming Index: UnsignedNumber.cpp =================================================================== RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/UnsignedNumber.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** UnsignedNumber.cpp 2000/10/23 04:05:53 1.1 --- UnsignedNumber.cpp 2000/10/29 17:09:52 1.2 *************** *** 58,61 **** --- 58,63 ---- CLOSE_INSTANCEDATA; + DEFINE_DUMMY_DISPATCHTABLE( UnsignedNumber ); + //! we use the standard macro for MetaTypeUnsignedNumber autonaming Index: UnsignedShortInteger.cpp =================================================================== RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/UnsignedShortInteger.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** UnsignedShortInteger.cpp 2000/10/27 12:41:35 1.2 --- UnsignedShortInteger.cpp 2000/10/29 17:09:52 1.3 *************** *** 63,66 **** --- 63,68 ---- CLOSE_INSTANCEDATA; + DEFINE_DUMMY_DISPATCHTABLE( UnsignedShortInteger ); + //! we use the standard macro for MetaTypeInteger autonaming |
