* harbour/include/hbclass.ch
+ added validation for class data names. As additional preprocessor
rule to not use <!marker!>
* harbour/include/hboo.ch
* harbour/source/rtl/tclass.prg
* harbour/source/vm/classes.c
+ added delegate messages
* harbour/include/hbstack.h
* harbour/source/vm/arrays.c
* harbour/source/vm/estack.c
* harbour/source/vm/hvm.c
* harbour/source/vm/proc.c
+ added startup symbol to hb_stack. It gives very good stop
condition for all procedures which trace stack calls and
resolves the problem with hb_stack.pBase which was never
pointing to valid function/procedure symbol when no symbol
was put on HVM stack. Now after hb_stackInit() the first
item is allocated for "hb_stackInit()" symbol so hb_stack.pBase
is always a pointer to valid function/procedure symbol.
* changed the guard condition for buggy code in hb_stackPop()
and similar code from:
hb_stack.pPos < hb_stack.pItems
to:
hb_stack.pPos <= hb_stack.pBase
The old condition was generating usable error message only in the
startup function. In deeply called functions it was only waste of
CPU time on one of the most often call functions. Before it was
activated internal stack structures were corrupted.
If we were leaving for many years without really working stack
underflow protection then maybe we should think about disabling
it at when HB_STACK_MACROS are used and keep it only in real
stack functions for HVM developers. Single protection in
hb_stackOldFrame() I've just added is enough for basic C code
validation.
I created the second version of stack macros without it in
hbstack.h but I would like to hear other developers opinion.
269 lines
7.7 KiB
C
269 lines
7.7 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.stackstate->uiLineNo );
|
|
else
|
|
hb_retni( 0 );
|
|
}
|
|
|
|
#ifdef HB_C52_UNDOC
|
|
|
|
/* NOTE: Clipper undocumented function, which always returns an empty
|
|
string. [vszakats] */
|
|
|
|
HB_FUNC( PROCFILE )
|
|
{
|
|
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 || pSym->pDynSym == hb_symEval.pDynSym )
|
|
{
|
|
PHB_ITEM pSelf = hb_stackItem( lOffset + 1 );
|
|
|
|
if( HB_IS_BLOCK( pSelf ) )
|
|
pSym = pSelf->item.asBlock.value->pDefSymb;
|
|
}
|
|
}
|
|
}
|
|
|
|
hb_retc( hb_vmFindModuleSymbolName( hb_vmGetRealFuncSym( pSym ) ) );
|
|
}
|
|
|
|
#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 fMethodName )
|
|
{
|
|
long lOffset = hb_stackBaseProcOffset( iLevel );
|
|
|
|
szName[ 0 ] = '\0';
|
|
if( lOffset > 0 )
|
|
{
|
|
PHB_ITEM pBase, pSelf;
|
|
|
|
pBase = hb_stackItem( lOffset );
|
|
pSelf = hb_stackItem( lOffset + 1 );
|
|
|
|
if( fMethodName && lOffset > 0 &&
|
|
pBase->item.asSymbol.value == &hb_symEval &&
|
|
pBase->item.asSymbol.stackstate->uiClass )
|
|
{
|
|
long lPrevOffset = hb_stackItem( lOffset )->item.asSymbol.stackstate->lBaseItem;
|
|
|
|
if( hb_stackItem( lPrevOffset )->item.asSymbol.stackstate->uiClass ==
|
|
pBase->item.asSymbol.stackstate->uiClass &&
|
|
hb_stackItem( lPrevOffset )->item.asSymbol.stackstate->uiMethod ==
|
|
pBase->item.asSymbol.stackstate->uiMethod )
|
|
{
|
|
pBase = hb_stackItem( lPrevOffset );
|
|
pSelf = hb_stackItem( lPrevOffset + 1 );
|
|
}
|
|
}
|
|
|
|
if( pBase->item.asSymbol.value == &hb_symEval ||
|
|
pBase->item.asSymbol.value->pDynSym == hb_symEval.pDynSym )
|
|
{
|
|
strcat( szName, "(b)" );
|
|
|
|
if( HB_IS_BLOCK( pSelf ) )
|
|
strcat( szName, pSelf->item.asBlock.value->pDefSymb->szName );
|
|
else
|
|
strcat( szName, pBase->item.asSymbol.value->szName );
|
|
}
|
|
else
|
|
{
|
|
/* it is a method name? */
|
|
if( pBase->item.asSymbol.stackstate->uiClass )
|
|
{
|
|
strcat( szName, hb_clsName( pBase->item.asSymbol.stackstate->uiClass ) );
|
|
strcat( szName, ":" );
|
|
}
|
|
strcat( szName, pBase->item.asSymbol.value->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 )
|
|
{
|
|
szName[ 0 ] = '\0';
|
|
if( pSym == &hb_symEval || pSym->pDynSym == hb_symEval.pDynSym )
|
|
{
|
|
strcat( szName, "(b)" );
|
|
|
|
if( HB_IS_BLOCK( pSelf ) )
|
|
strcat( szName, pSelf->item.asBlock.value->pDefSymb->szName );
|
|
else
|
|
strcat( szName, pSym->szName );
|
|
}
|
|
else
|
|
{
|
|
if( pBase->item.asSymbol.stackstate->uiClass ) /* it is a method name */
|
|
{
|
|
strcat( szName, hb_clsName( pBase->item.asSymbol.stackstate->uiClass ) );
|
|
strcat( szName, ":" );
|
|
}
|
|
strcat( szName, pSym->szName );
|
|
}
|
|
}
|
|
|
|
if( puiLine )
|
|
* puiLine = pBase->item.asSymbol.stackstate->uiLineNo;
|
|
|
|
if( szFile )
|
|
{
|
|
char * szModule;
|
|
|
|
if( HB_IS_BLOCK( pSelf ) &&
|
|
( pSym == &hb_symEval || pSym->pDynSym == hb_symEval.pDynSym ) )
|
|
pSym = pSelf->item.asBlock.value->pDefSymb;
|
|
|
|
szModule = hb_vmFindModuleSymbolName( hb_vmGetRealFuncSym( 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;
|
|
}
|