* contrib/hbxbp/hbxbp.hbc
+ Added gtgui as default GT on win/wce systems.
* include/extend.api
* include/hbsetup.ch
* include/hbapi.h
+ Added new HB_LEGACY_LEVEL3 macro to wrap legacy
constructs to be deprecated in the next major release.
Currently legacy IS*() parameter type checking macros
are marked as such, ones present in CA-Cl*pper retained
in extend.api even when this macro off.
; NOTE: It's recommended for 3rd party developers to
start using new HB_IS*() macros. They work
the same as Clipper compatible IS*() macros,
but got a HB_ prefix: ISNUM( 1 ) -> HB_ISNUM( 1 )
(not to be confused with HB_IS_*() macros which
accept a PHB_ITEM)
Here's a little batch which helps this process:
---
gsar -o -s:x20ISNUM( -r:x20HB_ISNUM( *.c *.cpp
gsar -o -s:x20ISCHAR( -r:x20HB_ISCHAR( *.c *.cpp
gsar -o -s:x20ISLOG( -r:x20HB_ISLOG( *.c *.cpp
gsar -o -s:x20ISARRAY( -r:x20HB_ISARRAY( *.c *.cpp
gsar -o -s:x20ISBYREF( -r:x20HB_ISBYREF( *.c *.cpp
gsar -o -s:x20ISDATE( -r:x20HB_ISDATE( *.c *.cpp
gsar -o -s:x20ISDATETIME( -r:x20HB_ISDATETIME( *.c *.cpp
gsar -o -s:x20ISNIL( -r:x20HB_ISNIL( *.c *.cpp
gsar -o -s:x20ISTIMESTAMP( -r:x20HB_ISTIMESTAMP( *.c *.cpp
gsar -o -s:x20ISBLOCK( -r:x20HB_ISBLOCK( *.c *.cpp
gsar -o -s:x20ISPOINTER( -r:x20HB_ISPOINTER( *.c *.cpp
gsar -o -s:x20ISSYMBOL( -r:x20HB_ISSYMBOL( *.c *.cpp
gsar -o -s:x20ISOBJECT( -r:x20HB_ISOBJECT( *.c *.cpp
gsar -o -s:x20ISHASH( -r:x20HB_ISHASH( *.c *.cpp
gsar -o -s!ISNUM( -r!HB_ISNUM( *.c *.cpp
gsar -o -s!ISCHAR( -r!HB_ISCHAR( *.c *.cpp
gsar -o -s!ISLOG( -r!HB_ISLOG( *.c *.cpp
gsar -o -s!ISARRAY( -r!HB_ISARRAY( *.c *.cpp
gsar -o -s!ISBYREF( -r!HB_ISBYREF( *.c *.cpp
gsar -o -s!ISDATE( -r!HB_ISDATE( *.c *.cpp
gsar -o -s!ISDATETIME( -r!HB_ISDATETIME( *.c *.cpp
gsar -o -s!ISNIL( -r!HB_ISNIL( *.c *.cpp
gsar -o -s!ISTIMESTAMP( -r!HB_ISTIMESTAMP( *.c *.cpp
gsar -o -s!ISBLOCK( -r!HB_ISBLOCK( *.c *.cpp
gsar -o -s!ISPOINTER( -r!HB_ISPOINTER( *.c *.cpp
gsar -o -s!ISSYMBOL( -r!HB_ISSYMBOL( *.c *.cpp
gsar -o -s!ISOBJECT( -r!HB_ISOBJECT( *.c *.cpp
gsar -o -s!ISHASH( -r!HB_ISHASH( *.c *.cpp
---
* source/rtl/hbinet.c
* Formatting.
% Minor optimizations.
* source/debug/dbgentry.c
* source/rdd/dbcmd.c
* source/rdd/dbcmd53.c
* source/rdd/dbcmdx.c
* source/rdd/dbdetach.c
* source/rdd/dbsql.c
* source/rdd/hbsix/sxfname.c
* source/rdd/hbsix/sxord.c
* source/rdd/hbsix/sxtable.c
* source/rdd/usrrdd/usrrdd.c
* source/rtl/at.c
* source/rtl/box.c
* source/rtl/cdpapi.c
* source/rtl/chrasc.c
* source/rtl/colorind.c
* source/rtl/console.c
* source/rtl/copyfile.c
* source/rtl/dateshb.c
* source/rtl/dirdrive.c
* source/rtl/diskspac.c
* source/rtl/disksphb.c
* source/rtl/errapi.c
* source/rtl/filesys.c
* source/rtl/fscopy.c
* source/rtl/fssize.c
* source/rtl/fstemp.c
* source/rtl/gete.c
* source/rtl/gtfunc.c
* source/rtl/gx.c
* source/rtl/hbbit.c
* source/rtl/hbgtcore.c
* source/rtl/hbhex.c
* source/rtl/hbi18n1.c
* source/rtl/hbinet.c
* source/rtl/hbprocfn.c
* source/rtl/hbrandom.c
* source/rtl/hbregex.c
* source/rtl/hbstrsh.c
* source/rtl/hbtoken.c
* source/rtl/hbzlib.c
* source/rtl/hbzlibgz.c
* source/rtl/inkey.c
* source/rtl/itemseri.c
* source/rtl/left.c
* source/rtl/math.c
* source/rtl/maxrow.c
* source/rtl/mlcfunc.c
* source/rtl/mouse53.c
* source/rtl/mousex.c
* source/rtl/mtran.c
* source/rtl/natmsg.c
* source/rtl/padc.c
* source/rtl/padl.c
* source/rtl/padr.c
* source/rtl/philes.c
* source/rtl/philes53.c
* source/rtl/rat.c
* source/rtl/replic.c
* source/rtl/right.c
* source/rtl/round.c
* source/rtl/run.c
* source/rtl/saverest.c
* source/rtl/scroll.c
* source/rtl/setcolor.c
* source/rtl/setcurs.c
* source/rtl/setpos.c
* source/rtl/shadow.c
* source/rtl/strc.c
* source/rtl/strmatch.c
* source/rtl/strpeek.c
* source/rtl/strtoexp.c
* source/rtl/strtran.c
* source/rtl/stuff.c
* source/rtl/substr.c
* source/rtl/tone.c
* source/rtl/trace.c
* source/rtl/transfrm.c
* source/rtl/valtype.c
* source/rtl/word.c
* source/vm/arrayshb.c
* source/vm/asort.c
* source/vm/classes.c
* source/vm/cmdarg.c
* source/vm/eval.c
* source/vm/hashfunc.c
* source/vm/hvm.c
* source/vm/memvars.c
* source/vm/proc.c
* source/vm/thread.c
* IS*() -> HB_IS*() macro rename.
(pass 1 - sf.net SVN works badly today, so I've split
the commit to raise the chances of a successfully
finished one)
296 lines
9.2 KiB
C
296 lines
9.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 (harbour.01 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 COPYING for licensing terms.
|
|
*
|
|
*/
|
|
|
|
#include "hbvmint.h"
|
|
#include "hbapi.h"
|
|
#include "hbapicls.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbstack.h"
|
|
#include "hbvm.h"
|
|
|
|
HB_FUNC( HB_METHODNAME )
|
|
{
|
|
char szName[ HB_SYMBOL_NAME_LEN + HB_SYMBOL_NAME_LEN + 5 ];
|
|
|
|
hb_retc( hb_procname( hb_parni( 1 ) + 1, szName, TRUE ) );
|
|
}
|
|
|
|
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 )
|
|
{
|
|
#ifndef HB_C52_STRICT
|
|
PHB_SYMB pSym = NULL;
|
|
|
|
if( HB_ISSYMBOL( 1 ) )
|
|
{
|
|
pSym = hb_itemGetSymbol( hb_param( 1, HB_IT_SYMBOL ) );
|
|
}
|
|
else if( HB_ISCHAR( 1 ) )
|
|
{
|
|
PHB_DYNS pDynSym = hb_dynsymFindName( hb_parc( 1 ) );
|
|
|
|
if( pDynSym )
|
|
pSym = pDynSym->pSymbol;
|
|
}
|
|
else
|
|
{
|
|
long lOffset = hb_stackBaseProcOffset( hb_parni( 1 ) + 1 );
|
|
|
|
if( lOffset > 0 )
|
|
{
|
|
PHB_ITEM pBase = hb_stackItem( lOffset );
|
|
|
|
pSym = pBase->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;
|
|
else if( pBase->item.asSymbol.stackstate->uiClass )
|
|
pSym = hb_clsMethodSym( pBase );
|
|
}
|
|
else if( pBase->item.asSymbol.stackstate->uiClass )
|
|
pSym = hb_clsMethodSym( pBase );
|
|
}
|
|
}
|
|
hb_retc( hb_vmFindModuleSymbolName( hb_vmGetRealFuncSym( pSym ) ) );
|
|
#else
|
|
hb_retc( NULL );
|
|
#endif
|
|
}
|
|
|
|
#endif
|
|
|
|
/* NOTE: szName size must be an at least:
|
|
HB_SYMBOL_NAME_LEN + HB_SYMBOL_NAME_LEN + 5 [vszakats] */
|
|
#define HB_PROCBUF_LEN ( HB_SYMBOL_NAME_LEN + HB_SYMBOL_NAME_LEN + 4 )
|
|
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 )
|
|
{
|
|
hb_strncat( szName, "(b)", HB_PROCBUF_LEN );
|
|
/* it is a method name? */
|
|
if( fMethodName && pBase->item.asSymbol.stackstate->uiClass )
|
|
{
|
|
hb_strncat( szName, hb_clsName( pBase->item.asSymbol.stackstate->uiClass ),
|
|
HB_PROCBUF_LEN );
|
|
hb_strncat( szName, ":", HB_PROCBUF_LEN );
|
|
hb_strncat( szName, hb_clsMethodName( pBase->item.asSymbol.stackstate->uiClass,
|
|
pBase->item.asSymbol.stackstate->uiMethod ), HB_PROCBUF_LEN );
|
|
}
|
|
else if( HB_IS_BLOCK( pSelf ) )
|
|
hb_strncat( szName, pSelf->item.asBlock.value->pDefSymb->szName,
|
|
HB_PROCBUF_LEN );
|
|
else if( HB_IS_SYMBOL( pSelf ) )
|
|
hb_strncpy( szName, pSelf->item.asSymbol.value->szName, HB_PROCBUF_LEN );
|
|
else
|
|
hb_strncat( szName, pBase->item.asSymbol.value->szName, HB_PROCBUF_LEN );
|
|
}
|
|
else
|
|
{
|
|
/* it is a method name? */
|
|
if( pBase->item.asSymbol.stackstate->uiClass )
|
|
{
|
|
hb_strncat( szName, hb_clsName( pBase->item.asSymbol.stackstate->uiClass ),
|
|
HB_PROCBUF_LEN );
|
|
hb_strncat( szName, ":", HB_PROCBUF_LEN );
|
|
}
|
|
hb_strncat( szName, pBase->item.asSymbol.value->szName, HB_PROCBUF_LEN );
|
|
}
|
|
}
|
|
|
|
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:
|
|
* HB_PATH_MAX
|
|
*/
|
|
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 )
|
|
{
|
|
hb_strncat( szName, "(b)", HB_PROCBUF_LEN );
|
|
|
|
if( HB_IS_BLOCK( pSelf ) )
|
|
hb_strncat( szName, pSelf->item.asBlock.value->pDefSymb->szName,
|
|
HB_PROCBUF_LEN );
|
|
else
|
|
hb_strncat( szName, pSym->szName, HB_PROCBUF_LEN );
|
|
}
|
|
else
|
|
{
|
|
if( pBase->item.asSymbol.stackstate->uiClass ) /* it is a method name */
|
|
{
|
|
hb_strncat( szName, hb_clsName( pBase->item.asSymbol.stackstate->uiClass ),
|
|
HB_PROCBUF_LEN );
|
|
hb_strncat( szName, ":", HB_PROCBUF_LEN );
|
|
}
|
|
hb_strncat( szName, pSym->szName, HB_PROCBUF_LEN );
|
|
}
|
|
}
|
|
|
|
if( puiLine )
|
|
* puiLine = pBase->item.asSymbol.stackstate->uiLineNo;
|
|
|
|
if( szFile )
|
|
{
|
|
const char * szModule;
|
|
|
|
if( HB_IS_BLOCK( pSelf ) &&
|
|
( pSym == &hb_symEval || pSym->pDynSym == hb_symEval.pDynSym ) )
|
|
pSym = pSelf->item.asBlock.value->pDefSymb;
|
|
else if( pBase->item.asSymbol.stackstate->uiClass )
|
|
pSym = hb_clsMethodSym( pBase );
|
|
|
|
szModule = hb_vmFindModuleSymbolName( hb_vmGetRealFuncSym( pSym ) );
|
|
|
|
if( szModule )
|
|
hb_strncpy( szFile, szModule, HB_PATH_MAX - 1 );
|
|
else
|
|
szFile[ 0 ] = '\0';
|
|
}
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
if( szName )
|
|
szName[ 0 ] = '\0';
|
|
if( puiLine )
|
|
* puiLine = 0;
|
|
if( szFile )
|
|
szFile[ 0 ] = '\0';
|
|
|
|
return FALSE;
|
|
}
|