fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2000-10-31 20:56 GMT+1 JFL (Mafact) <jfl@mafact.com>

Browse Source
This commit is contained in:
Jean-Francois Lefebvre
2000-10-31 19:52:16 +00:00
parent 34c4ff9b50
commit f4f1bdab20
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -1,3 +1,8 @@
2000-10-31 20:56 GMT+1 JFL (Mafact) <jfl@mafact.com>
* source/vm/classes.c
* Bug correction where __OBJHASMSG() returned True when no msg exist
in some case
2000-10-30 18:51 GMT+2 Maurilio Longo <maurilio.longo@libero.it>
* contrib/mysql/*
* little changes chasing a bug :-|

12
harbour/source/vm/classes.c
View File

@@ -140,6 +140,8 @@
* 1.35 ?
* 1.36 Adding HB_CLS_ENFORCERO FLAG to disable Write access to RO VAR
* This is work in progress (JFL) Should be related to some compatibility flag
* 1.37 minor syntax correction
* 1.38 __ObjHasMsg() could return true when false
*
* See doc/license.txt for licensing terms.
*
@@ -208,6 +210,7 @@ static void hb_clsRelease( PCLASS );
char * hb_objGetClsName( PHB_ITEM pObject );
PHB_FUNC hb_objGetMethod( PHB_ITEM, PHB_SYMB );
PHB_FUNC hb_objGetMthd( PHB_ITEM pObject, PHB_SYMB pMessage, BOOL lAllowErrFunc );
ULONG hb_objHasMsg( PHB_ITEM pObject, char * szString );
static HARBOUR hb___msgClsH( void );
@@ -588,6 +591,11 @@ char * hb_objGetClsName( PHB_ITEM pObject )
* Internal function to the function pointer of a message of an object
*/
PHB_FUNC hb_objGetMethod( PHB_ITEM pObject, PHB_SYMB pMessage )
{
return hb_objGetMthd( (PHB_ITEM) pObject, (PHB_SYMB) pMessage, TRUE ) ;
}
PHB_FUNC hb_objGetMthd( PHB_ITEM pObject, PHB_SYMB pMessage, BOOL lAllowErrFunc )
{
USHORT uiClass;
PHB_DYNS pMsg = pMessage->pDynSym;
@@ -656,7 +664,7 @@ PHB_FUNC hb_objGetMethod( PHB_ITEM pObject, PHB_SYMB pMessage )
{
PCLASS pClass = s_pClasses + ( uiClass - 1 );
if( pClass->pFunError )
if( lAllowErrFunc && pClass->pFunError )
return pClass->pFunError;
}
@@ -678,7 +686,7 @@ ULONG hb_objHasMsg( PHB_ITEM pObject, char *szString )
HB_TRACE(HB_TR_DEBUG, ("hb_objHasMsg(%p, %s)", pObject, szString));
if( pDynSym )
return ( ULONG ) hb_objGetMethod( pObject, pDynSym->pSymbol );
return ( ULONG ) hb_objGetMthd( pObject, pDynSym->pSymbol, FALSE );
else
return 0;
} /* Get funcptr of message */