* harbour/include/hbrdddbf.h
* harbour/source/rdd/dbf1.c
* harbour/contrib/rdd_ads/ads1.c
* synced with xHarbour
* harbour/include/hbapi.h
+ added uiClass and uiMethod to HB_STACK_STATE structure
- removed puiClsTree from HB_BASEARRAY structure
* harbour/include/hbvmpub.h
! fixed typo in HB_ARRAY_OBJ() declaration
* harbour/source/vm/arrays.c
- removed puiClsTree from HB_BASEARRAY structure
* harbour/source/vm/classes.c
- removed static variable s_pMethod to make classes code MT safe
* store information about current method index and supercasting on
HVM stack in HB_STACK_STATE structure
! changed hb_objGetRealClsName() to not use puiClsTree - this functions
was never working as it should when object was supercasted.
Now it simply returns name of class where method was defined and
inherited.
- removed hb_objPopSuperCast() and changed last parameter in
hb_objGetMethod() from BOOL * to PHB_STACK_STATE
hb_objPopSuperCast() is not longer necessary
- removed hb_mthRequested() and first parameter from hb_mthAddTime()
+ added char * hb_clsName( USHORT uiClass );
+ added TOFIX notes in hb___msgGetData() and hb___msgSetData()
* harbour/source/vm/estack.c
+ added uiClass and uiMethod to HB_STACK_STATE structure
* harbour/source/vm/hvm.c
* updated for above modifications
* harbour/source/vm/proc.c
! do not use hb_objGetRealClsName() anymore but retrieve information
about _REAL_ class form HVM stack
289 lines
8.2 KiB
C
289 lines
8.2 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* PROCNAME(), PROCLINE() and PROCFILE() functions
|
|
*
|
|
* Copyright 1999 Antonio Linares <alinares@fivetech.com>
|
|
* www - http://www.harbour-project.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this software; see the file COPYING. If not, write to
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
|
*
|
|
* As a special exception, the Harbour Project gives permission for
|
|
* additional uses of the text contained in its release of Harbour.
|
|
*
|
|
* The exception is that, if you link the Harbour libraries with other
|
|
* files to produce an executable, this does not by itself cause the
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
* Your use of that executable is in no way restricted on account of
|
|
* linking the Harbour library code into it.
|
|
*
|
|
* This exception does not however invalidate any other reasons why
|
|
* the executable file might be covered by the GNU General Public License.
|
|
*
|
|
* This exception applies only to the code released by the Harbour
|
|
* Project under the name Harbour. If you copy code from other
|
|
* Harbour Project or Free Software Foundation releases into a copy of
|
|
* Harbour, as the General Public License permits, the exception does
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
* anyone as to the status of such modified files, you must delete
|
|
* this exception notice from them.
|
|
*
|
|
* If you write modifications of your own for Harbour, it is your choice
|
|
* whether to permit this exception to apply to your modifications.
|
|
* If you do not wish that, delete this exception notice.
|
|
*
|
|
*/
|
|
|
|
/*
|
|
* The following parts are Copyright of the individual authors.
|
|
* www - http://www.harbour-project.org
|
|
*
|
|
* Copyright 1999-2001 Viktor Szakats <viktor.szakats@syenar.hu>
|
|
* PROCFILE()
|
|
*
|
|
* Copyright 2001 JFL (Mafact) <jfl@mafact.com>
|
|
* Adding the MethodName() just calling Procname()
|
|
* Special treatment in case of Object and __Eval (only for methodname)
|
|
* skipping block and adding (b) before the method name
|
|
*
|
|
* See doc/license.txt for licensing terms.
|
|
*
|
|
*/
|
|
|
|
#include "hbvmopt.h"
|
|
#include "hbapi.h"
|
|
#include "hbapicls.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbstack.h"
|
|
#include "hbvm.h"
|
|
|
|
#ifdef HB_EXTENSION
|
|
|
|
HB_FUNC( HB_METHODNAME )
|
|
{
|
|
char szName[ HB_SYMBOL_NAME_LEN + HB_SYMBOL_NAME_LEN + 2 ];
|
|
|
|
hb_retc( hb_procname( hb_parni( 1 ) + 1, szName, TRUE ) );
|
|
}
|
|
|
|
#endif
|
|
|
|
HB_FUNC( PROCNAME )
|
|
{
|
|
char szName[ HB_SYMBOL_NAME_LEN + HB_SYMBOL_NAME_LEN + 5 ];
|
|
|
|
hb_retc( hb_procname( hb_parni( 1 ) + 1, szName, FALSE ) );
|
|
}
|
|
|
|
HB_FUNC( PROCLINE )
|
|
{
|
|
long lOffset = hb_stackBaseProcOffset( hb_parni( 1 ) + 1 );
|
|
|
|
if( lOffset >= 0 )
|
|
hb_retni( hb_stackItem( lOffset )->item.asSymbol.lineno );
|
|
else
|
|
hb_retni( 0 );
|
|
}
|
|
|
|
#ifdef HB_C52_UNDOC
|
|
|
|
/* NOTE: Clipper undocumented function, which always returns an empty
|
|
string. [vszakats] */
|
|
|
|
HB_FUNC( PROCFILE )
|
|
{
|
|
PHB_SYMB pLocalSym = NULL;
|
|
PHB_SYMB pSym = NULL;
|
|
|
|
if( ISSYMBOL( 1 ) )
|
|
{
|
|
pSym = hb_itemGetSymbol( hb_param( 1, HB_IT_SYMBOL ) );
|
|
}
|
|
else
|
|
{
|
|
long lOffset = hb_stackBaseProcOffset( hb_parni( 1 ) + 1 );
|
|
|
|
if( lOffset >= 0 )
|
|
{
|
|
pSym = hb_stackItem( lOffset )->item.asSymbol.value;
|
|
|
|
if( pSym == &hb_symEval || strcmp( pSym->szName, "EVAL" ) == 0 )
|
|
{
|
|
PHB_ITEM pSelf = hb_stackItem( lOffset + 1 );
|
|
|
|
if( HB_IS_BLOCK( pSelf ) )
|
|
pLocalSym = pSelf->item.asBlock.value->pDefSymb;
|
|
}
|
|
}
|
|
}
|
|
|
|
if( !pLocalSym && pSym )
|
|
{
|
|
if( ( pSym->scope.value & HB_FS_LOCAL ) != 0 )
|
|
pLocalSym = pSym;
|
|
else if( pSym->pDynSym &&
|
|
( pSym->pDynSym->pSymbol->scope.value & HB_FS_LOCAL ) != 0 )
|
|
pLocalSym = pSym->pDynSym->pSymbol;
|
|
}
|
|
|
|
hb_retc( hb_vmFindModuleSymbolName( pLocalSym ) );
|
|
}
|
|
|
|
#endif
|
|
|
|
/* NOTE: szName size must be an at least:
|
|
HB_SYMBOL_NAME_LEN + HB_SYMBOL_NAME_LEN + 5 [vszakats] */
|
|
|
|
char * hb_procname( int iLevel, char * szName, BOOL bSkipBlock )
|
|
{
|
|
long lOffset = hb_stackBaseProcOffset( iLevel );
|
|
long lPrevOffset = 0;
|
|
|
|
if( lOffset >= 0 )
|
|
{
|
|
PHB_ITEM pBase, pSelf;
|
|
|
|
if( bSkipBlock && lOffset > 0 &&
|
|
hb_stackItem( lOffset )->item.asSymbol.value == &hb_symEval )
|
|
{
|
|
/* it's an inline method - back one more ... */
|
|
lPrevOffset = lOffset;
|
|
lOffset = hb_stackItem( lOffset )->item.asSymbol.stackstate->lBaseItem;
|
|
}
|
|
|
|
pBase = hb_stackItem( lOffset );
|
|
pSelf = hb_stackItem( lOffset + 1 );
|
|
|
|
if( pBase->item.asSymbol.stackstate->uiClass ) /* it is a method name */
|
|
{
|
|
strcpy( szName, hb_clsName( pBase->item.asSymbol.stackstate->uiClass ) );
|
|
|
|
if( lPrevOffset )
|
|
strcat( szName, ":(b)" );
|
|
else
|
|
strcat( szName, ":" );
|
|
|
|
strcat( szName, pBase->item.asSymbol.value->szName );
|
|
}
|
|
else
|
|
{
|
|
if( lPrevOffset ) /* Back to standart code block */
|
|
{
|
|
lOffset = lPrevOffset;
|
|
pBase = hb_stackItem( lOffset );
|
|
pSelf = hb_stackItem( lOffset + 1 );
|
|
}
|
|
|
|
if( pBase->item.asSymbol.value == &hb_symEval ||
|
|
strcmp( pBase->item.asSymbol.value->szName, "EVAL" ) == 0 )
|
|
{
|
|
strcpy( szName, "(b)" );
|
|
|
|
if( HB_IS_BLOCK( pSelf ) )
|
|
strcat( szName, pSelf->item.asBlock.value->pDefSymb->szName );
|
|
else
|
|
strcat( szName, pBase->item.asSymbol.value->szName );
|
|
}
|
|
else
|
|
strcpy( szName, pBase->item.asSymbol.value->szName );
|
|
}
|
|
}
|
|
else
|
|
strcpy( szName, "" );
|
|
|
|
return szName;
|
|
}
|
|
|
|
/* NOTE: szName size must be an at least:
|
|
* HB_SYMBOL_NAME_LEN + HB_SYMBOL_NAME_LEN + 5
|
|
* szFile szie must be an at least:
|
|
* _POSIX_PATH_MAX + 1
|
|
*/
|
|
BOOL hb_procinfo( int iLevel, char * szName, USHORT * puiLine, char * szFile )
|
|
{
|
|
long lOffset = hb_stackBaseProcOffset( iLevel );
|
|
|
|
if( lOffset >= 0 )
|
|
{
|
|
PHB_ITEM pBase, pSelf;
|
|
PHB_SYMB pSym;
|
|
|
|
pBase = hb_stackItem( lOffset );
|
|
pSelf = hb_stackItem( lOffset + 1 );
|
|
|
|
pSym = pBase->item.asSymbol.value;
|
|
|
|
if( szName )
|
|
{
|
|
if( pBase->item.asSymbol.stackstate->uiClass ) /* it is a method name */
|
|
{
|
|
strcpy( szName, hb_clsName( pBase->item.asSymbol.stackstate->uiClass ) );
|
|
strcat( szName, ":" );
|
|
strcat( szName, pSym->szName );
|
|
}
|
|
else if( pSym == &hb_symEval || strcmp( pSym->szName, "EVAL" ) == 0 )
|
|
{
|
|
strcpy( szName, "(b)" );
|
|
|
|
if( HB_IS_BLOCK( pSelf ) )
|
|
strcat( szName, pSelf->item.asBlock.value->pDefSymb->szName );
|
|
else
|
|
strcat( szName, pSym->szName );
|
|
}
|
|
else
|
|
strcpy( szName, pSym->szName );
|
|
}
|
|
|
|
if( puiLine )
|
|
* puiLine = pBase->item.asSymbol.lineno;
|
|
|
|
if( szFile )
|
|
{
|
|
char * szModule;
|
|
|
|
if( ( pSym == &hb_symEval || strcmp( pSym->szName, "EVAL" ) == 0 ) &&
|
|
HB_IS_BLOCK( pSelf ) && pSelf->item.asBlock.value->pDefSymb )
|
|
pSym = pSelf->item.asBlock.value->pDefSymb;
|
|
else if( ( pSym->scope.value & HB_FS_LOCAL ) == 0 )
|
|
{
|
|
if( ( pSym->pDynSym->pSymbol->scope.value & HB_FS_LOCAL ) != 0 )
|
|
pSym = pSym->pDynSym->pSymbol;
|
|
else
|
|
pSym = NULL;
|
|
}
|
|
szModule = hb_vmFindModuleSymbolName( pSym );
|
|
if( szModule )
|
|
strcpy( szFile, szModule );
|
|
else
|
|
szFile[ 0 ] = '\0';
|
|
}
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
if( szName )
|
|
szName[ 0 ] = '\0';
|
|
if( puiLine )
|
|
* puiLine = 0;
|
|
if( szFile )
|
|
szFile[ 0 ] = '\0';
|
|
|
|
return FALSE;
|
|
}
|