|
From: Frank V. C. <fr...@us...> - 2000-11-03 13:29:47
|
Update of /cvsroot/corelinux/clfw/src/libs/clfw In directory slayer.i.sourceforge.net:/tmp/cvs-serv4310/src/libs/clfw Modified Files: MetaType.cpp Log Message: 119868 Release 0.2.4 prep Index: MetaType.cpp =================================================================== RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/MetaType.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** MetaType.cpp 2000/10/30 05:01:25 1.11 --- MetaType.cpp 2000/11/03 13:29:44 1.12 *************** *** 386,390 **** ( FrameworkEntityPtr aInstanceObject, ! char *aMethodName, void **args, void *retArg --- 386,390 ---- ( FrameworkEntityPtr aInstanceObject, ! char *aFunctionName, void **args, void *retArg *************** *** 392,396 **** throw( NullPointerException, DescriptorNotFound ) { ! if( aMethodName == NULLPTR || aInstanceObject == NULLPTR ) { throw NullPointerException(LOCATION); --- 392,396 ---- throw( NullPointerException, DescriptorNotFound ) { ! if( aFunctionName == NULLPTR || aInstanceObject == NULLPTR ) { throw NullPointerException(LOCATION); *************** *** 411,415 **** while( *pMd != NULLPTR ) { ! if( strcmp((*pMd)->theClassMethodName,aMethodName) == 0 ) { aDesc = *pMd; --- 411,415 ---- while( *pMd != NULLPTR ) { ! if( strcmp((*pMd)->theClassMethodName,aFunctionName) == 0 ) { aDesc = *pMd; *************** *** 433,437 **** if( aDesc == NULLPTR ) { ! throw DescriptorNotFound(aMethodName, LOCATION); } else --- 433,497 ---- if( aDesc == NULLPTR ) { ! throw DescriptorNotFound(aFunctionName, LOCATION); ! } ! else ! { ! ; // do nothing ! } ! } ! // ! // Dispatch Method ! // ! ! void MetaType::dispatch ! ( ! char *aFunctionName, ! void **args, ! void *retArg ! ) ! throw( NullPointerException, DescriptorNotFound ) ! { ! if( aFunctionName == NULLPTR ) ! { ! throw NullPointerException(LOCATION); ! } ! else ! { ! ; // do nothing ! } ! ! // ! // Get the descriptor, function, and subsequent value ! // ! ! DispatchDescriptorCptr aDesc( NULLPTR ); ! ! DispatchDescriptorCptr *pMd(theDispatchFunctions); ! ! while( *pMd != NULLPTR ) ! { ! if( strcmp((*pMd)->theClassMethodName,aFunctionName) == 0 ) ! { ! aDesc = *pMd; ! if( aDesc->theFunction != NULLPTR ) ! { ! (*(aDesc->theFunction))(NULLPTR, args, retArg ); ! } ! else ! { ! throw NullPointerException(LOCATION); ! } ! break; ! } ! else ! { ! ; // do nothing ! } ! ++pMd; ! } ! ! if( aDesc == NULLPTR ) ! { ! throw DescriptorNotFound(aFunctionName, LOCATION); } else |