From 06f719cfbddf671495a52457e19736a35529ad7e Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 31 Mar 2000 21:17:04 +0000 Subject: [PATCH] 20000331-23:11 GMT+1 Victor Szakats --- harbour/.cvsignore | 7 + harbour/ChangeLog | 32 +++ harbour/contrib/hbclip/readme.txt | 6 +- harbour/contrib/rdd_ads/ads1.c | 24 +- harbour/contrib/runjava/runjava.c | 4 +- harbour/include/extend.api | 29 ++- harbour/include/hbapi.h | 98 ++++---- harbour/include/hbver.h | 4 +- harbour/source/macro/macro.c | 6 +- harbour/source/rdd/dbcmd.c | 140 +++++------ harbour/source/rdd/dbf1.c | 12 +- harbour/source/rdd/dbfcdx/dbfcdx1.c | 18 +- harbour/source/rtl/abs.c | 8 +- harbour/source/rtl/at.c | 4 +- harbour/source/rtl/binnum.c | 6 +- harbour/source/rtl/binnumx.c | 2 +- harbour/source/rtl/box.c | 8 +- harbour/source/rtl/chrasc.c | 2 +- harbour/source/rtl/console.c | 2 +- harbour/source/rtl/datec.c | 4 +- harbour/source/rtl/dateshb.c | 8 +- harbour/source/rtl/descend.c | 10 +- harbour/source/rtl/dir.c | 6 +- harbour/source/rtl/do.c | 14 +- harbour/source/rtl/empty.c | 22 +- harbour/source/rtl/errorapi.c | 8 +- harbour/source/rtl/eval.c | 4 +- harbour/source/rtl/fkmax.c | 2 +- harbour/source/rtl/gete.c | 2 +- harbour/source/rtl/hardcr.c | 2 +- harbour/source/rtl/inkey.c | 4 +- harbour/source/rtl/left.c | 2 +- harbour/source/rtl/len.c | 6 +- harbour/source/rtl/lennum.c | 2 +- harbour/source/rtl/memofile.c | 6 +- harbour/source/rtl/minmax.c | 24 +- harbour/source/rtl/mod.c | 2 +- harbour/source/rtl/mousex.c | 4 +- harbour/source/rtl/mtran.c | 2 +- harbour/source/rtl/natmsg.c | 4 +- harbour/source/rtl/oemansi.c | 4 +- harbour/source/rtl/pad.c | 16 +- harbour/source/rtl/right.c | 2 +- harbour/source/rtl/round.c | 2 +- harbour/source/rtl/set.c | 34 +-- harbour/source/rtl/soundex.c | 2 +- harbour/source/rtl/str.c | 6 +- harbour/source/rtl/strcase.c | 4 +- harbour/source/rtl/strtran.c | 6 +- harbour/source/rtl/strzero.c | 6 +- harbour/source/rtl/substr.c | 2 +- harbour/source/rtl/transfrm.c | 20 +- harbour/source/rtl/trim.c | 4 +- harbour/source/rtl/type.c | 2 +- harbour/source/rtl/val.c | 2 +- harbour/source/rtl/valtostr.c | 2 +- harbour/source/rtl/valtype.c | 2 +- harbour/source/tools/ctchrmix.c | 4 +- harbour/source/tools/dates2.c | 18 +- harbour/source/tools/hb_f.c | 6 +- harbour/source/tools/strfmt.c | 2 +- harbour/source/vm/arrays.c | 94 ++++---- harbour/source/vm/arrayshb.c | 30 +-- harbour/source/vm/break.c | 2 +- harbour/source/vm/classes.c | 82 +++---- harbour/source/vm/codebloc.c | 8 +- harbour/source/vm/debug.c | 4 +- harbour/source/vm/extend.c | 236 ++++++------------ harbour/source/vm/fm.c | 6 +- harbour/source/vm/hvm.c | 356 ++++++++++++++-------------- harbour/source/vm/itemapi.c | 160 +++++++------ harbour/source/vm/memvars.c | 66 +++--- harbour/source/vm/proc.c | 2 +- harbour/source/vm/runner.c | 4 +- 74 files changed, 850 insertions(+), 896 deletions(-) diff --git a/harbour/.cvsignore b/harbour/.cvsignore index cfee219893..b7b29a351b 100644 --- a/harbour/.cvsignore +++ b/harbour/.cvsignore @@ -6,6 +6,13 @@ os2 os2/* w32 w32/* +b16 b16/* +b32 b32/* +vc vc/* +obj +obj/* +lib +lib/* diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bc86a228f1..3a02b813b8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,35 @@ +20000331-23:11 GMT+1 Victor Szakats + + * include/hbver.h + * Version bumped. + + * include/extend.api + * include/hbapi.h + * contrib/runjava/runjava.c + * contrib/rdd_ads/ads1.c + * source/rtl/*.c + * source/vm/*.c + * source/rdd/*.c + * source/tools/*.c + * source/macro/macro.c + * IT_ macros prefixed with HB_ + * IS_ macros prefixed with HB_ + + * source/vm/extend.c + % Source code made smaller. + + * include/hbapi.h + * include/extend.api + * source/tools/strfmt.c + * PCOUNT, ALENGTH() moved to extend.api + - Harbour usage of these macros removed. + + * .cvsignore + * Updated + + * contrib/hbclip/readme.txt + - Reference to Clipper S87 removed. + 20000331-15:50 EST Paul Tucker * source/macro/macro.c * hb_valtypeGet() -> hb_itemTypeStr() diff --git a/harbour/contrib/hbclip/readme.txt b/harbour/contrib/hbclip/readme.txt index 59df41ffa9..f52b92f1a5 100644 --- a/harbour/contrib/hbclip/readme.txt +++ b/harbour/contrib/hbclip/readme.txt @@ -2,8 +2,8 @@ * $Id$ */ -Harbour Compatibility Library (HCL) for CA-Clipper 5.x/'87 -========================================================== +Harbour Compatibility Library (HCL) for CA-Clipper 5.x +====================================================== The goal of this library and header file is to provide some level of compatibility for Harbour code when compiled with CA-Clipper. @@ -15,7 +15,7 @@ Use MAKE_CLP.BAT to build the library. Later on add HBCLIP.LIB to your link script. -Optionally on CA-Clipper 5.x you may want to #include "hbclip.ch" to +Optionally you may want to #include "hbclip.ch" to your source files. Victor Szakats diff --git a/harbour/contrib/rdd_ads/ads1.c b/harbour/contrib/rdd_ads/ads1.c index 93748f4104..f28da0cdb3 100644 --- a/harbour/contrib/rdd_ads/ads1.c +++ b/harbour/contrib/rdd_ads/ads1.c @@ -270,7 +270,7 @@ static ERRCODE adsGoToId( ADSAREAP pArea, PHB_ITEM pItem ) HB_TRACE(HB_TR_DEBUG, ("adsGoToId(%p, %p)", pArea, pItem)); - if( IS_NUMERIC( pItem ) ) + if( HB_IS_NUMERIC( pItem ) ) { ulRecNo = hb_itemGetNL( pItem ); if( ulRecNo == 0 ) @@ -546,7 +546,7 @@ static ERRCODE adsPutValue( ADSAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) switch( pField->uiType ) { case 'C': - if( IS_STRING( pItem ) ) + if( HB_IS_STRING( pItem ) ) { uiCount = ( USHORT ) hb_itemGetCLen( pItem ); if( uiCount > pField->uiLen ) @@ -559,7 +559,7 @@ static ERRCODE adsPutValue( ADSAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) break; case 'N': - if( IS_NUMERIC( pItem ) ) + if( HB_IS_NUMERIC( pItem ) ) { if( pField->uiDec ) bError = !hb_ndtoa( hb_itemGetND( pItem ), ( char * ) szText, @@ -579,7 +579,7 @@ static ERRCODE adsPutValue( ADSAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) break; case 'D': - if( IS_DATE( pItem ) ) + if( HB_IS_DATE( pItem ) ) { AdsGetDateFormat ( pucFormat, &pusLen ); AdsSetDateFormat ( (UCHAR*)"YYYYMMDD" ); @@ -594,7 +594,7 @@ static ERRCODE adsPutValue( ADSAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) break; case 'L': - if( IS_LOGICAL( pItem ) ) + if( HB_IS_LOGICAL( pItem ) ) { *szText = hb_itemGetL( pItem ) ? 'T' : 'F'; bError = FALSE; @@ -603,7 +603,7 @@ static ERRCODE adsPutValue( ADSAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) break; case 'M': - if( IS_STRING( pItem ) ) + if( HB_IS_STRING( pItem ) ) { uiCount = ( USHORT ) hb_itemGetCLen( pItem ); AdsSetString( pArea->hTable, szName, @@ -898,7 +898,7 @@ static ERRCODE adsOrderListFocus( ADSAREAP pArea, LPDBORDERINFO pOrderInfo ) if( pOrderInfo->itmOrder ) { - if( IS_NUMERIC( pOrderInfo->itmOrder ) ) + if( HB_IS_NUMERIC( pOrderInfo->itmOrder ) ) { usOrder = (UNSIGNED16) hb_itemGetNI( pOrderInfo->itmOrder ); if( usOrder ) @@ -909,7 +909,7 @@ static ERRCODE adsOrderListFocus( ADSAREAP pArea, LPDBORDERINFO pOrderInfo ) return SUCCESS; } } - else if( IS_STRING( pOrderInfo->itmOrder ) ) + else if( HB_IS_STRING( pOrderInfo->itmOrder ) ) { ulRetVal = AdsGetIndexHandle( pArea->hTable, (UNSIGNED8*) hb_itemGetCPtr( pOrderInfo->itmOrder ), &phIndex ); @@ -958,7 +958,7 @@ static ERRCODE adsOrderDestroy( ADSAREAP pArea, LPDBORDERINFO pOrderInfo ) UNSIGNED32 ulRetVal; HB_TRACE(HB_TR_DEBUG, ("adsOrderDestroy(%p, %p)", pArea, pOrderInfo)); - if( IS_STRING( pOrderInfo->itmOrder ) ) + if( HB_IS_STRING( pOrderInfo->itmOrder ) ) { ulRetVal = AdsGetIndexHandle( pArea->hTable, (UNSIGNED8*) hb_itemGetCPtr( pOrderInfo->itmOrder ), &phIndex ); @@ -983,12 +983,12 @@ static ERRCODE adsOrderInfo( ADSAREAP pArea, USHORT uiIndex, LPDBORDERINFO pOrde HB_TRACE(HB_TR_DEBUG, ("adsOrderInfo(%p, %hu, %p)", pArea, uiIndex, pInfo)); - if( pOrderInfo->itmOrder && !IS_NIL(pOrderInfo->itmOrder) ) + if( pOrderInfo->itmOrder && !HB_IS_NIL(pOrderInfo->itmOrder) ) { - if( IS_NUMERIC( pOrderInfo->itmOrder ) ) + if( HB_IS_NUMERIC( pOrderInfo->itmOrder ) ) ulRetVal = AdsGetIndexHandleByOrder( pArea->hTable, (UNSIGNED16) hb_itemGetNI( pOrderInfo->itmOrder ), &phIndex ); - else if( IS_STRING( pOrderInfo->itmOrder ) ) + else if( HB_IS_STRING( pOrderInfo->itmOrder ) ) ulRetVal = AdsGetIndexHandle( pArea->hTable, (UNSIGNED8*) hb_itemGetCPtr( pOrderInfo->itmOrder ), &phIndex ); if( ulRetVal != AE_SUCCESS ) diff --git a/harbour/contrib/runjava/runjava.c b/harbour/contrib/runjava/runjava.c index 2127098c21..2e1feb5e88 100644 --- a/harbour/contrib/runjava/runjava.c +++ b/harbour/contrib/runjava/runjava.c @@ -244,7 +244,7 @@ JNIEXPORT jlong JNICALL Java_Harbour_Run( JNIEnv *env, hb_vmPushSymbol( pSymRead + ul ); hb_vmPushNil(); for( i = 0; i < ( hb_pcount() - 1 ); i++ ) - hb_vmPush( hb_param( i + 2, IT_ANY ) ); + hb_vmPush( hb_param( i + 2, HB_IT_ANY ) ); /* Push other cmdline params*/ hb_vmDo( hb_pcount() - 1 ); /* Run init function */ } @@ -253,7 +253,7 @@ JNIEXPORT jlong JNICALL Java_Harbour_Run( JNIEnv *env, hb_vmPushSymbol( pSymRead ); hb_vmPushNil(); for( i = 0; i < ( hb_pcount() - 1 ); i++ ) - hb_vmPush( hb_param( i + 2, IT_ANY ) ); /* Push other cmdline params*/ + hb_vmPush( hb_param( i + 2, HB_IT_ANY ) ); /* Push other cmdline params*/ hb_vmDo( hb_pcount() - 1 ); /* Run the thing !!! */ pRetVal = hb_itemNew( NULL ); diff --git a/harbour/include/extend.api b/harbour/include/extend.api index d29630d79e..a795c0530f 100644 --- a/harbour/include/extend.api +++ b/harbour/include/extend.api @@ -48,20 +48,25 @@ typedef PHB_ITEM ITEM; /* Compatible defines */ -#define UNDEF IT_NIL -#define CHARACTER IT_STRING -#define NUMERIC IT_NUMERIC -#define LOGICAL IT_LOGICAL -#define DATE IT_DATE -#define ALIAS IT_ALIAS -#define MPTR IT_BYREF /* or'ed with type when passed by reference */ -#define MEMO IT_MEMO +#define UNDEF HB_IT_NIL +#define CHARACTER HB_IT_STRING +#define NUMERIC HB_IT_NUMERIC +#define LOGICAL HB_IT_LOGICAL +#define DATE HB_IT_DATE +#define ALIAS HB_IT_ALIAS +#define MPTR HB_IT_BYREF /* or'ed with type when passed by reference */ +#define MEMO HB_IT_MEMO /* NOTE: CA-Cl*pper bug: WORD will conflict with the typedef with the same name in clipdefs.h [vszakats] */ -#define WORD ( IT_INTEGER | IT_LONG ) -#define ARRAY IT_ARRAY -#define BLOCK IT_BLOCK -#define DOUBLE IT_DOUBLE +#define WORD ( HB_IT_INTEGER | HB_IT_LONG ) +#define ARRAY HB_IT_ARRAY +#define BLOCK HB_IT_BLOCK +#define DOUBLE HB_IT_DOUBLE + +/* Macros */ + +#define PCOUNT hb_pcount() +#define ALENGTH( n ) hb_parinfa( n, 0 ) /* Functions */ diff --git a/harbour/include/hbapi.h b/harbour/include/hbapi.h index 37bfd1c5d1..738dc2535c 100644 --- a/harbour/include/hbapi.h +++ b/harbour/include/hbapi.h @@ -49,57 +49,54 @@ extern "C" { #endif /* items types and type checking macros */ -#define IT_NIL ( ( USHORT ) 0x0000 ) -#define IT_POINTER ( ( USHORT ) 0x0001 ) -#define IT_INTEGER ( ( USHORT ) 0x0002 ) -#define IT_LONG ( ( USHORT ) 0x0008 ) -#define IT_DOUBLE ( ( USHORT ) 0x0010 ) -#define IT_DATE ( ( USHORT ) 0x0020 ) -#define IT_LOGICAL ( ( USHORT ) 0x0080 ) -#define IT_SYMBOL ( ( USHORT ) 0x0100 ) -#define IT_ALIAS ( ( USHORT ) 0x0200 ) -#define IT_STRING ( ( USHORT ) 0x0400 ) -#define IT_MEMOFLAG ( ( USHORT ) 0x0800 ) -#define IT_MEMO ( IT_MEMOFLAG | IT_STRING ) -#define IT_BLOCK ( ( USHORT ) 0x1000 ) -#define IT_BYREF ( ( USHORT ) 0x2000 ) -#define IT_MEMVAR ( ( USHORT ) 0x4000 ) -#define IT_ARRAY ( ( USHORT ) 0x8000 ) -#define IT_OBJECT IT_ARRAY -#define IT_NUMERIC ( ( USHORT ) ( IT_INTEGER | IT_LONG | IT_DOUBLE ) ) -#define IT_ANY ( ( USHORT ) 0xFFFF ) +#define HB_IT_NIL ( ( USHORT ) 0x0000 ) +#define HB_IT_POINTER ( ( USHORT ) 0x0001 ) +#define HB_IT_INTEGER ( ( USHORT ) 0x0002 ) +#define HB_IT_LONG ( ( USHORT ) 0x0008 ) +#define HB_IT_DOUBLE ( ( USHORT ) 0x0010 ) +#define HB_IT_DATE ( ( USHORT ) 0x0020 ) +#define HB_IT_LOGICAL ( ( USHORT ) 0x0080 ) +#define HB_IT_SYMBOL ( ( USHORT ) 0x0100 ) +#define HB_IT_ALIAS ( ( USHORT ) 0x0200 ) +#define HB_IT_STRING ( ( USHORT ) 0x0400 ) +#define HB_IT_MEMOFLAG ( ( USHORT ) 0x0800 ) +#define HB_IT_MEMO ( HB_IT_MEMOFLAG | HB_IT_STRING ) +#define HB_IT_BLOCK ( ( USHORT ) 0x1000 ) +#define HB_IT_BYREF ( ( USHORT ) 0x2000 ) +#define HB_IT_MEMVAR ( ( USHORT ) 0x4000 ) +#define HB_IT_ARRAY ( ( USHORT ) 0x8000 ) +#define HB_IT_OBJECT HB_IT_ARRAY +#define HB_IT_NUMERIC ( ( USHORT ) ( HB_IT_INTEGER | HB_IT_LONG | HB_IT_DOUBLE ) ) +#define HB_IT_ANY ( ( USHORT ) 0xFFFF ) -#define IS_BYREF( p ) ( ( p )->type & IT_BYREF ) -#define IS_OF_TYPE( p, t ) ( ( ( p )->type & ~IT_BYREF ) == t ) -#define IS_ARRAY( p ) IS_OF_TYPE( p, IT_ARRAY ) -#define IS_NIL( p ) IS_OF_TYPE( p, IT_NIL ) -#define IS_BLOCK( p ) IS_OF_TYPE( p, IT_BLOCK ) -#define IS_DATE( p ) IS_OF_TYPE( p, IT_DATE ) -#define IS_DOUBLE( p ) IS_OF_TYPE( p, IT_DOUBLE ) -#define IS_INTEGER( p ) IS_OF_TYPE( p, IT_INTEGER ) -#define IS_LOGICAL( p ) IS_OF_TYPE( p, IT_LOGICAL ) -#define IS_LONG( p ) IS_OF_TYPE( p, IT_LONG ) -#define IS_NUMERIC( p ) ( ( p )->type & IT_NUMERIC ) -#define IS_OBJECT( p ) IS_OF_TYPE( p, IT_OBJECT ) -#define IS_STRING( p ) IS_OF_TYPE( p, IT_STRING ) -#define IS_MEMO( p ) IS_OF_TYPE( p, IT_MEMO ) -#define IS_SYMBOL( p ) IS_OF_TYPE( p, IT_SYMBOL ) -#define IS_MEMVAR( p ) IS_OF_TYPE( p, IT_MEMVAR ) -#define IS_POINTER( p ) IS_OF_TYPE( p, IT_POINTER ) +#define HB_IS_OF_TYPE( p, t ) ( ( ( p )->type & ~HB_IT_BYREF ) == t ) +#define HB_IS_BYREF( p ) ( ( p )->type & HB_IT_BYREF ) +#define HB_IS_ARRAY( p ) HB_IS_OF_TYPE( p, HB_IT_ARRAY ) +#define HB_IS_NIL( p ) HB_IS_OF_TYPE( p, HB_IT_NIL ) +#define HB_IS_BLOCK( p ) HB_IS_OF_TYPE( p, HB_IT_BLOCK ) +#define HB_IS_DATE( p ) HB_IS_OF_TYPE( p, HB_IT_DATE ) +#define HB_IS_DOUBLE( p ) HB_IS_OF_TYPE( p, HB_IT_DOUBLE ) +#define HB_IS_INTEGER( p ) HB_IS_OF_TYPE( p, HB_IT_INTEGER ) +#define HB_IS_LOGICAL( p ) HB_IS_OF_TYPE( p, HB_IT_LOGICAL ) +#define HB_IS_LONG( p ) HB_IS_OF_TYPE( p, HB_IT_LONG ) +#define HB_IS_NUMERIC( p ) ( ( p )->type & HB_IT_NUMERIC ) +#define HB_IS_OBJECT( p ) HB_IS_OF_TYPE( p, HB_IT_OBJECT ) +#define HB_IS_STRING( p ) HB_IS_OF_TYPE( p, HB_IT_STRING ) +#define HB_IS_MEMO( p ) HB_IS_OF_TYPE( p, HB_IT_MEMO ) +#define HB_IS_SYMBOL( p ) HB_IS_OF_TYPE( p, HB_IT_SYMBOL ) +#define HB_IS_MEMVAR( p ) HB_IS_OF_TYPE( p, HB_IT_MEMVAR ) +#define HB_IS_POINTER( p ) HB_IS_OF_TYPE( p, HB_IT_POINTER ) -#define ISNIL( n ) ( hb_param( n, IT_ANY ) == NULL || IS_NIL( hb_param( n, IT_ANY ) ) ) /* NOTE: Intentionally using a different method */ -#define ISCHAR( n ) ( hb_param( n, IT_STRING ) != NULL ) -#define ISNUM( n ) ( hb_param( n, IT_NUMERIC ) != NULL ) -#define ISLOG( n ) ( hb_param( n, IT_LOGICAL ) != NULL ) -#define ISDATE( n ) ( hb_param( n, IT_DATE ) != NULL ) -#define ISMEMO( n ) ( hb_param( n, IT_MEMO ) != NULL ) -#define ISBYREF( n ) ( hb_parinfo( n ) & IT_BYREF ) /* NOTE: Intentionally using a different method */ -#define ISARRAY( n ) ( hb_param( n, IT_ARRAY ) != NULL ) -#define ISBLOCK( n ) ( hb_param( n, IT_BLOCK ) != NULL ) /* Not available in CA-Cl*pper. */ -#define ISPOINTER( n ) ( hb_param( n, IT_POINTER ) != NULL ) /* Not available in CA-Cl*pper. */ - -#define PCOUNT hb_pcount() -#define ALENGTH( n ) hb_parinfa( n, 0 ) +#define ISNIL( n ) ( hb_param( n, HB_IT_ANY ) == NULL || HB_IS_NIL( hb_param( n, HB_IT_ANY ) ) ) /* NOTE: Intentionally using a different method */ +#define ISCHAR( n ) ( hb_param( n, HB_IT_STRING ) != NULL ) +#define ISNUM( n ) ( hb_param( n, HB_IT_NUMERIC ) != NULL ) +#define ISLOG( n ) ( hb_param( n, HB_IT_LOGICAL ) != NULL ) +#define ISDATE( n ) ( hb_param( n, HB_IT_DATE ) != NULL ) +#define ISMEMO( n ) ( hb_param( n, HB_IT_MEMO ) != NULL ) +#define ISBYREF( n ) ( hb_parinfo( n ) & HB_IT_BYREF ) /* NOTE: Intentionally using a different method */ +#define ISARRAY( n ) ( hb_param( n, HB_IT_ARRAY ) != NULL ) +#define ISBLOCK( n ) ( hb_param( n, HB_IT_BLOCK ) != NULL ) /* Not available in CA-Cl*pper. */ +#define ISPOINTER( n ) ( hb_param( n, HB_IT_POINTER ) != NULL ) /* Not available in CA-Cl*pper. */ /* forward declarations */ struct _HB_CODEBLOCK; @@ -131,6 +128,7 @@ struct hb_struDate * performed by the compiler) */ #define HB_DEFAULT_DECIMALS 255 + struct hb_struDouble { USHORT length; @@ -443,7 +441,7 @@ typedef struct HB_CBVAR_ /* This structure holds local variables declared in a char * szName; BYTE bType; struct HB_CBVAR_ * pNext; -} HB_CBVAR, *HB_CBVAR_PTR; +} HB_CBVAR, * HB_CBVAR_PTR; typedef struct HB_PCODE_INFO_ /* compiled pcode container */ { diff --git a/harbour/include/hbver.h b/harbour/include/hbver.h index 8836b01017..01c6bc1d0f 100644 --- a/harbour/include/hbver.h +++ b/harbour/include/hbver.h @@ -77,10 +77,10 @@ #define HB_VER_MAJOR 0 /* Major version number */ #define HB_VER_MINOR 32 /* Minor version number */ -#define HB_VER_REVISION "a" /* Revision letter */ +#define HB_VER_REVISION "b" /* Revision letter */ #define HB_VER_BUILD 32 /* Build number */ #define HB_VER_YEAR 2000 /* Build year */ #define HB_VER_MONTH 03 /* Build month */ -#define HB_VER_DAY 14 /* Build day */ +#define HB_VER_DAY 31 /* Build day */ #endif /* HB_VER_H_ */ diff --git a/harbour/source/macro/macro.c b/harbour/source/macro/macro.c index 421a9fccf9..b3e4a14a2a 100644 --- a/harbour/source/macro/macro.c +++ b/harbour/source/macro/macro.c @@ -35,7 +35,7 @@ /* this #define HAVE TO be placed before all #include directives */ -#define HB_MACRO_SUPPORT +#define HB_MACRO_SUPPORT #include "hbmacro.h" #include "hbcomp.h" @@ -102,7 +102,7 @@ static BOOL hb_macroCheckParam( HB_ITEM_PTR pItem ) HB_TRACE(HB_TR_DEBUG, ("hb_macroCheckParam(%p)", pItem)); - if( ! IS_STRING(pItem) ) + if( ! HB_IS_STRING(pItem) ) { HB_ITEM_PTR pResult = hb_errRT_BASE_Subst( EG_ARG, 1080, NULL, "&" ); @@ -487,7 +487,7 @@ void hb_macroPushAliasedValue( HB_ITEM_PTR pAlias, HB_ITEM_PTR pVar ) */ static void hb_macroUseAliased( HB_ITEM_PTR pAlias, HB_ITEM_PTR pVar, int iFlag ) { - if( IS_STRING( pAlias ) && IS_STRING( pVar ) ) + if( HB_IS_STRING( pAlias ) && HB_IS_STRING( pVar ) ) { /* grab memory for "alias->var" */ diff --git a/harbour/source/rdd/dbcmd.c b/harbour/source/rdd/dbcmd.c index 09329ee05e..e1d997085a 100644 --- a/harbour/source/rdd/dbcmd.c +++ b/harbour/source/rdd/dbcmd.c @@ -375,7 +375,7 @@ static ERRCODE defEvalBlock( AREAP pArea, PHB_ITEM pBlock ) { HB_TRACE(HB_TR_DEBUG, ("defEvalBlock(%p, %p)", pArea, pBlock)); - if( !pBlock && !IS_BLOCK( pBlock ) ) + if( !pBlock && !HB_IS_BLOCK( pBlock ) ) { PHB_ITEM pError; @@ -694,7 +694,7 @@ static ERRCODE defSkipFilter( AREAP pArea, LONG lUpDown ) hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pArea->dbfi.itmCobExpr ); hb_vmDo( 0 ); - if( IS_LOGICAL( &hb_stack.Return ) && + if( HB_IS_LOGICAL( &hb_stack.Return ) && !hb_itemGetL( &hb_stack.Return ) ) { SELF_SKIPRAW( pArea, 1 ); @@ -729,7 +729,7 @@ static ERRCODE defSkipFilter( AREAP pArea, LONG lUpDown ) hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pArea->dbfi.itmCobExpr ); hb_vmDo( 0 ); - if( IS_LOGICAL( &hb_stack.Return ) && + if( HB_IS_LOGICAL( &hb_stack.Return ) && !hb_itemGetL( &hb_stack.Return ) ) { SELF_SKIPRAW( pArea, 1 ); @@ -1346,10 +1346,10 @@ HB_FUNC( AFIELDS ) return; } - pName = hb_param( 1, IT_ARRAY ); - pType = hb_param( 2, IT_ARRAY ); - pLen = hb_param( 3, IT_ARRAY ); - pDec = hb_param( 4, IT_ARRAY ); + pName = hb_param( 1, HB_IT_ARRAY ); + pType = hb_param( 2, HB_IT_ARRAY ); + pLen = hb_param( 3, HB_IT_ARRAY ); + pDec = hb_param( 4, HB_IT_ARRAY ); if( !pName && !pType && !pLen && !pDec ) { hb_retni( 0 ); @@ -1442,14 +1442,14 @@ HB_FUNC( DBEVAL ) { DBEVALINFO pEvalInfo; - pEvalInfo.itmBlock = hb_param( 1, IT_BLOCK ); + pEvalInfo.itmBlock = hb_param( 1, HB_IT_BLOCK ); if( !pEvalInfo.itmBlock ) { hb_errRT_DBCMD( EG_ARG, 2019, NULL, "DBEVAL" ); return; } - pEvalInfo.dbsci.itmCobFor = hb_param( 2, IT_BLOCK ); + pEvalInfo.dbsci.itmCobFor = hb_param( 2, HB_IT_BLOCK ); if( !pEvalInfo.dbsci.itmCobFor ) { if( !ISNIL( 2 ) ) @@ -1459,7 +1459,7 @@ HB_FUNC( DBEVAL ) } } - pEvalInfo.dbsci.itmCobWhile = hb_param( 3, IT_BLOCK ); + pEvalInfo.dbsci.itmCobWhile = hb_param( 3, HB_IT_BLOCK ); if( !pEvalInfo.dbsci.itmCobWhile ) { if( !ISNIL( 3 ) ) @@ -1469,7 +1469,7 @@ HB_FUNC( DBEVAL ) } } - pEvalInfo.dbsci.lNext = hb_param( 4, IT_NUMERIC ); + pEvalInfo.dbsci.lNext = hb_param( 4, HB_IT_NUMERIC ); if( !pEvalInfo.dbsci.lNext ) { if( !ISNIL( 4 ) ) @@ -1479,7 +1479,7 @@ HB_FUNC( DBEVAL ) } } - pEvalInfo.dbsci.itmRecID = hb_param( 5, IT_NUMERIC ); + pEvalInfo.dbsci.itmRecID = hb_param( 5, HB_IT_NUMERIC ); if( !pEvalInfo.dbsci.itmRecID ) { if( !ISNIL( 5 ) ) @@ -1489,7 +1489,7 @@ HB_FUNC( DBEVAL ) } } - pEvalInfo.dbsci.fRest = hb_param( 6, IT_LOGICAL ); + pEvalInfo.dbsci.fRest = hb_param( 6, HB_IT_LOGICAL ); if( !pEvalInfo.dbsci.fRest ) { if( !ISNIL( 6 ) ) @@ -1656,7 +1656,7 @@ HB_FUNC( DBCREATE ) BOOL bError = FALSE; szFileName = hb_parc( 1 ); - pStruct = hb_param( 2 , IT_ARRAY ); + pStruct = hb_param( 2 , HB_IT_ARRAY ); uiLen = ( USHORT ) hb_arrayLen( pStruct ); if( ( strlen( szFileName ) == 0 ) || !pStruct || uiLen == 0 ) @@ -1675,10 +1675,10 @@ HB_FUNC( DBCREATE ) } /* Validate items type, name, size and decimals of field */ - if( !( hb_arrayGetType( pFieldDesc, 1 ) & IT_STRING ) || - !( hb_arrayGetType( pFieldDesc, 2 ) & IT_STRING ) || - !( hb_arrayGetType( pFieldDesc, 3 ) & IT_NUMERIC ) || - !( hb_arrayGetType( pFieldDesc, 4 ) & IT_NUMERIC ) ) + if( !( hb_arrayGetType( pFieldDesc, 1 ) & HB_IT_STRING ) || + !( hb_arrayGetType( pFieldDesc, 2 ) & HB_IT_STRING ) || + !( hb_arrayGetType( pFieldDesc, 3 ) & HB_IT_NUMERIC ) || + !( hb_arrayGetType( pFieldDesc, 4 ) & HB_IT_NUMERIC ) ) { hb_errRT_DBCMD( EG_ARG, 1014, NULL, "DBCREATE" ); return; @@ -1962,7 +1962,7 @@ HB_FUNC( DBGOTO ) return; } - pItem = hb_param( 1, IT_ANY ); + pItem = hb_param( 1, HB_IT_ANY ); if( !pItem ) hb_errRT_DBCMD( EG_ARG, 1003, NULL, "DBGOTO" ); else @@ -1991,11 +1991,11 @@ HB_FUNC( __DBLOCATE ) } memset( &pScopeInfo, 0, sizeof( DBSCOPEINFO ) ); - pFor2 = hb_param( 1, IT_BLOCK ); - pWhile = hb_param( 2, IT_BLOCK ); - pNext = hb_param( 3, IT_NUMERIC ); - pRecord = hb_param( 4, IT_NUMERIC ); - pRest = hb_param( 5, IT_LOGICAL ); + pFor2 = hb_param( 1, HB_IT_BLOCK ); + pWhile = hb_param( 2, HB_IT_BLOCK ); + pNext = hb_param( 3, HB_IT_NUMERIC ); + pRecord = hb_param( 4, HB_IT_NUMERIC ); + pRest = hb_param( 5, HB_IT_LOGICAL ); if( !pWhile ) { pWhile = hb_itemPutL( NULL, TRUE ); @@ -2027,7 +2027,7 @@ HB_FUNC( __DBLOCATE ) SELF_EOF( ( AREAP ) s_pCurrArea->pArea, &bEof ); if( bEof ) return; - if( hb_itemType( pWhile ) == IT_BLOCK ) + if( hb_itemType( pWhile ) == HB_IT_BLOCK ) { hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pWhile ); @@ -2036,7 +2036,7 @@ HB_FUNC( __DBLOCATE ) } else bWhile = hb_itemGetL( pWhile ); - if( hb_itemType( pFor ) == IT_BLOCK ) + if( hb_itemType( pFor ) == HB_IT_BLOCK ) { hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pFor ); @@ -2053,7 +2053,7 @@ HB_FUNC( __DBLOCATE ) lNext = hb_parnl( 3 ); if( bEof || lNext <= 0 ) return; - if( hb_itemType( pWhile ) == IT_BLOCK ) + if( hb_itemType( pWhile ) == HB_IT_BLOCK ) { hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pWhile ); @@ -2062,7 +2062,7 @@ HB_FUNC( __DBLOCATE ) } else bWhile = hb_itemGetL( pWhile ); - if( hb_itemType( pFor ) == IT_BLOCK ) + if( hb_itemType( pFor ) == HB_IT_BLOCK ) { hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pFor ); @@ -2075,7 +2075,7 @@ HB_FUNC( __DBLOCATE ) { SELF_SKIP( ( AREAP ) s_pCurrArea->pArea, 1 ); SELF_EOF( ( AREAP ) s_pCurrArea->pArea, &bEof ); - if( hb_itemType( pWhile ) == IT_BLOCK ) + if( hb_itemType( pWhile ) == HB_IT_BLOCK ) { hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pWhile ); @@ -2084,7 +2084,7 @@ HB_FUNC( __DBLOCATE ) } else bWhile = hb_itemGetL( pWhile ); - if( hb_itemType( pFor ) == IT_BLOCK ) + if( hb_itemType( pFor ) == HB_IT_BLOCK ) { hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pFor ); @@ -2101,7 +2101,7 @@ HB_FUNC( __DBLOCATE ) SELF_EOF( ( AREAP ) s_pCurrArea->pArea, &bEof ); if( bEof ) return; - if( hb_itemType( pWhile ) == IT_BLOCK ) + if( hb_itemType( pWhile ) == HB_IT_BLOCK ) { hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pWhile ); @@ -2110,7 +2110,7 @@ HB_FUNC( __DBLOCATE ) } else bWhile = hb_itemGetL( pWhile ); - if( hb_itemType( pFor ) == IT_BLOCK ) + if( hb_itemType( pFor ) == HB_IT_BLOCK ) { hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pFor ); @@ -2123,7 +2123,7 @@ HB_FUNC( __DBLOCATE ) { SELF_SKIP( ( AREAP ) s_pCurrArea->pArea, 1 ); SELF_EOF( ( AREAP ) s_pCurrArea->pArea, &bEof ); - if( hb_itemType( pWhile ) == IT_BLOCK ) + if( hb_itemType( pWhile ) == HB_IT_BLOCK ) { hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pWhile ); @@ -2132,7 +2132,7 @@ HB_FUNC( __DBLOCATE ) } else bWhile = hb_itemGetL( pWhile ); - if( hb_itemType( pFor ) == IT_BLOCK ) + if( hb_itemType( pFor ) == HB_IT_BLOCK ) { hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pFor ); @@ -2150,7 +2150,7 @@ HB_FUNC( __DBLOCATE ) SELF_EOF( ( AREAP ) s_pCurrArea->pArea, &bEof ); if( bEof ) return; - if( hb_itemType( pFor ) == IT_BLOCK ) + if( hb_itemType( pFor ) == HB_IT_BLOCK ) { hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pFor ); @@ -2163,7 +2163,7 @@ HB_FUNC( __DBLOCATE ) { SELF_SKIP( ( AREAP ) s_pCurrArea->pArea, 1 ); SELF_EOF( ( AREAP ) s_pCurrArea->pArea, &bEof ); - if( hb_itemType( pFor ) == IT_BLOCK ) + if( hb_itemType( pFor ) == HB_IT_BLOCK ) { hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pFor ); @@ -2181,7 +2181,7 @@ HB_FUNC( __DBSETLOCATE ) { if( s_pCurrArea ) { - PHB_ITEM pLocate = hb_param( 1, IT_BLOCK ); + PHB_ITEM pLocate = hb_param( 1, HB_IT_BLOCK ); if( pLocate ) { @@ -2203,7 +2203,7 @@ HB_FUNC( __DBPACK ) { /* Additional feature: __dbPack( [, [] ) Code Block to execute for every record. */ - ( ( AREAP ) s_pCurrArea->pArea )->lpExtendInfo->itmEval = hb_param( 1, IT_BLOCK ); + ( ( AREAP ) s_pCurrArea->pArea )->lpExtendInfo->itmEval = hb_param( 1, HB_IT_BLOCK ); ( ( AREAP ) s_pCurrArea->pArea )->lpExtendInfo->ulEvery = hb_parnl( 2 ); if( !( ( AREAP ) s_pCurrArea->pArea )->lpExtendInfo->ulEvery ) ( ( AREAP ) s_pCurrArea->pArea )->lpExtendInfo->ulEvery = 1; @@ -2270,7 +2270,7 @@ HB_FUNC( DBSEEK ) PHB_ITEM pKey; BOOL bSoftSeek, bFindLast; - pKey = hb_param( 1, IT_ANY ); + pKey = hb_param( 1, HB_IT_ANY ); bSoftSeek = ISLOG( 2 ) ? hb_parl( 2 ) : hb_set.HB_SET_SOFTSEEK; bFindLast = ISLOG( 3 ) ? hb_parl( 3 ) : FALSE; if( SELF_SEEK( ( AREAP ) s_pCurrArea->pArea, bSoftSeek, pKey, bFindLast ) == SUCCESS ) @@ -2339,7 +2339,7 @@ HB_FUNC( __DBSETFOUND ) { if( s_pCurrArea ) { - PHB_ITEM pFound = hb_param( 1, IT_LOGICAL ); + PHB_ITEM pFound = hb_param( 1, HB_IT_LOGICAL ); if( pFound ) ( ( AREAP ) s_pCurrArea->pArea )->fFound = hb_itemGetL( pFound ); @@ -2358,12 +2358,12 @@ HB_FUNC( DBSETFILTER ) { if( s_pCurrArea ) { - PHB_ITEM pBlock = hb_param( 1, IT_BLOCK ); + PHB_ITEM pBlock = hb_param( 1, HB_IT_BLOCK ); if( pBlock ) { DBFILTERINFO pFilterInfo; - PHB_ITEM pText = hb_param( 2, IT_STRING ); + PHB_ITEM pText = hb_param( 2, HB_IT_STRING ); pFilterInfo.itmCobExpr = pBlock; if( pText ) @@ -2787,7 +2787,7 @@ HB_FUNC( FIELDPUT ) { PHB_ITEM pItem; - pItem = hb_param( 2, IT_ANY ); + pItem = hb_param( 2, HB_IT_ANY ); if( SELF_PUTVALUE( ( AREAP ) s_pCurrArea->pArea, uiIndex, pItem ) == SUCCESS ) { hb_itemReturn( pItem ); @@ -2961,9 +2961,9 @@ HB_FUNC( ORDBAGNAME ) { DBORDERINFO pOrderInfo; - pOrderInfo.itmOrder = hb_param( 1, IT_STRING ); + pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING ); if( !pOrderInfo.itmOrder ) - pOrderInfo.itmOrder = hb_param( 1, IT_NUMERIC ); + pOrderInfo.itmOrder = hb_param( 1, HB_IT_NUMERIC ); if( !pOrderInfo.itmOrder ) { hb_errRT_DBCMD( EG_ARG, 1006, NULL, "ORDBAGNAME" ); @@ -2997,7 +2997,7 @@ HB_FUNC( ORDCONDSET ) } else pOrderCondInfo->abFor = NULL; - pItem = hb_param( 2, IT_BLOCK ); + pItem = hb_param( 2, HB_IT_BLOCK ); if( pItem ) { pOrderCondInfo->itmCobFor = hb_itemNew( NULL ); @@ -3009,7 +3009,7 @@ HB_FUNC( ORDCONDSET ) pOrderCondInfo->fAll = hb_parl( 3 ); else pOrderCondInfo->fAll = TRUE; - pItem = hb_param( 4, IT_BLOCK ); + pItem = hb_param( 4, HB_IT_BLOCK ); if( pItem ) { pOrderCondInfo->itmCobWhile = hb_itemNew( NULL ); @@ -3017,7 +3017,7 @@ HB_FUNC( ORDCONDSET ) } else pOrderCondInfo->itmCobWhile = NULL; - pItem = hb_param( 5, IT_BLOCK ); + pItem = hb_param( 5, HB_IT_BLOCK ); if( pItem ) { pOrderCondInfo->itmCobEval = hb_itemNew( NULL ); @@ -3053,7 +3053,7 @@ HB_FUNC( ORDCREATE ) pOrderInfo.abBagName = ( BYTE * ) hb_parc( 1 ); pOrderInfo.atomBagName = ( BYTE * ) hb_parc( 2 ); - pOrderInfo.abExpr = hb_param( 3, IT_STRING ); + pOrderInfo.abExpr = hb_param( 3, HB_IT_STRING ); if( ( ( strlen( ( char * ) pOrderInfo.abBagName ) == 0 ) && ( strlen( ( char * ) pOrderInfo.atomBagName ) == 0 ) ) || !pOrderInfo.abExpr ) @@ -3061,7 +3061,7 @@ HB_FUNC( ORDCREATE ) hb_errRT_DBCMD( EG_ARG, 1006, NULL, "ORDCREATE" ); return; } - pOrderInfo.itmCobExpr = hb_param( 4, IT_BLOCK ); + pOrderInfo.itmCobExpr = hb_param( 4, HB_IT_BLOCK ); if( ISLOG( 5 ) ) pOrderInfo.fUnique = hb_parl( 5 ); else @@ -3078,10 +3078,10 @@ HB_FUNC( ORDDESTROY ) { DBORDERINFO pOrderInfo; - pOrderInfo.itmOrder = hb_param( 1, IT_STRING ); + pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING ); if( !pOrderInfo.itmOrder ) - pOrderInfo.itmOrder = hb_param( 1, IT_NUMERIC ); - pOrderInfo.atomBagName = hb_param( 2, IT_STRING ); + pOrderInfo.itmOrder = hb_param( 1, HB_IT_NUMERIC ); + pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING ); SELF_ORDDESTROY( ( AREAP ) s_pCurrArea->pArea, &pOrderInfo ); } } @@ -3092,10 +3092,10 @@ HB_FUNC( ORDFOR ) { DBORDERINFO pOrderInfo; - pOrderInfo.itmOrder = hb_param( 1, IT_STRING ); + pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING ); if( !pOrderInfo.itmOrder ) - pOrderInfo.itmOrder = hb_param( 1, IT_NUMERIC ); - pOrderInfo.atomBagName = hb_param( 2, IT_STRING ); + pOrderInfo.itmOrder = hb_param( 1, HB_IT_NUMERIC ); + pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING ); if( !pOrderInfo.itmOrder ) { hb_errRT_DBCMD( EG_ARG, 1006, NULL, "ORDFOR" ); @@ -3116,10 +3116,10 @@ HB_FUNC( ORDKEY ) { DBORDERINFO pOrderInfo; - pOrderInfo.itmOrder = hb_param( 1, IT_STRING ); + pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING ); if( !pOrderInfo.itmOrder ) - pOrderInfo.itmOrder = hb_param( 1, IT_NUMERIC ); - pOrderInfo.atomBagName = hb_param( 2, IT_STRING ); + pOrderInfo.itmOrder = hb_param( 1, HB_IT_NUMERIC ); + pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING ); if( !pOrderInfo.itmOrder ) { hb_errRT_DBCMD( EG_ARG, 1006, NULL, "ORDKEY" ); @@ -3140,8 +3140,8 @@ HB_FUNC( ORDLISTADD ) { DBORDERINFO pOrderInfo; - pOrderInfo.atomBagName = hb_param( 1, IT_STRING ); - pOrderInfo.itmOrder = hb_param( 2, IT_STRING ); + pOrderInfo.atomBagName = hb_param( 1, HB_IT_STRING ); + pOrderInfo.itmOrder = hb_param( 2, HB_IT_STRING ); if( !pOrderInfo.atomBagName ) { hb_errRT_DBCMD( EG_ARG, 1006, NULL, "ORDLISTADD" ); @@ -3175,8 +3175,8 @@ HB_FUNC( ORDNAME ) { DBORDERINFO pOrderInfo; - pOrderInfo.itmOrder = hb_param( 1, IT_NUMERIC ); - pOrderInfo.atomBagName = hb_param( 2, IT_STRING ); + pOrderInfo.itmOrder = hb_param( 1, HB_IT_NUMERIC ); + pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING ); if( !pOrderInfo.itmOrder ) { hb_errRT_DBCMD( EG_ARG, 1006, NULL, "ORDNAME" ); @@ -3197,8 +3197,8 @@ HB_FUNC( ORDNUMBER ) { DBORDERINFO pOrderInfo; - pOrderInfo.itmOrder = hb_param( 1, IT_STRING ); - pOrderInfo.atomBagName = hb_param( 2, IT_STRING ); + pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING ); + pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING ); if( !pOrderInfo.itmOrder ) { hb_errRT_DBCMD( EG_ARG, 1006, NULL, "ORDNUMBER" ); @@ -3219,10 +3219,10 @@ HB_FUNC( ORDSETFOCUS ) { DBORDERINFO pInfo; - pInfo.itmOrder = hb_param( 1, IT_STRING ); + pInfo.itmOrder = hb_param( 1, HB_IT_STRING ); if( !pInfo.itmOrder ) - pInfo.itmOrder = hb_param( 1, IT_NUMERIC ); - pInfo.atomBagName = hb_param( 2, IT_STRING ); + pInfo.itmOrder = hb_param( 1, HB_IT_NUMERIC ); + pInfo.atomBagName = hb_param( 2, HB_IT_STRING ); pInfo.itmResult = hb_itemPutC( NULL, "" ); SELF_ORDLSTFOCUS( ( AREAP ) s_pCurrArea->pArea, &pInfo ); hb_retc( hb_itemGetCPtr( pInfo.itmResult ) ); @@ -3468,8 +3468,8 @@ HB_FUNC( ORDSCOPE ) { DBORDSCOPEINFO sInfo; - if( hb_pcount() == 0 || !(hb_parinfo( 1 ) & IT_NUMERIC) || - ( hb_pcount() > 1 && hb_parinfo( 2 ) != IT_STRING ) ) + if( hb_pcount() == 0 || !(hb_parinfo( 1 ) & HB_IT_NUMERIC) || + ( hb_pcount() > 1 && hb_parinfo( 2 ) != HB_IT_STRING ) ) { hb_errRT_DBCMD( EG_ARG, 1006, NULL, "ORDSCOPE" ); return; diff --git a/harbour/source/rdd/dbf1.c b/harbour/source/rdd/dbf1.c index 6a542bd238..6a093cca8a 100644 --- a/harbour/source/rdd/dbf1.c +++ b/harbour/source/rdd/dbf1.c @@ -1185,7 +1185,7 @@ static ERRCODE dbfGoToId( AREAP pArea, PHB_ITEM pItem ) HB_TRACE(HB_TR_DEBUG, ("dbfGoToId(%p, %p)", pArea, pItem)); - if( IS_NUMERIC( pItem ) ) + if( HB_IS_NUMERIC( pItem ) ) { ulRecNo = hb_itemGetNL( pItem ); if( ulRecNo == 0 ) @@ -1524,7 +1524,7 @@ static ERRCODE dbfPutValue( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) switch( pField->uiType ) { case 'C': - if( IS_STRING( pItem ) ) + if( HB_IS_STRING( pItem ) ) { uiCount = ( USHORT ) hb_itemGetCLen( pItem ); if( uiCount > pField->uiLen ) @@ -1536,7 +1536,7 @@ static ERRCODE dbfPutValue( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) break; case 'N': - if( IS_NUMERIC( pItem ) ) + if( HB_IS_NUMERIC( pItem ) ) { if( pField->uiDec ) bError = !hb_ndtoa( hb_itemGetND( pItem ), ( char * ) szText, @@ -1558,7 +1558,7 @@ static ERRCODE dbfPutValue( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) break; case 'D': - if( IS_DATE( pItem ) ) + if( HB_IS_DATE( pItem ) ) { szEndChar = * ( szText + pField->uiLen ); hb_dateDecode( hb_itemGetDL( pItem ), &lDay, &lMonth, &lYear ); @@ -1569,7 +1569,7 @@ static ERRCODE dbfPutValue( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) break; case 'L': - if( IS_LOGICAL( pItem ) ) + if( HB_IS_LOGICAL( pItem ) ) { *szText = hb_itemGetL( pItem ) ? 'T' : 'F'; bError = FALSE; @@ -1577,7 +1577,7 @@ static ERRCODE dbfPutValue( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) break; case 'M': - if( IS_STRING( pItem ) ) + if( HB_IS_STRING( pItem ) ) { uiCount = ( USHORT ) hb_itemGetCLen( pItem ); if( ( ( LPDBFMEMO ) pField->memo )->uiLen < uiCount ) diff --git a/harbour/source/rdd/dbfcdx/dbfcdx1.c b/harbour/source/rdd/dbfcdx/dbfcdx1.c index c200432ea8..776464f8e8 100644 --- a/harbour/source/rdd/dbfcdx/dbfcdx1.c +++ b/harbour/source/rdd/dbfcdx/dbfcdx1.c @@ -509,7 +509,7 @@ static ERRCODE cdxOrderCreate( AREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) /* Get a blank record before testing expression */ SELF_GOBOTTOM( pArea ); SELF_SKIP( pArea, 1 ); - if( hb_itemType( pExpr ) == IT_BLOCK ) + if( hb_itemType( pExpr ) == HB_IT_BLOCK ) { if( SELF_EVALBLOCK( pArea, pExpr ) == FAILURE ) return FAILURE; @@ -528,21 +528,21 @@ static ERRCODE cdxOrderCreate( AREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) uiType = hb_itemType( pResult ); switch( uiType ) { - case IT_INTEGER: - case IT_LONG: - case IT_DOUBLE: + case HB_IT_INTEGER: + case HB_IT_LONG: + case HB_IT_DOUBLE: uiLen = 10; break; - case IT_DATE: + case HB_IT_DATE: uiLen = 8; break; - case IT_LOGICAL: + case HB_IT_LOGICAL: uiLen = 1; break; - case IT_STRING: + case HB_IT_STRING: uiLen = ( hb_itemGetCLen( pResult ) > CDX_MAX_KEY ) ? CDX_MAX_KEY : ( USHORT ) hb_itemGetCLen( pResult ); break; @@ -581,7 +581,7 @@ static ERRCODE cdxOrderCreate( AREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) /* Test conditional expression */ if( pExpr ) { - if( hb_itemType( pExpr ) == IT_BLOCK ) + if( hb_itemType( pExpr ) == HB_IT_BLOCK ) { if( SELF_EVALBLOCK( pArea, pExpr ) == FAILURE ) return FAILURE; @@ -597,7 +597,7 @@ static ERRCODE cdxOrderCreate( AREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) } uiType = hb_itemType( pResult ); hb_itemRelease( pResult ); - if( uiType != IT_LOGICAL ) + if( uiType != HB_IT_LOGICAL ) return FAILURE; } diff --git a/harbour/source/rtl/abs.c b/harbour/source/rtl/abs.c index 6989a74155..f5ddffeac6 100644 --- a/harbour/source/rtl/abs.c +++ b/harbour/source/rtl/abs.c @@ -39,7 +39,7 @@ HB_FUNC( ABS ) { - PHB_ITEM pNumber = hb_param( 1, IT_NUMERIC ); + PHB_ITEM pNumber = hb_param( 1, HB_IT_NUMERIC ); if( pNumber ) { @@ -48,7 +48,7 @@ HB_FUNC( ABS ) hb_itemGetNLen( pNumber, &iWidth, &iDec ); - if( IS_INTEGER( pNumber ) ) + if( HB_IS_INTEGER( pNumber ) ) { int iNumber = hb_itemGetNI( pNumber ); @@ -57,7 +57,7 @@ HB_FUNC( ABS ) else hb_retni( -iNumber ); } - else if( IS_LONG( pNumber ) ) + else if( HB_IS_LONG( pNumber ) ) { long lNumber = hb_itemGetNL( pNumber ); @@ -66,7 +66,7 @@ HB_FUNC( ABS ) else hb_retnl( -lNumber ); } - else if( IS_DOUBLE( pNumber ) ) + else if( HB_IS_DOUBLE( pNumber ) ) { double dNumber = hb_itemGetND( pNumber ); diff --git a/harbour/source/rtl/at.c b/harbour/source/rtl/at.c index 668f5172c7..c1ada5437d 100644 --- a/harbour/source/rtl/at.c +++ b/harbour/source/rtl/at.c @@ -42,8 +42,8 @@ HB_FUNC( AT ) { - PHB_ITEM pSub = hb_param( 1, IT_STRING ); - PHB_ITEM pText = hb_param( 2, IT_STRING ); + PHB_ITEM pSub = hb_param( 1, HB_IT_STRING ); + PHB_ITEM pText = hb_param( 2, HB_IT_STRING ); if( pText && pSub ) { diff --git a/harbour/source/rtl/binnum.c b/harbour/source/rtl/binnum.c index b947b2fd44..e18445ff6b 100644 --- a/harbour/source/rtl/binnum.c +++ b/harbour/source/rtl/binnum.c @@ -38,7 +38,7 @@ HB_FUNC( BIN2W ) { - PHB_ITEM pItem = hb_param( 1, IT_STRING ); + PHB_ITEM pItem = hb_param( 1, HB_IT_STRING ); if( pItem ) { @@ -58,7 +58,7 @@ HB_FUNC( BIN2W ) HB_FUNC( BIN2I ) { - PHB_ITEM pItem = hb_param( 1, IT_STRING ); + PHB_ITEM pItem = hb_param( 1, HB_IT_STRING ); if( pItem ) { @@ -78,7 +78,7 @@ HB_FUNC( BIN2I ) HB_FUNC( BIN2L ) { - PHB_ITEM pItem = hb_param( 1, IT_STRING ); + PHB_ITEM pItem = hb_param( 1, HB_IT_STRING ); if( pItem ) { diff --git a/harbour/source/rtl/binnumx.c b/harbour/source/rtl/binnumx.c index a8e9298411..8b6b0de94d 100644 --- a/harbour/source/rtl/binnumx.c +++ b/harbour/source/rtl/binnumx.c @@ -42,7 +42,7 @@ HB_FUNC( BIN2U ) { - PHB_ITEM pItem = hb_param( 1, IT_STRING ); + PHB_ITEM pItem = hb_param( 1, HB_IT_STRING ); if( pItem ) { diff --git a/harbour/source/rtl/box.c b/harbour/source/rtl/box.c index 3a8791174a..867b964f84 100644 --- a/harbour/source/rtl/box.c +++ b/harbour/source/rtl/box.c @@ -39,10 +39,10 @@ HB_FUNC( DISPBOX ) { - PHB_ITEM pTop = hb_param( 1, IT_NUMERIC ); - PHB_ITEM pLeft = hb_param( 2, IT_NUMERIC ); - PHB_ITEM pBottom = hb_param( 3, IT_NUMERIC ); - PHB_ITEM pRight = hb_param( 4, IT_NUMERIC ); + PHB_ITEM pTop = hb_param( 1, HB_IT_NUMERIC ); + PHB_ITEM pLeft = hb_param( 2, HB_IT_NUMERIC ); + PHB_ITEM pBottom = hb_param( 3, HB_IT_NUMERIC ); + PHB_ITEM pRight = hb_param( 4, HB_IT_NUMERIC ); if( pTop && pLeft && pBottom && pRight ) { diff --git a/harbour/source/rtl/chrasc.c b/harbour/source/rtl/chrasc.c index d69b968491..e9a9db1ee4 100644 --- a/harbour/source/rtl/chrasc.c +++ b/harbour/source/rtl/chrasc.c @@ -72,7 +72,7 @@ HB_FUNC( CHR ) /* converts a character value to an ASCII code */ HB_FUNC( ASC ) { - PHB_ITEM pText = hb_param( 1, IT_STRING ); + PHB_ITEM pText = hb_param( 1, HB_IT_STRING ); if( pText ) { diff --git a/harbour/source/rtl/console.c b/harbour/source/rtl/console.c index 241b69da8c..3b7cb1bf6e 100644 --- a/harbour/source/rtl/console.c +++ b/harbour/source/rtl/console.c @@ -162,7 +162,7 @@ static void hb_conOut( USHORT uiParam, hb_out_func_typedef * pOutFunc ) HB_TRACE(HB_TR_DEBUG, ("hb_conOut(%hu, %p)", uiParam, hb_out_func)); - pItem = hb_param( uiParam, IT_ANY ); + pItem = hb_param( uiParam, HB_IT_ANY ); pszString = hb_itemString( pItem, &ulLen, &bFreeReq ); pOutFunc( pszString, ulLen ); diff --git a/harbour/source/rtl/datec.c b/harbour/source/rtl/datec.c index 17ab52ac16..356eaeb0d7 100644 --- a/harbour/source/rtl/datec.c +++ b/harbour/source/rtl/datec.c @@ -54,7 +54,7 @@ char * hb_dateCDOW( int iDay ) HB_FUNC( CMONTH ) { - PHB_ITEM pDate = hb_param( 1, IT_DATE ); + PHB_ITEM pDate = hb_param( 1, HB_IT_DATE ); if( pDate ) { @@ -77,7 +77,7 @@ HB_FUNC( CMONTH ) HB_FUNC( CDOW ) { - PHB_ITEM pDate = hb_param( 1, IT_DATE ); + PHB_ITEM pDate = hb_param( 1, HB_IT_DATE ); if( pDate ) { diff --git a/harbour/source/rtl/dateshb.c b/harbour/source/rtl/dateshb.c index f657b66d1f..40554fb072 100644 --- a/harbour/source/rtl/dateshb.c +++ b/harbour/source/rtl/dateshb.c @@ -219,7 +219,7 @@ HB_FUNC( HB_STOD ) HB_FUNC( YEAR ) { - PHB_ITEM pDate = hb_param( 1, IT_DATE ); + PHB_ITEM pDate = hb_param( 1, HB_IT_DATE ); if( pDate ) { @@ -243,7 +243,7 @@ HB_FUNC( YEAR ) HB_FUNC( MONTH ) { - PHB_ITEM pDate = hb_param( 1, IT_DATE ); + PHB_ITEM pDate = hb_param( 1, HB_IT_DATE ); if( pDate ) { @@ -267,7 +267,7 @@ HB_FUNC( MONTH ) HB_FUNC( DAY ) { - PHB_ITEM pDate = hb_param( 1, IT_DATE ); + PHB_ITEM pDate = hb_param( 1, HB_IT_DATE ); if( pDate ) { @@ -331,7 +331,7 @@ HB_FUNC( DATE ) HB_FUNC( DOW ) { - PHB_ITEM pDate = hb_param( 1, IT_DATE ); + PHB_ITEM pDate = hb_param( 1, HB_IT_DATE ); if( pDate ) { diff --git a/harbour/source/rtl/descend.c b/harbour/source/rtl/descend.c index 86588bf249..9f204d5dd6 100644 --- a/harbour/source/rtl/descend.c +++ b/harbour/source/rtl/descend.c @@ -51,11 +51,11 @@ void hb_strDescend( char * szStringTo, const char * szStringFrom, ULONG ulLen ) HB_FUNC( DESCEND ) { - PHB_ITEM pItem = hb_param( 1, IT_ANY ); + PHB_ITEM pItem = hb_param( 1, HB_IT_ANY ); if( pItem ) { - if( IS_STRING( pItem ) ) + if( HB_IS_STRING( pItem ) ) { ULONG ulLen = hb_itemGetCLen( pItem ); char * szBuffer = ( char * ) hb_xgrab( ulLen ); @@ -63,11 +63,11 @@ HB_FUNC( DESCEND ) hb_retclen( szBuffer, ulLen ); hb_xfree( szBuffer ); } - else if( IS_DATE( pItem ) ) + else if( HB_IS_DATE( pItem ) ) hb_retnl( 5231808 - hb_itemGetDL( pItem ) ); - else if( IS_NUMERIC( pItem ) ) + else if( HB_IS_NUMERIC( pItem ) ) hb_retnd( -1 * hb_itemGetND( pItem ) ); - else if( IS_LOGICAL( pItem ) ) + else if( HB_IS_LOGICAL( pItem ) ) hb_retl( ! hb_itemGetL( pItem ) ); } } diff --git a/harbour/source/rtl/dir.c b/harbour/source/rtl/dir.c index 629597db58..90fcc620f0 100644 --- a/harbour/source/rtl/dir.c +++ b/harbour/source/rtl/dir.c @@ -361,11 +361,11 @@ HB_FUNC( DIRECTORY ) { #if defined(HAVE_POSIX_IO) - PHB_ITEM pDirSpec = hb_param( 1, IT_STRING ); - PHB_ITEM pAttributes = hb_param( 2, IT_STRING ); + PHB_ITEM pDirSpec = hb_param( 1, HB_IT_STRING ); + PHB_ITEM pAttributes = hb_param( 2, HB_IT_STRING ); #if defined(__MINGW32__) || ( defined(_MSC_VER) && _MSC_VER >= 1000 ) - PHB_ITEM pEightDotThree = hb_param( 3, IT_LOGICAL ); + PHB_ITEM pEightDotThree = hb_param( 3, HB_IT_LOGICAL ); BOOL bEightDotThree; #elif defined(__WATCOMC__) int iDirnameLen; diff --git a/harbour/source/rtl/do.c b/harbour/source/rtl/do.c index 8b14e6ce69..fb0ac3ebb8 100644 --- a/harbour/source/rtl/do.c +++ b/harbour/source/rtl/do.c @@ -40,9 +40,9 @@ HB_FUNC( DO ) { - PHB_ITEM pItem = hb_param( 1, IT_ANY ); + PHB_ITEM pItem = hb_param( 1, HB_IT_ANY ); - if( IS_STRING( pItem ) ) + if( HB_IS_STRING( pItem ) ) { PHB_DYNS pDynSym = hb_dynsymFindName( hb_itemGetCPtr( pItem ) ); @@ -54,13 +54,13 @@ HB_FUNC( DO ) hb_vmPushSymbol( pDynSym->pSymbol ); hb_vmPushNil(); for( uiParam = 2; uiParam <= uiPCount; uiParam++ ) - hb_vmPush( hb_param( uiParam, IT_ANY ) ); + hb_vmPush( hb_param( uiParam, HB_IT_ANY ) ); hb_vmDo( uiPCount - 1 ); } else hb_errRT_BASE( EG_NOFUNC, 1001, NULL, hb_itemGetCPtr( pItem ) ); } - else if( IS_BLOCK( pItem ) ) + else if( HB_IS_BLOCK( pItem ) ) { USHORT uiPCount = hb_pcount(); USHORT uiParam; @@ -68,10 +68,10 @@ HB_FUNC( DO ) hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pItem ); for( uiParam = 2; uiParam <= uiPCount; uiParam++ ) - hb_vmPush( hb_param( uiParam, IT_ANY ) ); + hb_vmPush( hb_param( uiParam, HB_IT_ANY ) ); hb_vmDo( uiPCount - 1 ); } - else if( IS_SYMBOL( pItem ) ) + else if( HB_IS_SYMBOL( pItem ) ) { USHORT uiPCount = hb_pcount(); USHORT uiParam; @@ -79,7 +79,7 @@ HB_FUNC( DO ) hb_vmPushSymbol( pItem->item.asSymbol.value ); hb_vmPushNil(); for( uiParam = 2; uiParam <= uiPCount; uiParam++ ) - hb_vmPush( hb_param( uiParam, IT_ANY ) ); + hb_vmPush( hb_param( uiParam, HB_IT_ANY ) ); hb_vmDo( uiPCount - 1 ); } else diff --git a/harbour/source/rtl/empty.c b/harbour/source/rtl/empty.c index aa6e731704..9c891a22e1 100644 --- a/harbour/source/rtl/empty.c +++ b/harbour/source/rtl/empty.c @@ -38,40 +38,40 @@ HB_FUNC( EMPTY ) { - PHB_ITEM pItem = hb_param( 1, IT_ANY ); + PHB_ITEM pItem = hb_param( 1, HB_IT_ANY ); - switch( hb_itemType( pItem ) & ~IT_BYREF ) + switch( hb_itemType( pItem ) & ~HB_IT_BYREF ) { - case IT_ARRAY: + case HB_IT_ARRAY: hb_retl( hb_arrayLen( pItem ) == 0 ); break; - case IT_STRING: - case IT_MEMO: + case HB_IT_STRING: + case HB_IT_MEMO: hb_retl( hb_strEmpty( hb_itemGetCPtr( pItem ), hb_itemGetCLen( pItem ) ) ); break; - case IT_INTEGER: + case HB_IT_INTEGER: hb_retl( hb_itemGetNI( pItem ) == 0 ); break; - case IT_LONG: + case HB_IT_LONG: hb_retl( hb_itemGetNL( pItem ) == 0 ); break; - case IT_DOUBLE: + case HB_IT_DOUBLE: hb_retl( hb_itemGetND( pItem ) == 0.0 ); break; - case IT_DATE: + case HB_IT_DATE: hb_retl( hb_itemGetDL( pItem ) == 0 ); break; - case IT_LOGICAL: + case HB_IT_LOGICAL: hb_retl( ! hb_itemGetL( pItem ) ); break; - case IT_BLOCK: + case HB_IT_BLOCK: hb_retl( FALSE ); break; diff --git a/harbour/source/rtl/errorapi.c b/harbour/source/rtl/errorapi.c index ef077d5cc0..dbeec26931 100644 --- a/harbour/source/rtl/errorapi.c +++ b/harbour/source/rtl/errorapi.c @@ -96,7 +96,7 @@ HB_FUNC( __ERRINHANDLER ) HB_FUNC( ERRORBLOCK ) { HB_ITEM oldError; - PHB_ITEM pNewErrorBlock = hb_param( 1, IT_BLOCK ); + PHB_ITEM pNewErrorBlock = hb_param( 1, HB_IT_BLOCK ); hb_itemClear( &oldError ); hb_itemCopy( &oldError, &s_errorBlock ); @@ -176,7 +176,7 @@ USHORT hb_errLaunch( PHB_ITEM pError ) /* Check if we have a valid error handler */ - if( hb_itemType( &s_errorBlock ) != IT_BLOCK ) + if( hb_itemType( &s_errorBlock ) != HB_IT_BLOCK ) hb_errInternal( 9999, "No ERRORBLOCK() for error", NULL, NULL ); /* Check if the error launcher was called too many times recursively */ @@ -227,7 +227,7 @@ USHORT hb_errLaunch( PHB_ITEM pError ) /* If the error block didn't return a logical value, */ /* or the canSubstitute flag has been set, consider it as a failure */ - if( hb_itemType( pResult ) != IT_LOGICAL || ( uiFlags & EF_CANSUBSTITUTE ) ) + if( hb_itemType( pResult ) != HB_IT_LOGICAL || ( uiFlags & EF_CANSUBSTITUTE ) ) bFailure = TRUE; else { @@ -279,7 +279,7 @@ PHB_ITEM hb_errLaunchSubst( PHB_ITEM pError ) { /* Check if we have a valid error handler */ - if( hb_itemType( &s_errorBlock ) != IT_BLOCK ) + if( hb_itemType( &s_errorBlock ) != HB_IT_BLOCK ) hb_errInternal( 9999, "No ERRORBLOCK() for error", NULL, NULL ); /* Check if the error launcher was called too many times recursively */ diff --git a/harbour/source/rtl/eval.c b/harbour/source/rtl/eval.c index 5b334f0968..d8fefc27db 100644 --- a/harbour/source/rtl/eval.c +++ b/harbour/source/rtl/eval.c @@ -40,7 +40,7 @@ HB_FUNC( EVAL ) { - PHB_ITEM pItem = hb_param( 1, IT_BLOCK ); + PHB_ITEM pItem = hb_param( 1, HB_IT_BLOCK ); if( pItem ) { @@ -50,7 +50,7 @@ HB_FUNC( EVAL ) hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pItem ); for( uiParam = 2; uiParam <= uiPCount; uiParam++ ) - hb_vmPush( hb_param( uiParam, IT_ANY ) ); + hb_vmPush( hb_param( uiParam, HB_IT_ANY ) ); hb_vmDo( uiPCount - 1 ); } else diff --git a/harbour/source/rtl/fkmax.c b/harbour/source/rtl/fkmax.c index dc4dd03fa2..066d0b9a44 100644 --- a/harbour/source/rtl/fkmax.c +++ b/harbour/source/rtl/fkmax.c @@ -47,7 +47,7 @@ HB_FUNC( FKMAX ) HB_FUNC( FKLABEL ) { - PHB_ITEM pPar1 = hb_param( 1, IT_NUMERIC ); + PHB_ITEM pPar1 = hb_param( 1, HB_IT_NUMERIC ); if( pPar1 != NULL ) { diff --git a/harbour/source/rtl/gete.c b/harbour/source/rtl/gete.c index 221053046d..ebfe0a36c4 100644 --- a/harbour/source/rtl/gete.c +++ b/harbour/source/rtl/gete.c @@ -53,7 +53,7 @@ HB_FUNC( GETENV ) { - PHB_ITEM pName = hb_param( 1, IT_STRING ); + PHB_ITEM pName = hb_param( 1, HB_IT_STRING ); if( pName ) { diff --git a/harbour/source/rtl/hardcr.c b/harbour/source/rtl/hardcr.c index e1ceb06c7b..a9285fd294 100644 --- a/harbour/source/rtl/hardcr.c +++ b/harbour/source/rtl/hardcr.c @@ -61,7 +61,7 @@ char * hb_strHardCR( char * pszString, ULONG ulStringLen ) HB_FUNC( HARDCR ) { - PHB_ITEM pString = hb_param( 1, IT_STRING ); + PHB_ITEM pString = hb_param( 1, HB_IT_STRING ); if( pString ) { diff --git a/harbour/source/rtl/inkey.c b/harbour/source/rtl/inkey.c index 933f7d134c..13f039edcf 100644 --- a/harbour/source/rtl/inkey.c +++ b/harbour/source/rtl/inkey.c @@ -329,7 +329,7 @@ HB_FUNC( INKEY ) double seconds = 0.0; HB_inkey_enum event_mask = hb_set.HB_SET_EVENTMASK; /* Default to the SET input event mask */ - if( args == 1 || ( args > 1 && hb_param( 1, IT_NUMERIC ) ) ) + if( args == 1 || ( args > 1 && hb_param( 1, HB_IT_NUMERIC ) ) ) { /* If only one parameter or if 1st parameter is numeric, then use it as the number of seconds to wait for an input event, in seconds. */ @@ -338,7 +338,7 @@ HB_FUNC( INKEY ) if( seconds * CLOCKS_PER_SEC < 1 ) forever = TRUE; } - if( args > 1 && hb_param( 2, IT_NUMERIC ) ) + if( args > 1 && hb_param( 2, HB_IT_NUMERIC ) ) { /* If 2nd parameter is numeric, then use it as the input mask */ event_mask = ( HB_inkey_enum )hb_parni( 2 ); diff --git a/harbour/source/rtl/left.c b/harbour/source/rtl/left.c index f142e7bc58..71eebdf387 100644 --- a/harbour/source/rtl/left.c +++ b/harbour/source/rtl/left.c @@ -41,7 +41,7 @@ HB_FUNC( LEFT ) { - PHB_ITEM pText = hb_param( 1, IT_STRING ); + PHB_ITEM pText = hb_param( 1, HB_IT_STRING ); if( pText && ISNUM( 2 ) ) { diff --git a/harbour/source/rtl/len.c b/harbour/source/rtl/len.c index 94e36fb7e7..447f4ab60f 100644 --- a/harbour/source/rtl/len.c +++ b/harbour/source/rtl/len.c @@ -39,7 +39,7 @@ HB_FUNC( LEN ) { - PHB_ITEM pItem = hb_param( 1, IT_ANY ); + PHB_ITEM pItem = hb_param( 1, HB_IT_ANY ); /* NOTE: Double safety to ensure that a parameter was really passed, compiler checks this, but a direct hb_vmDo() call @@ -47,12 +47,12 @@ HB_FUNC( LEN ) if( pItem ) { - if( IS_STRING( pItem ) ) + if( HB_IS_STRING( pItem ) ) { hb_retnl( hb_itemGetCLen( pItem ) ); return; } - else if( IS_ARRAY( pItem ) ) + else if( HB_IS_ARRAY( pItem ) ) { hb_retnl( hb_arrayLen( pItem ) ); return; diff --git a/harbour/source/rtl/lennum.c b/harbour/source/rtl/lennum.c index c59bb50c24..ed9332d65f 100644 --- a/harbour/source/rtl/lennum.c +++ b/harbour/source/rtl/lennum.c @@ -38,7 +38,7 @@ HB_FUNC( LENNUM ) { - PHB_ITEM pNumber = hb_param( 1, IT_NUMERIC ); + PHB_ITEM pNumber = hb_param( 1, HB_IT_NUMERIC ); ULONG ulLen = 0; if( pNumber ) diff --git a/harbour/source/rtl/memofile.c b/harbour/source/rtl/memofile.c index 01e040d0a7..564269daf7 100644 --- a/harbour/source/rtl/memofile.c +++ b/harbour/source/rtl/memofile.c @@ -43,7 +43,7 @@ HB_FUNC( MEMOREAD ) { - PHB_ITEM pFileName = hb_param( 1, IT_STRING ); + PHB_ITEM pFileName = hb_param( 1, HB_IT_STRING ); if( pFileName ) { @@ -85,8 +85,8 @@ HB_FUNC( MEMOREAD ) HB_FUNC( MEMOWRIT ) { - PHB_ITEM pFileName = hb_param( 1, IT_STRING ); - PHB_ITEM pString = hb_param( 2, IT_STRING ); + PHB_ITEM pFileName = hb_param( 1, HB_IT_STRING ); + PHB_ITEM pString = hb_param( 2, HB_IT_STRING ); BOOL bRetVal = FALSE; if( pFileName && pString ) diff --git a/harbour/source/rtl/minmax.c b/harbour/source/rtl/minmax.c index a9a1400d80..2bafc9c558 100644 --- a/harbour/source/rtl/minmax.c +++ b/harbour/source/rtl/minmax.c @@ -40,15 +40,15 @@ /* returns the maximum of two date or numerics */ HB_FUNC( MAX ) { - PHB_ITEM p1 = hb_param( 1, IT_ANY ); - PHB_ITEM p2 = hb_param( 2, IT_ANY ); + PHB_ITEM p1 = hb_param( 1, HB_IT_ANY ); + PHB_ITEM p2 = hb_param( 2, HB_IT_ANY ); - if( IS_NUMERIC( p1 ) && IS_NUMERIC( p2 ) ) + if( HB_IS_NUMERIC( p1 ) && HB_IS_NUMERIC( p2 ) ) { /* NOTE: The order of these if() branches is significant, */ /* please, don't change it. [vszakats] */ - if( IS_DOUBLE( p1 ) || IS_DOUBLE( p2 ) ) + if( HB_IS_DOUBLE( p1 ) || HB_IS_DOUBLE( p2 ) ) { double d1 = hb_itemGetND( p1 ); double d2 = hb_itemGetND( p2 ); @@ -64,7 +64,7 @@ HB_FUNC( MAX ) else hb_retndlen( d2, 0, iDec2 ); } - else if( IS_LONG( p1 ) || IS_LONG( p2 ) ) + else if( HB_IS_LONG( p1 ) || HB_IS_LONG( p2 ) ) { long l1 = hb_itemGetNL( p1 ); long l2 = hb_itemGetNL( p2 ); @@ -79,7 +79,7 @@ HB_FUNC( MAX ) hb_retni( i1 >= i2 ? i1 : i2 ); } } - else if( IS_DATE( p1 ) && IS_DATE( p2 ) ) + else if( HB_IS_DATE( p1 ) && HB_IS_DATE( p2 ) ) { char szDate[ 9 ]; @@ -100,15 +100,15 @@ HB_FUNC( MAX ) /* returns the minimum of two date or numerics */ HB_FUNC( MIN ) { - PHB_ITEM p1 = hb_param( 1, IT_ANY ); - PHB_ITEM p2 = hb_param( 2, IT_ANY ); + PHB_ITEM p1 = hb_param( 1, HB_IT_ANY ); + PHB_ITEM p2 = hb_param( 2, HB_IT_ANY ); - if( IS_NUMERIC( p1 ) && IS_NUMERIC( p2 ) ) + if( HB_IS_NUMERIC( p1 ) && HB_IS_NUMERIC( p2 ) ) { /* NOTE: The order of these if() branches is significant, */ /* please, don't change it. [vszakats] */ - if( IS_DOUBLE( p1 ) || IS_DOUBLE( p2 ) ) + if( HB_IS_DOUBLE( p1 ) || HB_IS_DOUBLE( p2 ) ) { double d1 = hb_itemGetND( p1 ); double d2 = hb_itemGetND( p2 ); @@ -124,7 +124,7 @@ HB_FUNC( MIN ) else hb_retndlen( d2, 0, iDec2 ); } - else if( IS_LONG( p1 ) || IS_LONG( p2 ) ) + else if( HB_IS_LONG( p1 ) || HB_IS_LONG( p2 ) ) { long l1 = hb_itemGetNL( p1 ); long l2 = hb_itemGetNL( p2 ); @@ -139,7 +139,7 @@ HB_FUNC( MIN ) hb_retni( i1 <= i2 ? i1 : i2 ); } } - else if( IS_DATE( p1 ) && IS_DATE( p2 ) ) + else if( HB_IS_DATE( p1 ) && HB_IS_DATE( p2 ) ) { char szDate[ 9 ]; diff --git a/harbour/source/rtl/mod.c b/harbour/source/rtl/mod.c index 81dc83f998..689cbc340f 100644 --- a/harbour/source/rtl/mod.c +++ b/harbour/source/rtl/mod.c @@ -49,7 +49,7 @@ HB_FUNC( MOD ) { - PHB_ITEM pNumber = hb_param( 1, IT_NUMERIC ); + PHB_ITEM pNumber = hb_param( 1, HB_IT_NUMERIC ); if( pNumber && ISNUM( 2 ) ) { diff --git a/harbour/source/rtl/mousex.c b/harbour/source/rtl/mousex.c index e3cd36377c..7baa2e42e8 100644 --- a/harbour/source/rtl/mousex.c +++ b/harbour/source/rtl/mousex.c @@ -54,8 +54,8 @@ HB_FUNC( SETMOUSE ) hb_mouseSetCursor( hb_parl( 1 ) ); { - PHB_ITEM pRow = hb_param( 2, IT_NUMERIC ); - PHB_ITEM pCol = hb_param( 3, IT_NUMERIC ); + PHB_ITEM pRow = hb_param( 2, HB_IT_NUMERIC ); + PHB_ITEM pCol = hb_param( 3, HB_IT_NUMERIC ); if( pRow || pCol ) { diff --git a/harbour/source/rtl/mtran.c b/harbour/source/rtl/mtran.c index eaa5929fcd..2d24c9041d 100644 --- a/harbour/source/rtl/mtran.c +++ b/harbour/source/rtl/mtran.c @@ -79,7 +79,7 @@ char * hb_strMemotran( char * pszResult, ULONG * ulResultLen, const char * pszSt HB_FUNC( MEMOTRAN ) { - PHB_ITEM pString = hb_param( 1, IT_STRING ); + PHB_ITEM pString = hb_param( 1, HB_IT_STRING ); if( pString ) { diff --git a/harbour/source/rtl/natmsg.c b/harbour/source/rtl/natmsg.c index c497e9e737..464bcd3834 100644 --- a/harbour/source/rtl/natmsg.c +++ b/harbour/source/rtl/natmsg.c @@ -95,14 +95,14 @@ char * hb_nationGetMsg( USHORT uiMsg ) HB_FUNC( ISAFFIRM ) { - PHB_ITEM pItem = hb_param( 1, IT_STRING ); + PHB_ITEM pItem = hb_param( 1, HB_IT_STRING ); hb_retl( pItem && hb_itemGetCLen( pItem ) >= 1 && toupper( hb_itemGetCPtr( pItem )[ 0 ] ) == s_szMessages[ _LF_YN - 1 ][ 0 ] ); } HB_FUNC( ISNEGATIVE ) { - PHB_ITEM pItem = hb_param( 1, IT_STRING ); + PHB_ITEM pItem = hb_param( 1, HB_IT_STRING ); hb_retl( pItem && hb_itemGetCLen( pItem ) >= 1 && toupper( hb_itemGetCPtr( pItem )[ 0 ] ) == s_szMessages[ _LF_YN - 1 ][ 2 ] ); } diff --git a/harbour/source/rtl/oemansi.c b/harbour/source/rtl/oemansi.c index a5e0d4c9c8..f4c7a75085 100644 --- a/harbour/source/rtl/oemansi.c +++ b/harbour/source/rtl/oemansi.c @@ -43,7 +43,7 @@ HB_FUNC( HB_ANSITOOEM ) { - PHB_ITEM pString = hb_param( 1, IT_STRING ); + PHB_ITEM pString = hb_param( 1, HB_IT_STRING ); if( pString ) #if defined(HB_OS_WIN_32) @@ -65,7 +65,7 @@ HB_FUNC( HB_ANSITOOEM ) HB_FUNC( HB_OEMTOANSI ) { - PHB_ITEM pString = hb_param( 1, IT_STRING ); + PHB_ITEM pString = hb_param( 1, HB_IT_STRING ); if( pString ) #if defined(HB_OS_WIN_32) diff --git a/harbour/source/rtl/pad.c b/harbour/source/rtl/pad.c index c6494536a4..357953116b 100644 --- a/harbour/source/rtl/pad.c +++ b/harbour/source/rtl/pad.c @@ -51,31 +51,31 @@ static char * hb_itemPadConv( PHB_ITEM pItem, char * buffer, ULONG * pulSize ) if( pItem ) { - if( IS_STRING( pItem ) ) + if( HB_IS_STRING( pItem ) ) { szText = hb_itemGetCPtr( pItem ); *pulSize = hb_itemGetCLen( pItem ); } - else if( IS_DATE( pItem ) ) + else if( HB_IS_DATE( pItem ) ) { char szDate[ 9 ]; szText = hb_dateFormat( hb_pardsbuff( szDate, 1 ), buffer, hb_set.HB_SET_DATEFORMAT ); *pulSize = strlen( szText ); } - else if( IS_INTEGER( pItem ) ) + else if( HB_IS_INTEGER( pItem ) ) { sprintf( buffer, "%d", hb_itemGetNI( pItem ) ); szText = buffer; *pulSize = strlen( szText ); } - else if( IS_LONG( pItem ) ) + else if( HB_IS_LONG( pItem ) ) { sprintf( buffer, "%ld", hb_itemGetNL( pItem ) ); szText = buffer; *pulSize = strlen( szText ); } - else if( IS_DOUBLE( pItem ) ) + else if( HB_IS_DOUBLE( pItem ) ) { int iDecimal; @@ -99,7 +99,7 @@ HB_FUNC( PADR ) { ULONG ulSize; char buffer[ 128 ]; - char * szText = hb_itemPadConv( hb_param( 1, IT_ANY ), buffer, &ulSize ); + char * szText = hb_itemPadConv( hb_param( 1, HB_IT_ANY ), buffer, &ulSize ); if( szText && ISNUM( 2 ) ) { @@ -145,7 +145,7 @@ HB_FUNC( PADL ) { ULONG ulSize; char buffer[ 128 ]; - char * szText = hb_itemPadConv( hb_param( 1, IT_ANY ), buffer, &ulSize ); + char * szText = hb_itemPadConv( hb_param( 1, HB_IT_ANY ), buffer, &ulSize ); if( szText && ISNUM( 2 ) ) { @@ -187,7 +187,7 @@ HB_FUNC( PADC ) { ULONG ulSize; char buffer[ 128 ]; - char * szText = hb_itemPadConv( hb_param( 1, IT_ANY ), buffer, &ulSize ); + char * szText = hb_itemPadConv( hb_param( 1, HB_IT_ANY ), buffer, &ulSize ); if( szText && ISNUM( 2 ) ) { diff --git a/harbour/source/rtl/right.c b/harbour/source/rtl/right.c index 3ed3e430c2..76c27753df 100644 --- a/harbour/source/rtl/right.c +++ b/harbour/source/rtl/right.c @@ -41,7 +41,7 @@ HB_FUNC( RIGHT ) { - PHB_ITEM pText = hb_param( 1, IT_STRING ); + PHB_ITEM pText = hb_param( 1, HB_IT_STRING ); if( pText && ISNUM( 2 ) ) { diff --git a/harbour/source/rtl/round.c b/harbour/source/rtl/round.c index 713aa1cb6f..7a0d511851 100644 --- a/harbour/source/rtl/round.c +++ b/harbour/source/rtl/round.c @@ -52,7 +52,7 @@ HB_FUNC( INT ) { - PHB_ITEM pNumber = hb_param( 1, IT_NUMERIC ); + PHB_ITEM pNumber = hb_param( 1, HB_IT_NUMERIC ); if( pNumber ) { diff --git a/harbour/source/rtl/set.c b/harbour/source/rtl/set.c index 1d147525f6..43cc9339dc 100644 --- a/harbour/source/rtl/set.c +++ b/harbour/source/rtl/set.c @@ -88,11 +88,11 @@ * Added support for HB_SET_EXTRAFILE. * Added support for strings > 64 KB. * V 1.38 Ryszard Glab Changed to use the new definition of - * HB_INIT_SYMBOLS_* and + * HB_INHB_IT_SYMBOLS_* and * HB_CALL_ON_STARTUP_* macros. * V 1.37 David G. Holm Added #pragma startup. * V 1.36 Ryszard Glab Changed code that registers local - * symbol table (it uses HB_INIT_SYMBOLS_* + * symbol table (it uses HB_INHB_IT_SYMBOLS_* * macros now). * V 1.35 Ryszard Glab Changed to use the new HB_ITEM. * Changed to automatically register @@ -196,9 +196,9 @@ static BOOL set_logical( PHB_ITEM pItem ) HB_TRACE(HB_TR_DEBUG, ("set_logical(%p)", pItem)); - if( IS_LOGICAL( pItem ) ) + if( HB_IS_LOGICAL( pItem ) ) bLogical = hb_itemGetL( pItem ); - else if( IS_STRING( pItem ) ) + else if( HB_IS_STRING( pItem ) ) { char * szString = hb_itemGetCPtr( pItem ); ULONG ulLen = hb_itemGetCLen( pItem ); @@ -221,7 +221,7 @@ static int set_number( PHB_ITEM pItem, int iOldValue ) { HB_TRACE(HB_TR_DEBUG, ("set_number(%p, %d)", pItem, iOldValue)); - if( IS_NUMERIC( pItem ) ) + if( HB_IS_NUMERIC( pItem ) ) return hb_itemGetNI( pItem ); else return iOldValue; @@ -233,7 +233,7 @@ static char * set_string( PHB_ITEM pItem, char * szOldString ) HB_TRACE(HB_TR_DEBUG, ("set_string(%p, %s)", pItem, szOldString)); - if( IS_STRING( pItem ) ) + if( HB_IS_STRING( pItem ) ) { /* Limit size of SET strings to 64K, truncating if source is longer */ ULONG ulLen = hb_itemGetCLen( pItem ); @@ -472,8 +472,8 @@ HB_FUNC( SET ) if( args > 0 ) set_specifier = ( HB_set_enum ) hb_parni( 1 ); else set_specifier = HB_SET_INVALID_; - if( args > 1 ) pArg2 = hb_param( 2, IT_ANY ); - if( args > 2 ) pArg3 = hb_param( 3, IT_ANY ); + if( args > 1 ) pArg2 = hb_param( 2, HB_IT_ANY ); + if( args > 2 ) pArg3 = hb_param( 3, HB_IT_ANY ); switch ( set_specifier ) { @@ -484,10 +484,10 @@ HB_FUNC( SET ) case HB_SET_ALTFILE : if( hb_set.HB_SET_ALTFILE ) hb_retc( hb_set.HB_SET_ALTFILE ); else hb_retc( "" ); - if( args > 1 && ! IS_NIL( pArg2 ) ) hb_set.HB_SET_ALTFILE = set_string( pArg2, hb_set.HB_SET_ALTFILE ); + if( args > 1 && ! HB_IS_NIL( pArg2 ) ) hb_set.HB_SET_ALTFILE = set_string( pArg2, hb_set.HB_SET_ALTFILE ); if( args > 2 ) bFlag = set_logical( pArg3 ); else bFlag = FALSE; - if( args > 1 && ! IS_NIL( pArg2 ) ) + if( args > 1 && ! HB_IS_NIL( pArg2 ) ) { close_text( hb_set.hb_set_althan ); if( hb_set.HB_SET_ALTFILE && strlen( hb_set.HB_SET_ALTFILE ) > 0 ) @@ -515,7 +515,7 @@ HB_FUNC( SET ) if( args > 1 ) hb_set.HB_SET_CANCEL = set_logical( pArg2 ); break; case HB_SET_COLOR : - hb_retc( hb_conSetColor( args >= 2 && IS_STRING( pArg2 ) ? hb_itemGetCPtr( pArg2 ) : ( char * ) NULL ) ); + hb_retc( hb_conSetColor( args >= 2 && HB_IS_STRING( pArg2 ) ? hb_itemGetCPtr( pArg2 ) : ( char * ) NULL ) ); break; case HB_SET_CONFIRM : hb_retl( hb_set.HB_SET_CONFIRM ); @@ -526,7 +526,7 @@ HB_FUNC( SET ) if( args > 1 ) hb_set.HB_SET_CONSOLE = set_logical( pArg2 ); break; case HB_SET_CURSOR : - if( args >= 2 && IS_NUMERIC( pArg2 ) ) + if( args >= 2 && HB_IS_NUMERIC( pArg2 ) ) hb_retni( hb_conSetCursor( TRUE, hb_itemGetNI( pArg2 ) ) ); else hb_retni( hb_conSetCursor( FALSE, 0 ) ); @@ -571,7 +571,7 @@ HB_FUNC( SET ) case HB_SET_DEVICE : if( hb_set.HB_SET_DEVICE ) hb_retc( hb_set.HB_SET_DEVICE ); else hb_retc( "" ); - if( args > 1 && ! IS_NIL( pArg2 ) ) + if( args > 1 && ! HB_IS_NIL( pArg2 ) ) { /* If the print file is not already open, open it in overwrite mode. */ hb_set.HB_SET_DEVICE = set_string( pArg2, hb_set.HB_SET_DEVICE ); @@ -617,10 +617,10 @@ HB_FUNC( SET ) case HB_SET_EXTRAFILE : if( hb_set.HB_SET_EXTRAFILE ) hb_retc( hb_set.HB_SET_EXTRAFILE ); else hb_retc( "" ); - if( args > 1 && ! IS_NIL( pArg2 ) ) hb_set.HB_SET_EXTRAFILE = set_string( pArg2, hb_set.HB_SET_EXTRAFILE ); + if( args > 1 && ! HB_IS_NIL( pArg2 ) ) hb_set.HB_SET_EXTRAFILE = set_string( pArg2, hb_set.HB_SET_EXTRAFILE ); if( args > 2 ) bFlag = set_logical( pArg3 ); else bFlag = FALSE; - if( args > 1 && ! IS_NIL( pArg2 ) ) + if( args > 1 && ! HB_IS_NIL( pArg2 ) ) { close_text( hb_set.hb_set_extrahan ); if( hb_set.HB_SET_EXTRAFILE && strlen( hb_set.HB_SET_EXTRAFILE ) > 0 ) @@ -698,10 +698,10 @@ HB_FUNC( SET ) case HB_SET_PRINTFILE : if( hb_set.HB_SET_PRINTFILE ) hb_retc( hb_set.HB_SET_PRINTFILE ); else hb_retc( "" ); - if( args > 1 && ! IS_NIL( pArg2 ) ) hb_set.HB_SET_PRINTFILE = set_string( pArg2, hb_set.HB_SET_PRINTFILE ); + if( args > 1 && ! HB_IS_NIL( pArg2 ) ) hb_set.HB_SET_PRINTFILE = set_string( pArg2, hb_set.HB_SET_PRINTFILE ); if( args > 2 ) bFlag = set_logical( pArg3 ); else bFlag = FALSE; - if( args > 1 && ! IS_NIL( pArg2 ) ) + if( args > 1 && ! HB_IS_NIL( pArg2 ) ) { close_binary( hb_set.hb_set_printhan ); if( hb_set.HB_SET_PRINTFILE && strlen( hb_set.HB_SET_PRINTFILE ) > 0 ) diff --git a/harbour/source/rtl/soundex.c b/harbour/source/rtl/soundex.c index 017807593e..f0f412858f 100644 --- a/harbour/source/rtl/soundex.c +++ b/harbour/source/rtl/soundex.c @@ -42,7 +42,7 @@ HB_FUNC( SOUNDEX ) { - PHB_ITEM pString = hb_param( 1, IT_STRING ); + PHB_ITEM pString = hb_param( 1, HB_IT_STRING ); char szResult[ SOUNDEX_LEN_MAX + 1 ]; /* NOTE: The result will always be a zero terminated string without any diff --git a/harbour/source/rtl/str.c b/harbour/source/rtl/str.c index 494b8b1576..fd50283fe9 100644 --- a/harbour/source/rtl/str.c +++ b/harbour/source/rtl/str.c @@ -40,7 +40,7 @@ HB_FUNC( STR ) { BOOL bValid; - PHB_ITEM pNumber = hb_param( 1, IT_NUMERIC ); + PHB_ITEM pNumber = hb_param( 1, HB_IT_NUMERIC ); PHB_ITEM pWidth = NULL; PHB_ITEM pDec = NULL; @@ -50,14 +50,14 @@ HB_FUNC( STR ) if( hb_pcount() >= 2 ) { - pWidth = hb_param( 2, IT_NUMERIC ); + pWidth = hb_param( 2, HB_IT_NUMERIC ); if( !pWidth ) bValid = FALSE; } if( hb_pcount() >= 3 ) { - pDec = hb_param( 3, IT_NUMERIC ); + pDec = hb_param( 3, HB_IT_NUMERIC ); if( !pDec ) bValid = FALSE; } diff --git a/harbour/source/rtl/strcase.c b/harbour/source/rtl/strcase.c index ea9f4c45f7..4ce4644369 100644 --- a/harbour/source/rtl/strcase.c +++ b/harbour/source/rtl/strcase.c @@ -83,7 +83,7 @@ char * hb_strncpyUpper( char * pDest, const char * pSource, ULONG ulLen ) /* converts string to lower case */ HB_FUNC( LOWER ) { - PHB_ITEM pText = hb_param( 1, IT_STRING ); + PHB_ITEM pText = hb_param( 1, HB_IT_STRING ); if( pText ) { @@ -109,7 +109,7 @@ HB_FUNC( LOWER ) /* converts string to upper case */ HB_FUNC( UPPER ) { - PHB_ITEM pText = hb_param( 1, IT_STRING ); + PHB_ITEM pText = hb_param( 1, HB_IT_STRING ); if( pText ) { diff --git a/harbour/source/rtl/strtran.c b/harbour/source/rtl/strtran.c index 3f8e3c5e64..0f4761bb16 100644 --- a/harbour/source/rtl/strtran.c +++ b/harbour/source/rtl/strtran.c @@ -45,11 +45,11 @@ /* TOFIX: Will not work with a search string of > 64 KB on some platforms */ HB_FUNC( STRTRAN ) { - PHB_ITEM pText = hb_param( 1, IT_STRING ); + PHB_ITEM pText = hb_param( 1, HB_IT_STRING ); if( pText ) { - PHB_ITEM pSeek = hb_param( 2, IT_STRING ); + PHB_ITEM pSeek = hb_param( 2, HB_IT_STRING ); if( pSeek ) { @@ -72,7 +72,7 @@ HB_FUNC( STRTRAN ) } else if( ulStart > 0 ) { - PHB_ITEM pReplace = hb_param( 3, IT_STRING ); + PHB_ITEM pReplace = hb_param( 3, HB_IT_STRING ); ULONG ulReplace; ULONG ulCount; BOOL bAll; diff --git a/harbour/source/rtl/strzero.c b/harbour/source/rtl/strzero.c index d4dd3f16d1..bafcd89c77 100644 --- a/harbour/source/rtl/strzero.c +++ b/harbour/source/rtl/strzero.c @@ -42,7 +42,7 @@ HB_FUNC( STRZERO ) if( hb_pcount() >= 1 && hb_pcount() <= 3 ) { BOOL bValid; - PHB_ITEM pNumber = hb_param( 1, IT_NUMERIC ); + PHB_ITEM pNumber = hb_param( 1, HB_IT_NUMERIC ); PHB_ITEM pWidth = NULL; PHB_ITEM pDec = NULL; @@ -52,14 +52,14 @@ HB_FUNC( STRZERO ) if( hb_pcount() >= 2 ) { - pWidth = hb_param( 2, IT_NUMERIC ); + pWidth = hb_param( 2, HB_IT_NUMERIC ); if( !pWidth ) bValid = FALSE; } if( hb_pcount() >= 3 ) { - pDec = hb_param( 3, IT_NUMERIC ); + pDec = hb_param( 3, HB_IT_NUMERIC ); if( !pDec ) bValid = FALSE; } diff --git a/harbour/source/rtl/substr.c b/harbour/source/rtl/substr.c index af95305389..6a26c7f970 100644 --- a/harbour/source/rtl/substr.c +++ b/harbour/source/rtl/substr.c @@ -41,7 +41,7 @@ HB_FUNC( SUBSTR ) { - PHB_ITEM pText = hb_param( 1, IT_STRING ); + PHB_ITEM pText = hb_param( 1, HB_IT_STRING ); if( pText && ISNUM( 2 ) ) { diff --git a/harbour/source/rtl/transfrm.c b/harbour/source/rtl/transfrm.c index bfbe87b90b..bc0ddea5cb 100644 --- a/harbour/source/rtl/transfrm.c +++ b/harbour/source/rtl/transfrm.c @@ -330,8 +330,8 @@ static char * NumPicture( char * szPic, ULONG ulPicLen, USHORT * puiPicFlags, do HB_FUNC( TRANSFORM ) { - PHB_ITEM pExp = hb_param( 1, IT_ANY ); /* Input parameter */ - PHB_ITEM pPic = hb_param( 2, IT_STRING ); /* Picture string */ + PHB_ITEM pExp = hb_param( 1, HB_IT_ANY ); /* Input parameter */ + PHB_ITEM pPic = hb_param( 2, HB_IT_STRING ); /* Picture string */ BOOL bError = FALSE; @@ -347,7 +347,7 @@ HB_FUNC( TRANSFORM ) uiPicFlags = PictFunc( &szPic, &ulPicLen, &ulPicStart ); /* Evaluate picture string */ - if( IS_STRING( pExp ) ) + if( HB_IS_STRING( pExp ) ) { char * szExp = hb_itemGetCPtr( pExp ); ULONG ulExpLen = hb_itemGetCLen( pExp ); @@ -453,7 +453,7 @@ HB_FUNC( TRANSFORM ) } } - else if( IS_NUMERIC( pExp ) ) + else if( HB_IS_NUMERIC( pExp ) ) { int iOrigWidth; int iOrigDec; @@ -464,7 +464,7 @@ HB_FUNC( TRANSFORM ) hb_itemGetND( pExp ), &ulResultPos, iOrigWidth, iOrigDec ); } - else if( IS_DATE( pExp ) ) + else if( HB_IS_DATE( pExp ) ) { char szDate[ 9 ]; @@ -478,7 +478,7 @@ HB_FUNC( TRANSFORM ) ulResultPos = strlen( szResult ); } - else if( IS_LOGICAL( pExp ) ) + else if( HB_IS_LOGICAL( pExp ) ) { BOOL bDone = FALSE; @@ -561,11 +561,11 @@ HB_FUNC( TRANSFORM ) } else if( pPic || ISNIL( 2 ) ) /* Picture is an empty string or NIL */ { - if( IS_STRING( pExp ) ) + if( HB_IS_STRING( pExp ) ) { hb_itemReturn( pExp ); } - else if( IS_NUMERIC( pExp ) ) + else if( HB_IS_NUMERIC( pExp ) ) { char * szStr = hb_itemStr( pExp, NULL, NULL ); @@ -577,14 +577,14 @@ HB_FUNC( TRANSFORM ) else hb_retc( "" ); } - else if( IS_DATE( pExp ) ) + else if( HB_IS_DATE( pExp ) ) { char szDate[ 9 ]; char szResult[ 11 ]; hb_retc( hb_dateFormat( hb_itemGetDS( pExp, szDate ), szResult, hb_set.HB_SET_DATEFORMAT ) ); } - else if( IS_LOGICAL( pExp ) ) + else if( HB_IS_LOGICAL( pExp ) ) { hb_retc( hb_itemGetL( pExp ) ? "T" : "F" ); } diff --git a/harbour/source/rtl/trim.c b/harbour/source/rtl/trim.c index 4e3afcc788..2378933680 100644 --- a/harbour/source/rtl/trim.c +++ b/harbour/source/rtl/trim.c @@ -76,7 +76,7 @@ ULONG hb_strRTrimLen( const char * szText, ULONG ulLen, BOOL bAnySpace ) HB_FUNC( LTRIM ) { - PHB_ITEM pText = hb_param( 1, IT_STRING ); + PHB_ITEM pText = hb_param( 1, HB_IT_STRING ); if( pText ) { @@ -103,7 +103,7 @@ HB_FUNC( LTRIM ) /* TEST: QOUT( "rtrim( ' hello world ' ) = '" + rtrim( ' hello world ' ) + "'" ) */ HB_FUNC( RTRIM ) { - PHB_ITEM pText = hb_param( 1, IT_STRING ); + PHB_ITEM pText = hb_param( 1, HB_IT_STRING ); if( pText ) { diff --git a/harbour/source/rtl/type.c b/harbour/source/rtl/type.c index 26b3e93647..446bb836ef 100644 --- a/harbour/source/rtl/type.c +++ b/harbour/source/rtl/type.c @@ -38,7 +38,7 @@ HB_FUNC( TYPE ) { - HB_ITEM_PTR pItem = hb_param( 1, IT_STRING ); + HB_ITEM_PTR pItem = hb_param( 1, HB_IT_STRING ); if( pItem ) hb_retc( hb_macroGetType( pItem ) ); diff --git a/harbour/source/rtl/val.c b/harbour/source/rtl/val.c index 908fb8e11e..50a577a288 100644 --- a/harbour/source/rtl/val.c +++ b/harbour/source/rtl/val.c @@ -93,7 +93,7 @@ double hb_strVal( const char * szText, ULONG ulLen ) /* returns the numeric value of a character string representation of a number */ HB_FUNC( VAL ) { - PHB_ITEM pText = hb_param( 1, IT_STRING ); + PHB_ITEM pText = hb_param( 1, HB_IT_STRING ); if( pText ) { diff --git a/harbour/source/rtl/valtostr.c b/harbour/source/rtl/valtostr.c index e5ff9ed98c..08d9c11f27 100644 --- a/harbour/source/rtl/valtostr.c +++ b/harbour/source/rtl/valtostr.c @@ -40,7 +40,7 @@ HB_FUNC( HB_VALTOSTR ) { ULONG ulLen; BOOL bFreeReq; - char * buffer = hb_itemString( hb_param( 1, IT_ANY ), &ulLen, &bFreeReq ); + char * buffer = hb_itemString( hb_param( 1, HB_IT_ANY ), &ulLen, &bFreeReq ); hb_retclen( buffer, ulLen ); diff --git a/harbour/source/rtl/valtype.c b/harbour/source/rtl/valtype.c index 1aa8cb6123..51d4453b2f 100644 --- a/harbour/source/rtl/valtype.c +++ b/harbour/source/rtl/valtype.c @@ -38,6 +38,6 @@ HB_FUNC( VALTYPE ) { - hb_retc( hb_itemTypeStr( hb_param( 1, IT_ANY ) ) ); + hb_retc( hb_itemTypeStr( hb_param( 1, HB_IT_ANY ) ) ); } diff --git a/harbour/source/tools/ctchrmix.c b/harbour/source/tools/ctchrmix.c index 12f416432e..28d6014d99 100644 --- a/harbour/source/tools/ctchrmix.c +++ b/harbour/source/tools/ctchrmix.c @@ -40,8 +40,8 @@ HB_FUNC( CT_CHARMIX ) { - PHB_ITEM pStr1 = hb_param( 1, IT_STRING ); - PHB_ITEM pStr2 = hb_param( 2, IT_STRING ); + PHB_ITEM pStr1 = hb_param( 1, HB_IT_STRING ); + PHB_ITEM pStr2 = hb_param( 2, HB_IT_STRING ); ULONG ulLen2; if( pStr1 && pStr2 && ( ulLen2 = hb_itemGetCLen( pStr2 ) ) > 0 ) diff --git a/harbour/source/tools/dates2.c b/harbour/source/tools/dates2.c index 2e194e49a1..df9d422f33 100644 --- a/harbour/source/tools/dates2.c +++ b/harbour/source/tools/dates2.c @@ -146,7 +146,7 @@ HB_FUNC( ISLEAPYEAR ) { if( ISDATE( 1 ) ) { - PHB_ITEM pDate = hb_param( 1, IT_DATE ); + PHB_ITEM pDate = hb_param( 1, HB_IT_DATE ); long lDay, lMonth, lYear; hb_dateDecode( hb_itemGetDL( pDate ), &lDay, &lMonth, &lYear ); @@ -162,7 +162,7 @@ HB_FUNC( DAYSINMONTH ) { if( ISDATE( 1 ) ) { - PHB_ITEM pDate = hb_param( 1, IT_DATE ); + PHB_ITEM pDate = hb_param( 1, HB_IT_DATE ); long lDay, lMonth, lYear; hb_dateDecode( hb_itemGetDL( pDate ), &lDay, &lMonth, &lYear ); @@ -176,7 +176,7 @@ HB_FUNC( EOM ) { if( ISDATE( 1 ) ) { - PHB_ITEM pDate = hb_param( 1, IT_DATE ); + PHB_ITEM pDate = hb_param( 1, HB_IT_DATE ); long lDay, lMonth, lYear; char szDateFormat[ 9 ]; @@ -193,7 +193,7 @@ HB_FUNC( BOM ) { if( ISDATE( 1 ) ) { - PHB_ITEM pDate = hb_param( 1, IT_DATE ); + PHB_ITEM pDate = hb_param( 1, HB_IT_DATE ); long lDay, lMonth, lYear; char szDateFormat[ 9 ]; @@ -209,7 +209,7 @@ HB_FUNC( WOM ) { if( ISDATE( 1 ) ) { - PHB_ITEM pDate = hb_param( 1, IT_DATE ); + PHB_ITEM pDate = hb_param( 1, HB_IT_DATE ); long lDay, lMonth, lYear; hb_dateDecode( hb_itemGetDL( pDate ), &lDay, &lMonth, &lYear ); @@ -223,7 +223,7 @@ HB_FUNC( DOY ) { if( ISDATE( 1 ) ) { - PHB_ITEM pDate = hb_param( 1, IT_DATE ); + PHB_ITEM pDate = hb_param( 1, HB_IT_DATE ); long lDay, lMonth, lYear; hb_dateDecode( hb_itemGetDL( pDate ), &lDay, &lMonth, &lYear ); @@ -239,7 +239,7 @@ HB_FUNC( WOY ) { if( ISDATE( 1 ) ) { - PHB_ITEM pDate = hb_param( 1, IT_DATE ); + PHB_ITEM pDate = hb_param( 1, HB_IT_DATE ); long lDay, lMonth, lYear; hb_dateDecode( hb_itemGetDL( pDate ), &lDay, &lMonth, &lYear ); @@ -253,7 +253,7 @@ HB_FUNC( EOY ) { if( ISDATE( 1 ) ) { - PHB_ITEM pDate = hb_param( 1, IT_DATE ); + PHB_ITEM pDate = hb_param( 1, HB_IT_DATE ); long lDay, lMonth, lYear; char szDateFormat[ 9 ]; @@ -269,7 +269,7 @@ HB_FUNC( BOY ) { if( ISDATE( 1 ) ) { - PHB_ITEM pDate = hb_param( 1, IT_DATE ); + PHB_ITEM pDate = hb_param( 1, HB_IT_DATE ); long lDay, lMonth, lYear; char szDateFormat[ 9 ]; diff --git a/harbour/source/tools/hb_f.c b/harbour/source/tools/hb_f.c index 23c384c90d..cb1b842d07 100644 --- a/harbour/source/tools/hb_f.c +++ b/harbour/source/tools/hb_f.c @@ -56,8 +56,8 @@ static int isEof[10]; HB_FUNC( HB_FUSE ) { - PHB_ITEM arg1_it = hb_param(1,IT_STRING); - PHB_ITEM arg2_it = hb_param(2,IT_NUMERIC); + PHB_ITEM arg1_it = hb_param(1,HB_IT_STRING); + PHB_ITEM arg2_it = hb_param(2,HB_IT_NUMERIC); int open_flags; if ( arg1_it ) { @@ -100,7 +100,7 @@ HB_FUNC( HB_FRECNO ) HB_FUNC( HB_FSKIP ) { - PHB_ITEM arg1_it = hb_param(1,IT_NUMERIC); + PHB_ITEM arg1_it = hb_param(1,HB_IT_NUMERIC); int nskip; if( arg1_it ) diff --git a/harbour/source/tools/strfmt.c b/harbour/source/tools/strfmt.c index c9393703f0..66a7946c70 100644 --- a/harbour/source/tools/strfmt.c +++ b/harbour/source/tools/strfmt.c @@ -42,7 +42,7 @@ HB_FUNC( STRFORMAT ) char* pszMask = hb_parc(1); ULONG nMaskLen = hb_parclen(1); ULONG nMaskPos; - ULONG nParNum = PCOUNT; + ULONG nParNum = hb_pcount(); ULONG nLenTable [HB_STRFORMAT_PARNUM_MAX_]; char* pszVarTable [HB_STRFORMAT_PARNUM_MAX_]; diff --git a/harbour/source/vm/arrays.c b/harbour/source/vm/arrays.c index 0c9c92b8e1..041203cf38 100644 --- a/harbour/source/vm/arrays.c +++ b/harbour/source/vm/arrays.c @@ -62,7 +62,7 @@ BOOL hb_arrayNew( PHB_ITEM pItem, ULONG ulLen ) /* creates a new array */ hb_itemClear( pItem ); - pItem->type = IT_ARRAY; + pItem->type = HB_IT_ARRAY; if( ulLen > 0 ) pBaseArray->pItems = ( PHB_ITEM ) hb_xgrab( sizeof( HB_ITEM ) * ulLen ); @@ -75,7 +75,7 @@ BOOL hb_arrayNew( PHB_ITEM pItem, ULONG ulLen ) /* creates a new array */ pBaseArray->uiPrevCls = 0; for( ulPos = 0; ulPos < ulLen; ulPos++ ) - ( pBaseArray->pItems + ulPos )->type = IT_NIL; + ( pBaseArray->pItems + ulPos )->type = HB_IT_NIL; pItem->item.asArray.value = pBaseArray; @@ -86,7 +86,7 @@ BOOL hb_arrayAdd( PHB_ITEM pArray, PHB_ITEM pValue ) { HB_TRACE(HB_TR_DEBUG, ("hb_arrayAdd(%p, %p)", pArray, pValue)); - if( IS_ARRAY( pArray ) ) + if( HB_IS_ARRAY( pArray ) ) { PHB_BASEARRAY pBaseArray = ( PHB_BASEARRAY ) pArray->item.asArray.value; @@ -107,7 +107,7 @@ ULONG hb_arrayLen( PHB_ITEM pArray ) { HB_TRACE(HB_TR_DEBUG, ("hb_arrayLen(%p)", pArray)); - if( IS_ARRAY( pArray ) ) + if( HB_IS_ARRAY( pArray ) ) return pArray->item.asArray.value->ulLen; else return 0; @@ -117,7 +117,7 @@ BOOL hb_arrayIsObject( PHB_ITEM pArray ) { HB_TRACE(HB_TR_DEBUG, ("hb_arrayIsObject(%p)", pArray)); - if( IS_ARRAY( pArray ) ) + if( HB_IS_ARRAY( pArray ) ) return pArray->item.asArray.value->uiClass != 0; else return FALSE; @@ -127,7 +127,7 @@ BOOL hb_arraySize( PHB_ITEM pArray, ULONG ulLen ) { HB_TRACE(HB_TR_DEBUG, ("hb_arraySize(%p, %lu)", pArray, ulLen)); - if( IS_ARRAY( pArray ) ) + if( HB_IS_ARRAY( pArray ) ) { PHB_BASEARRAY pBaseArray = pArray->item.asArray.value; ULONG ulPos; @@ -137,7 +137,7 @@ BOOL hb_arraySize( PHB_ITEM pArray, ULONG ulLen ) pBaseArray->pItems = ( PHB_ITEM ) hb_xgrab( ulLen * sizeof( HB_ITEM ) ); for( ulPos = 0; ulPos < ulLen; ulPos++ ) - ( pBaseArray->pItems + ulPos )->type = IT_NIL; + ( pBaseArray->pItems + ulPos )->type = HB_IT_NIL; } else { @@ -147,7 +147,7 @@ BOOL hb_arraySize( PHB_ITEM pArray, ULONG ulLen ) /* set value for new items */ for( ulPos = pBaseArray->ulLen; ulPos < ulLen; ulPos++ ) - ( pBaseArray->pItems + ulPos )->type = IT_NIL; + ( pBaseArray->pItems + ulPos )->type = HB_IT_NIL; } else if( pBaseArray->ulLen > ulLen ) { @@ -177,7 +177,7 @@ BOOL hb_arrayDel( PHB_ITEM pArray, ULONG ulIndex ) { HB_TRACE(HB_TR_DEBUG, ("hb_arrayDel(%p, %lu)", pArray, ulIndex)); - if( IS_ARRAY( pArray ) ) + if( HB_IS_ARRAY( pArray ) ) { ULONG ulLen = pArray->item.asArray.value->ulLen; @@ -203,7 +203,7 @@ BOOL hb_arrayIns( PHB_ITEM pArray, ULONG ulIndex ) { HB_TRACE(HB_TR_DEBUG, ("hb_arrayIns(%p, %lu)", pArray, ulIndex)); - if( IS_ARRAY( pArray ) ) + if( HB_IS_ARRAY( pArray ) ) { ULONG ulLen = pArray->item.asArray.value->ulLen; @@ -231,7 +231,7 @@ BOOL hb_arrayError( PHB_ITEM pArray, ULONG ulIndex, BOOL bAssign ) HB_TRACE(HB_TR_DEBUG, ("hb_arrayError(%p, %lu, %d)", pArray, ulIndex, (int) bAssign)); - if( IS_ARRAY( pArray ) ) + if( HB_IS_ARRAY( pArray ) ) { if( ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) bError = FALSE; @@ -260,7 +260,7 @@ BOOL hb_arraySet( PHB_ITEM pArray, ULONG ulIndex, PHB_ITEM pItem ) { HB_TRACE(HB_TR_DEBUG, ("hb_arrayError(%p, %lu, %p)", pArray, ulIndex, pItem)); - if( IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) + if( HB_IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) { hb_itemCopy( pArray->item.asArray.value->pItems + ( ulIndex - 1 ), pItem ); return TRUE; @@ -273,7 +273,7 @@ BOOL hb_arrayGet( PHB_ITEM pArray, ULONG ulIndex, PHB_ITEM pItem ) { HB_TRACE(HB_TR_DEBUG, ("hb_arrayGet(%p, %lu, %p)", pArray, ulIndex, pItem)); - if( IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) + if( HB_IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) { hb_itemCopy( pItem, pArray->item.asArray.value->pItems + ( ulIndex - 1 ) ); return TRUE; @@ -289,7 +289,7 @@ char * hb_arrayGetDS( PHB_ITEM pArray, ULONG ulIndex, char * szDate ) { HB_TRACE(HB_TR_DEBUG, ("hb_arrayGetDS(%p, %lu, %s)", pArray, ulIndex, szDate)); - if( IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) + if( HB_IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) hb_itemGetDS( pArray->item.asArray.value->pItems + ulIndex - 1, szDate ); else /* NOTE: Intentionally calling it with a bad parameter in order to get @@ -303,7 +303,7 @@ long hb_arrayGetDL( PHB_ITEM pArray, ULONG ulIndex ) { HB_TRACE(HB_TR_DEBUG, ("hb_arrayGetDL(%p, %lu)", pArray, ulIndex )); - if( IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) + if( HB_IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) return hb_itemGetDL( pArray->item.asArray.value->pItems + ulIndex - 1 ); else /* NOTE: Intentionally calling it with a bad parameter in order to get @@ -315,7 +315,7 @@ BOOL hb_arrayGetBool( PHB_ITEM pArray, ULONG ulIndex ) { HB_TRACE(HB_TR_DEBUG, ("hb_arrayGetBool(%p, %lu)", pArray, ulIndex)); - if( IS_ARRAY( pArray ) ) + if( HB_IS_ARRAY( pArray ) ) { if( ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) return hb_itemGetL( pArray->item.asArray.value->pItems + ulIndex - 1 ); @@ -332,7 +332,7 @@ PHB_ITEM hb_arrayGetItemPtr( PHB_ITEM pArray, ULONG ulIndex ) { HB_TRACE(HB_TR_DEBUG, ("hb_arrayGetItemPtr(%p, %lu)", pArray, ulIndex)); - if( IS_ARRAY( pArray ) ) + if( HB_IS_ARRAY( pArray ) ) { if( ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) return pArray->item.asArray.value->pItems + ( ulIndex - 1 ); @@ -345,7 +345,7 @@ BOOL hb_arrayGetL( PHB_ITEM pArray, ULONG ulIndex ) { HB_TRACE(HB_TR_DEBUG, ("hb_arrayGetL(%p, %lu)", pArray, ulIndex)); - if( IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) + if( HB_IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) return hb_itemGetL( pArray->item.asArray.value->pItems + ulIndex - 1 ); else return FALSE; @@ -355,7 +355,7 @@ int hb_arrayGetNI( PHB_ITEM pArray, ULONG ulIndex ) { HB_TRACE(HB_TR_DEBUG, ("hb_arrayGetNI(%p, %lu)", pArray, ulIndex)); - if( IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) + if( HB_IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) return hb_itemGetNI( pArray->item.asArray.value->pItems + ulIndex - 1 ); else return 0; @@ -365,7 +365,7 @@ long hb_arrayGetNL( PHB_ITEM pArray, ULONG ulIndex ) { HB_TRACE(HB_TR_DEBUG, ("hb_arrayGetNL(%p, %lu)", pArray, ulIndex)); - if( IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) + if( HB_IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) return hb_itemGetNL( pArray->item.asArray.value->pItems + ulIndex - 1 ); else return 0; @@ -375,7 +375,7 @@ double hb_arrayGetND( PHB_ITEM pArray, ULONG ulIndex ) { HB_TRACE(HB_TR_DEBUG, ("hb_arrayGetND(%p, %lu)", pArray, ulIndex)); - if( IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) + if( HB_IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) return hb_itemGetND( pArray->item.asArray.value->pItems + ulIndex - 1 ); else return 0; @@ -385,7 +385,7 @@ ULONG hb_arrayCopyC( PHB_ITEM pArray, ULONG ulIndex, char * szBuffer, ULONG ulLe { HB_TRACE(HB_TR_DEBUG, ("hb_arrayCopyC(%p, %lu, %s, %lu)", pArray, ulIndex, szBuffer, ulLen)); - if( IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) + if( HB_IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) return hb_itemCopyC( pArray->item.asArray.value->pItems + ulIndex - 1, szBuffer, ulLen ); else return 0; @@ -395,7 +395,7 @@ char * hb_arrayGetC( PHB_ITEM pArray, ULONG ulIndex ) { HB_TRACE(HB_TR_DEBUG, ("hb_arrayGetC(%p, %lu)", pArray, ulIndex)); - if( IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) + if( HB_IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) return hb_itemGetC( pArray->item.asArray.value->pItems + ulIndex - 1 ); else return NULL; @@ -405,7 +405,7 @@ char * hb_arrayGetCPtr( PHB_ITEM pArray, ULONG ulIndex ) { HB_TRACE(HB_TR_DEBUG, ("hb_arrayGetCPtr(%p, %lu)", pArray, ulIndex)); - if( IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) + if( HB_IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) return hb_itemGetCPtr( pArray->item.asArray.value->pItems + ulIndex - 1 ); else return ""; @@ -415,7 +415,7 @@ ULONG hb_arrayGetCLen( PHB_ITEM pArray, ULONG ulIndex ) { HB_TRACE(HB_TR_DEBUG, ("hb_arrayGetCLen(%p, %lu)", pArray, ulIndex)); - if( IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) + if( HB_IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) return hb_itemGetCLen( pArray->item.asArray.value->pItems + ulIndex - 1 ); else return 0; @@ -425,7 +425,7 @@ USHORT hb_arrayGetType( PHB_ITEM pArray, ULONG ulIndex ) { HB_TRACE(HB_TR_DEBUG, ("hb_arrayGetType(%p, %lu)", pArray, ulIndex)); - if( IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) + if( HB_IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) return hb_itemType( pArray->item.asArray.value->pItems + ulIndex - 1 ); else return 0; @@ -435,7 +435,7 @@ BOOL hb_arrayLast( PHB_ITEM pArray, PHB_ITEM pResult ) { HB_TRACE(HB_TR_DEBUG, ("hb_arrayLast(%p, %p)", pArray, pResult)); - if( IS_ARRAY( pArray ) ) + if( HB_IS_ARRAY( pArray ) ) { if( pArray->item.asArray.value->ulLen > 0 ) hb_itemCopy( pResult, pArray->item.asArray.value->pItems + @@ -455,7 +455,7 @@ BOOL hb_arrayFill( PHB_ITEM pArray, PHB_ITEM pValue, ULONG * pulStart, ULONG * p { HB_TRACE(HB_TR_DEBUG, ("hb_arrayFill(%p, %p, %p, %p)", pArray, pValue, pulStart, pulCount)); - if( IS_ARRAY( pArray ) ) + if( HB_IS_ARRAY( pArray ) ) { PHB_BASEARRAY pBaseArray = pArray->item.asArray.value; ULONG ulLen = pBaseArray->ulLen; @@ -491,7 +491,7 @@ ULONG hb_arrayScan( PHB_ITEM pArray, PHB_ITEM pValue, ULONG * pulStart, ULONG * { HB_TRACE(HB_TR_DEBUG, ("hb_arrayScan(%p, %p, %p, %p)", pArray, pValue, pulStart, pulCount)); - if( IS_ARRAY( pArray ) ) + if( HB_IS_ARRAY( pArray ) ) { PHB_BASEARRAY pBaseArray = pArray->item.asArray.value; ULONG ulLen = pBaseArray->ulLen; @@ -516,7 +516,7 @@ ULONG hb_arrayScan( PHB_ITEM pArray, PHB_ITEM pValue, ULONG * pulStart, ULONG * /* Make separate search loops for different types to find, so that the loop can be faster. */ - if( IS_BLOCK( pValue ) ) + if( HB_IS_BLOCK( pValue ) ) { for( ulStart--; ulCount > 0; ulCount--, ulStart++ ) { @@ -525,11 +525,11 @@ ULONG hb_arrayScan( PHB_ITEM pArray, PHB_ITEM pValue, ULONG * pulStart, ULONG * hb_vmPush( pBaseArray->pItems + ulStart ); hb_vmDo( 1 ); - if( IS_LOGICAL( &hb_stack.Return ) && hb_stack.Return.item.asLogical.value ) + if( HB_IS_LOGICAL( &hb_stack.Return ) && hb_stack.Return.item.asLogical.value ) return ulStart + 1; /* arrays start from 1 */ } } - else if( IS_STRING( pValue ) ) + else if( HB_IS_STRING( pValue ) ) { for( ulStart--; ulCount > 0; ulCount--, ulStart++ ) { @@ -537,11 +537,11 @@ ULONG hb_arrayScan( PHB_ITEM pArray, PHB_ITEM pValue, ULONG * pulStart, ULONG * /* NOTE: The order of the pItem and pValue parameters passed to hb_itemStrCmp() is significant, please don't change it. [vszakats] */ - if( IS_STRING( pItem ) && hb_itemStrCmp( pItem, pValue, FALSE ) == 0 ) + if( HB_IS_STRING( pItem ) && hb_itemStrCmp( pItem, pValue, FALSE ) == 0 ) return ulStart + 1; } } - else if( IS_NUMERIC( pValue ) ) + else if( HB_IS_NUMERIC( pValue ) ) { double dValue = hb_itemGetND( pValue ); @@ -549,11 +549,11 @@ ULONG hb_arrayScan( PHB_ITEM pArray, PHB_ITEM pValue, ULONG * pulStart, ULONG * { PHB_ITEM pItem = pBaseArray->pItems + ulStart; - if( IS_NUMERIC( pItem ) && hb_itemGetND( pItem ) == dValue ) + if( HB_IS_NUMERIC( pItem ) && hb_itemGetND( pItem ) == dValue ) return ulStart + 1; } } - else if( IS_DATE( pValue ) ) + else if( HB_IS_DATE( pValue ) ) { long lValue = hb_itemGetDL( pValue ); @@ -561,11 +561,11 @@ ULONG hb_arrayScan( PHB_ITEM pArray, PHB_ITEM pValue, ULONG * pulStart, ULONG * { PHB_ITEM pItem = pBaseArray->pItems + ulStart; - if( IS_DATE( pItem ) && hb_itemGetDL( pItem ) == lValue ) + if( HB_IS_DATE( pItem ) && hb_itemGetDL( pItem ) == lValue ) return ulStart + 1; } } - else if( IS_LOGICAL( pValue ) ) + else if( HB_IS_LOGICAL( pValue ) ) { BOOL bValue = hb_itemGetL( pValue ); /* NOTE: This is correct: Get the date as a long value. [vszakats] */ @@ -573,15 +573,15 @@ ULONG hb_arrayScan( PHB_ITEM pArray, PHB_ITEM pValue, ULONG * pulStart, ULONG * { PHB_ITEM pItem = pBaseArray->pItems + ulStart; - if( IS_LOGICAL( pItem ) && hb_itemGetL( pItem ) == bValue ) + if( HB_IS_LOGICAL( pItem ) && hb_itemGetL( pItem ) == bValue ) return ulStart + 1; } } - else if( IS_NIL( pValue ) ) + else if( HB_IS_NIL( pValue ) ) { for( ulStart--; ulCount > 0; ulCount--, ulStart++ ) { - if( IS_NIL( pBaseArray->pItems + ulStart ) ) + if( HB_IS_NIL( pBaseArray->pItems + ulStart ) ) return ulStart + 1; } } @@ -595,7 +595,7 @@ BOOL hb_arrayEval( PHB_ITEM pArray, PHB_ITEM bBlock, ULONG * pulStart, ULONG * p { HB_TRACE(HB_TR_DEBUG, ("hb_arrayEval(%p, %p, %p, %p)", pArray, bBlock, pulStart, pulCount)); - if( IS_ARRAY( pArray ) && IS_BLOCK( bBlock ) ) + if( HB_IS_ARRAY( pArray ) && HB_IS_BLOCK( bBlock ) ) { PHB_BASEARRAY pBaseArray = pArray->item.asArray.value; ULONG ulLen = pBaseArray->ulLen; @@ -639,7 +639,7 @@ BOOL hb_arrayRelease( PHB_ITEM pArray ) { HB_TRACE(HB_TR_DEBUG, ("hb_arrayRelease(%p)", pArray)); - if( IS_ARRAY( pArray ) ) + if( HB_IS_ARRAY( pArray ) ) { PHB_BASEARRAY pBaseArray = pArray->item.asArray.value; ULONG ulLen = pBaseArray->ulLen; @@ -653,7 +653,7 @@ BOOL hb_arrayRelease( PHB_ITEM pArray ) hb_xfree( pBaseArray ); - pArray->type = IT_NIL; + pArray->type = HB_IT_NIL; pArray->item.asArray.value = NULL; return TRUE; @@ -670,7 +670,7 @@ BOOL hb_arrayCopy( PHB_ITEM pSrcArray, PHB_ITEM pDstArray, ULONG * pulStart, { HB_TRACE(HB_TR_DEBUG, ("hb_arrayCopy(%p, %p, %p, %p, %p)", pSrcArray, pDstArray, pulStart, pulCount, pulTarget)); - if( IS_ARRAY( pSrcArray ) && IS_ARRAY( pDstArray ) ) + if( HB_IS_ARRAY( pSrcArray ) && HB_IS_ARRAY( pDstArray ) ) { PHB_BASEARRAY pSrcBaseArray = pSrcArray->item.asArray.value; PHB_BASEARRAY pDstBaseArray = pDstArray->item.asArray.value; @@ -736,7 +736,7 @@ PHB_ITEM hb_arrayClone( PHB_ITEM pSrcArray ) HB_TRACE(HB_TR_DEBUG, ("hb_arrayClone(%p)", pSrcArray)); - if( IS_ARRAY( pSrcArray ) ) + if( HB_IS_ARRAY( pSrcArray ) ) { PHB_BASEARRAY pSrcBaseArray = pSrcArray->item.asArray.value; PHB_BASEARRAY pDstBaseArray; @@ -752,7 +752,7 @@ PHB_ITEM hb_arrayClone( PHB_ITEM pSrcArray ) { PHB_ITEM pSrcItem = pSrcBaseArray->pItems + ulCount; - if( pSrcItem->type == IT_ARRAY ) + if( pSrcItem->type == HB_IT_ARRAY ) { PHB_ITEM pClone = hb_arrayClone( pSrcItem ); diff --git a/harbour/source/vm/arrayshb.c b/harbour/source/vm/arrayshb.c index 37d0f70f28..d257055442 100644 --- a/harbour/source/vm/arrayshb.c +++ b/harbour/source/vm/arrayshb.c @@ -93,11 +93,11 @@ HB_FUNC( ARRAY ) HB_FUNC( AADD ) { - PHB_ITEM pArray = hb_param( 1, IT_ARRAY ); + PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY ); if( pArray ) { - PHB_ITEM pValue = hb_param( 2, IT_ANY ); + PHB_ITEM pValue = hb_param( 2, HB_IT_ANY ); if( pValue && hb_arrayAdd( pArray, pValue ) ) hb_itemReturn( pValue ); @@ -121,7 +121,7 @@ HB_FUNC( AADD ) HB_FUNC( ASIZE ) { - PHB_ITEM pArray = hb_param( 1, IT_ARRAY ); + PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY ); if( pArray && ISNUM( 2 ) ) { @@ -139,7 +139,7 @@ HB_FUNC( ASIZE ) HB_FUNC( ATAIL ) { - PHB_ITEM pArray = hb_param( 1, IT_ARRAY ); + PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY ); if( pArray ) hb_arrayLast( pArray, &hb_stack.Return ); @@ -147,7 +147,7 @@ HB_FUNC( ATAIL ) HB_FUNC( AINS ) { - PHB_ITEM pArray = hb_param( 1, IT_ARRAY ); + PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY ); if( pArray ) { @@ -160,7 +160,7 @@ HB_FUNC( AINS ) HB_FUNC( ADEL ) { - PHB_ITEM pArray = hb_param( 1, IT_ARRAY ); + PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY ); if( pArray ) { @@ -173,11 +173,11 @@ HB_FUNC( ADEL ) HB_FUNC( AFILL ) { - PHB_ITEM pArray = hb_param( 1, IT_ARRAY ); + PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY ); if( pArray ) { - PHB_ITEM pValue = hb_param( 2, IT_ANY ); + PHB_ITEM pValue = hb_param( 2, HB_IT_ANY ); if( pValue ) { @@ -196,8 +196,8 @@ HB_FUNC( AFILL ) HB_FUNC( ASCAN ) { - PHB_ITEM pArray = hb_param( 1, IT_ARRAY ); - PHB_ITEM pValue = hb_param( 2, IT_ANY ); + PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY ); + PHB_ITEM pValue = hb_param( 2, HB_IT_ANY ); if( pArray && pValue ) { @@ -215,8 +215,8 @@ HB_FUNC( ASCAN ) HB_FUNC( AEVAL ) { - PHB_ITEM pArray = hb_param( 1, IT_ARRAY ); - PHB_ITEM pBlock = hb_param( 2, IT_BLOCK ); + PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY ); + PHB_ITEM pBlock = hb_param( 2, HB_IT_BLOCK ); if( pArray && pBlock ) { @@ -236,8 +236,8 @@ HB_FUNC( AEVAL ) HB_FUNC( ACOPY ) { - PHB_ITEM pSrcArray = hb_param( 1, IT_ARRAY ); - PHB_ITEM pDstArray = hb_param( 2, IT_ARRAY ); + PHB_ITEM pSrcArray = hb_param( 1, HB_IT_ARRAY ); + PHB_ITEM pDstArray = hb_param( 2, HB_IT_ARRAY ); if( pSrcArray && pDstArray ) { @@ -263,7 +263,7 @@ HB_FUNC( ACOPY ) HB_FUNC( ACLONE ) { - PHB_ITEM pSrcArray = hb_param( 1, IT_ARRAY ); + PHB_ITEM pSrcArray = hb_param( 1, HB_IT_ARRAY ); if( pSrcArray && ! hb_arrayIsObject( pSrcArray ) ) { diff --git a/harbour/source/vm/break.c b/harbour/source/vm/break.c index fbbfa659e3..d05f4dd5ae 100644 --- a/harbour/source/vm/break.c +++ b/harbour/source/vm/break.c @@ -43,6 +43,6 @@ HB_FUNC( BREAK ) { - hb_vmRequestBreak( hb_param( 1, IT_ANY ) ); + hb_vmRequestBreak( hb_param( 1, HB_IT_ANY ) ); } diff --git a/harbour/source/vm/classes.c b/harbour/source/vm/classes.c index e7c130e580..a39306597e 100644 --- a/harbour/source/vm/classes.c +++ b/harbour/source/vm/classes.c @@ -233,7 +233,7 @@ char * hb_objGetClsName( PHB_ITEM pObject ) HB_TRACE(HB_TR_DEBUG, ("hb_objGetClsName(%p)", pObject)); - if( IS_ARRAY( pObject ) ) + if( HB_IS_ARRAY( pObject ) ) { if( ! pObject->item.asArray.value->uiClass ) szClassName = "ARRAY"; @@ -245,33 +245,33 @@ char * hb_objGetClsName( PHB_ITEM pObject ) { switch( pObject->type ) { - case IT_NIL: + case HB_IT_NIL: szClassName = "NIL"; break; - case IT_STRING: + case HB_IT_STRING: szClassName = "CHARACTER"; break; - case IT_BLOCK: + case HB_IT_BLOCK: szClassName = "BLOCK"; break; - case IT_SYMBOL: + case HB_IT_SYMBOL: szClassName = "SYMBOL"; break; - case IT_DATE: + case HB_IT_DATE: szClassName = "DATE"; break; - case IT_INTEGER: - case IT_LONG: - case IT_DOUBLE: + case HB_IT_INTEGER: + case HB_IT_LONG: + case HB_IT_DOUBLE: szClassName = "NUMERIC"; break; - case IT_LOGICAL: + case HB_IT_LOGICAL: szClassName = "LOGICAL"; break; @@ -296,7 +296,7 @@ PHB_FUNC hb_objGetMethod( PHB_ITEM pObject, PHB_SYMB pMessage ) HB_TRACE(HB_TR_DEBUG, ("hb_objGetMethod(%p, %p)", pObject, pMessage)); - if( pObject->type == IT_ARRAY ) + if( pObject->type == HB_IT_ARRAY ) uiClass = pObject->item.asArray.value->uiClass; else uiClass = 0; @@ -404,7 +404,7 @@ HB_FUNC( __CLSADDMSG ) USHORT uiMask = pClass->uiHashKey * BUCKET; PMETHOD pNewMeth; - if( wType == HB_OO_MSG_INLINE && hb_param( 3, IT_BLOCK ) == NULL ) + if( wType == HB_OO_MSG_INLINE && hb_param( 3, HB_IT_BLOCK ) == NULL ) { hb_errRT_BASE( EG_ARG, 3000, NULL, "__CLSADDMSG" ); } @@ -437,13 +437,13 @@ HB_FUNC( __CLSADDMSG ) pNewMeth->pFunction = hb___msgSetData; else { - PHB_ITEM pInit = hb_param( 5, IT_ANY ); + PHB_ITEM pInit = hb_param( 5, HB_IT_ANY ); pNewMeth->pFunction = hb___msgGetData; - if( pInit && ! IS_NIL( pInit ) ) /* Initializer found */ + if( pInit && ! HB_IS_NIL( pInit ) ) /* Initializer found */ { - if( IS_ARRAY( pInit ) ) + if( HB_IS_ARRAY( pInit ) ) pNewMeth->pInitValue = hb_arrayClone( pInit ); else { @@ -464,13 +464,13 @@ HB_FUNC( __CLSADDMSG ) pNewMeth->pFunction = hb___msgSetClsData; else { - PHB_ITEM pInit = hb_param( 5, IT_ANY ); + PHB_ITEM pInit = hb_param( 5, HB_IT_ANY ); pNewMeth->pFunction = hb___msgGetClsData; - if( pInit && ! IS_NIL( pInit ) ) /* Initializer found */ + if( pInit && ! HB_IS_NIL( pInit ) ) /* Initializer found */ { - if( IS_ARRAY( pInit ) ) + if( HB_IS_ARRAY( pInit ) ) pNewMeth->pInitValue = hb_arrayClone( pInit ); else { @@ -485,7 +485,7 @@ HB_FUNC( __CLSADDMSG ) pNewMeth->uiData = ( USHORT ) ( hb_arrayLen( pClass->pInlines ) + 1 ); hb_arraySize( pClass->pInlines, pNewMeth->uiData ); hb_arraySet( pClass->pInlines, pNewMeth->uiData, - hb_param( 3, IT_BLOCK ) ); + hb_param( 3, HB_IT_BLOCK ) ); pNewMeth->pFunction = hb___msgEvalInline; break; @@ -597,7 +597,7 @@ HB_FUNC( __CLSNEW ) HB_FUNC( __CLSDELMSG ) { USHORT uiClass = hb_parni( 1 ); - PHB_ITEM pString = hb_param( 2, IT_STRING ); + PHB_ITEM pString = hb_param( 2, HB_IT_STRING ); if( uiClass && uiClass <= s_uiClasses && pString ) { @@ -674,7 +674,7 @@ HB_FUNC( __CLSINST ) { if( pMeth->pFunction != hb___msgGetClsData ) /* is a DATA */ { - if( IS_ARRAY( pMeth->pInitValue ) ) + if( HB_IS_ARRAY( pMeth->pInitValue ) ) { PHB_ITEM pInitValue = hb_arrayClone( pMeth->pInitValue ); hb_itemArrayPut( &hb_stack.Return, pMeth->uiData, pInitValue ); @@ -688,7 +688,7 @@ HB_FUNC( __CLSINST ) { HB_ITEM init; hb_arrayGet( pClass->pClassDatas, pMeth->uiData, &init ); - if( init.type == IT_NIL ) + if( init.type == HB_IT_NIL ) { hb_arraySet( pClass->pClassDatas, pMeth->uiData, pMeth->pInitValue ); pMeth->bClsDataInitiated = 1; @@ -709,7 +709,7 @@ HB_FUNC( __CLSINST ) HB_FUNC( __CLSMODMSG ) { USHORT uiClass = hb_parni( 1 ); - PHB_ITEM pString = hb_param( 2, IT_STRING ); + PHB_ITEM pString = hb_param( 2, HB_IT_STRING ); if( uiClass && uiClass <= s_uiClasses && pString ) { @@ -737,7 +737,7 @@ HB_FUNC( __CLSMODMSG ) if( pFunc == hb___msgEvalInline ) /* INLINE method changed */ { - PHB_ITEM pBlock = hb_param( 3, IT_BLOCK ); + PHB_ITEM pBlock = hb_param( 3, HB_IT_BLOCK ); if( pBlock == NULL ) hb_errRT_BASE( EG_ARG, 3000, NULL, "__CLSMODMSG" ); @@ -763,7 +763,7 @@ HB_FUNC( __CLSMODMSG ) */ HB_FUNC( __OBJGETCLSNAME ) { - PHB_ITEM pObject = hb_param( 0, IT_OBJECT ); + PHB_ITEM pObject = hb_param( 0, HB_IT_OBJECT ); USHORT uiClass; if( pObject && pObject->item.asArray.value->uiClass ) @@ -791,8 +791,8 @@ HB_FUNC( __OBJGETCLSNAME ) */ HB_FUNC( __OBJHASMSG ) { - PHB_ITEM pObject = hb_param( 1, IT_OBJECT ); - PHB_ITEM pString = hb_param( 2, IT_STRING ); + PHB_ITEM pObject = hb_param( 1, HB_IT_OBJECT ); + PHB_ITEM pString = hb_param( 2, HB_IT_STRING ); if( pObject && pString ) hb_retl( hb_objHasMsg( pObject, pString->item.asString.value ) != 0 ); @@ -808,7 +808,7 @@ HB_FUNC( __OBJHASMSG ) */ HB_FUNC( __OBJCLONE ) { - PHB_ITEM pSrcObject = hb_param( 1, IT_OBJECT ); + PHB_ITEM pSrcObject = hb_param( 1, HB_IT_OBJECT ); if( pSrcObject ) { @@ -829,8 +829,8 @@ HB_FUNC( __OBJCLONE ) */ HB_FUNC( __OBJSENDMSG ) { - PHB_ITEM pObject = hb_param( 1, IT_OBJECT ); - PHB_ITEM pMessage = hb_param( 2, IT_STRING ); + PHB_ITEM pObject = hb_param( 1, HB_IT_OBJECT ); + PHB_ITEM pMessage = hb_param( 2, HB_IT_STRING ); if( pMessage && pObject ) /* Object & message passed */ { @@ -844,7 +844,7 @@ HB_FUNC( __OBJSENDMSG ) hb_vmMessage( pMsg->pSymbol ); /* Push char symbol as message */ for( uiParam = 3; uiParam <= hb_pcount(); uiParam++ ) /* Push arguments on stack */ - hb_vmPush( hb_param( uiParam, IT_ANY ) ); + hb_vmPush( hb_param( uiParam, HB_IT_ANY ) ); hb_vmDo( hb_pcount() - 2 ); /* Execute message */ } } @@ -860,7 +860,7 @@ HB_FUNC( __OBJSENDMSG ) */ HB_FUNC( __CLSINSTSUPER ) { - PHB_ITEM pString = hb_param( 1, IT_STRING ); + PHB_ITEM pString = hb_param( 1, HB_IT_STRING ); BOOL bFound = FALSE; if( pString ) @@ -875,7 +875,7 @@ HB_FUNC( __CLSINSTSUPER ) hb_vmPushNil(); hb_vmFunction( 0 ); /* Execute super class */ - if( !IS_OBJECT( &hb_stack.Return ) ) + if( !HB_IS_OBJECT( &hb_stack.Return ) ) { hb_errRT_BASE( EG_ARG, 3002, "Super class does not return an object", "__CLSINSTSUPER" ); } @@ -1027,7 +1027,7 @@ HB_FUNC( __CLASSSEL ) */ static HARBOUR hb___msgClsH( void ) { - if( IS_ARRAY( hb_stack.pBase + 1 ) ) + if( HB_IS_ARRAY( hb_stack.pBase + 1 ) ) hb_retni( ( hb_stack.pBase + 1 )->item.asArray.value->uiClass ); else hb_retni( 0 ); @@ -1043,7 +1043,7 @@ static HARBOUR hb___msgClsName( void ) { PHB_ITEM pItemRef; - if( IS_BYREF( hb_stack.pBase + 1 ) ) /* Variables by reference */ + if( HB_IS_BYREF( hb_stack.pBase + 1 ) ) /* Variables by reference */ pItemRef = hb_itemUnRef( hb_stack.pBase + 1 ); else pItemRef = hb_stack.pBase + 1; @@ -1059,15 +1059,15 @@ static HARBOUR hb___msgClsName( void ) */ static HARBOUR hb___msgClsSel( void ) { - USHORT uiClass = IS_ARRAY( hb_stack.pBase + 1 ) ? + USHORT uiClass = HB_IS_ARRAY( hb_stack.pBase + 1 ) ? ( hb_stack.pBase + 1 )->item.asArray.value->uiClass : 0; /* Get class word */ PHB_ITEM pReturn = hb_itemNew( NULL ); - if( ( ! uiClass ) && IS_BYREF( hb_stack.pBase + 1 ) ) + if( ( ! uiClass ) && HB_IS_BYREF( hb_stack.pBase + 1 ) ) { /* Variables by reference */ PHB_ITEM pItemRef = hb_itemUnRef( hb_stack.pBase + 1 ); - if( IS_ARRAY( pItemRef ) ) + if( HB_IS_ARRAY( pItemRef ) ) uiClass = pItemRef->item.asArray.value->uiClass; } @@ -1116,7 +1116,7 @@ static HARBOUR hb___msgEvalInline( void ) hb_vmPush( &block ); hb_vmPush( hb_stack.pBase + 1 ); /* Push self */ for( uiParam = 1; uiParam <= hb_pcount(); uiParam++ ) - hb_vmPush( hb_param( uiParam, IT_ANY ) ); + hb_vmPush( hb_param( uiParam, HB_IT_ANY ) ); hb_vmDo( hb_pcount() + 1 ); /* Self is also an argument */ hb_itemClear( &block ); /* Release block */ @@ -1130,14 +1130,14 @@ static HARBOUR hb___msgEvalInline( void ) */ static HARBOUR hb___msgEval( void ) { - if( IS_BLOCK( hb_stack.pBase + 1 ) ) + if( HB_IS_BLOCK( hb_stack.pBase + 1 ) ) { USHORT uiParam; hb_vmPushSymbol( &hb_symEval ); hb_vmPush( hb_stack.pBase + 1 ); /* Push block */ for( uiParam = 1; uiParam <= hb_pcount(); uiParam++ ) - hb_vmPush( hb_param( uiParam, IT_ANY ) ); + hb_vmPush( hb_param( uiParam, HB_IT_ANY ) ); hb_vmDo( hb_pcount() ); /* Self is also an argument */ } else diff --git a/harbour/source/vm/codebloc.c b/harbour/source/vm/codebloc.c index 81a21e5fc9..d46699aac6 100644 --- a/harbour/source/vm/codebloc.c +++ b/harbour/source/vm/codebloc.c @@ -78,7 +78,7 @@ HB_CODEBLOCK_PTR hb_codeblockNew( BYTE * pBuffer, * The element 0 is used as the counter of references to this table */ pCBlock->pLocals = ( PHB_ITEM ) hb_xgrab( ( uiLocals + 1 ) * sizeof( HB_ITEM ) ); - pCBlock->pLocals[ 0 ].type = IT_LONG; + pCBlock->pLocals[ 0 ].type = HB_IT_LONG; pCBlock->pLocals[ 0 ].item.asLong.value = 1; while( uiLocals-- ) @@ -90,7 +90,7 @@ HB_CODEBLOCK_PTR hb_codeblockNew( BYTE * pBuffer, */ pLocal = hb_stack.pBase + 1 + ( *pLocalPosTable++ ); - if( ! IS_MEMVAR( pLocal ) ) + if( ! HB_IS_MEMVAR( pLocal ) ) { /* Change the value only if this variable is not referenced * by another codeblock yet. @@ -100,7 +100,7 @@ HB_CODEBLOCK_PTR hb_codeblockNew( BYTE * pBuffer, hMemvar = hb_memvarValueNew( pLocal, FALSE ); - pLocal->type = IT_BYREF | IT_MEMVAR; + pLocal->type = HB_IT_BYREF | HB_IT_MEMVAR; pLocal->item.asMemvar.itemsbase = hb_memvarValueBaseAddress(); pLocal->item.asMemvar.offset = 0; pLocal->item.asMemvar.value = hMemvar; @@ -131,7 +131,7 @@ HB_CODEBLOCK_PTR hb_codeblockNew( BYTE * pBuffer, PHB_ITEM pLocal; pLocal = hb_stack.pBase + 1; - if( IS_BLOCK( pLocal ) ) + if( HB_IS_BLOCK( pLocal ) ) { HB_CODEBLOCK_PTR pOwner = pLocal->item.asBlock.value; diff --git a/harbour/source/vm/debug.c b/harbour/source/vm/debug.c index 0a813e890f..2a7cd10e23 100644 --- a/harbour/source/vm/debug.c +++ b/harbour/source/vm/debug.c @@ -46,10 +46,10 @@ static void AddToArray( PHB_ITEM pItem, PHB_ITEM pReturn, ULONG ulPos ) HB_TRACE(HB_TR_DEBUG, ("AddToArray(%p, %p, %lu)", pItem, pReturn, ulPos)); - if( pItem->type == IT_SYMBOL ) + if( pItem->type == HB_IT_SYMBOL ) { /* Symbol is pushed as text */ pTemp = hb_itemNew( NULL ); /* Create temporary string */ - pTemp->type = IT_STRING; + pTemp->type = HB_IT_STRING; pTemp->item.asString.length = strlen( pItem->item.asSymbol.value->szName ) + 2; pTemp->item.asString.value = ( char * ) hb_xgrab( pTemp->item.asString.length + 1 ); diff --git a/harbour/source/vm/extend.c b/harbour/source/vm/extend.c index 181d253de3..6523bfe2a1 100644 --- a/harbour/source/vm/extend.c +++ b/harbour/source/vm/extend.c @@ -61,20 +61,15 @@ PHB_ITEM hb_param( int iParam, int iMask ) if( ( iParam >= 0 && iParam <= hb_pcount() ) || ( iParam == -1 ) ) { - PHB_ITEM pItem; + PHB_ITEM pItem = ( iParam == -1 ) ? &hb_stack.Return : ( hb_stack.pBase + 1 + iParam ); USHORT uiType; - if( iParam == -1 ) - pItem = &hb_stack.Return; - else - pItem = hb_stack.pBase + 1 + iParam; - - if( pItem->type & IT_BYREF ) + if( pItem->type & HB_IT_BYREF ) pItem = hb_itemUnRef( pItem ); uiType = pItem->type; - if( ( uiType & ( USHORT ) iMask ) || ( uiType == IT_NIL && ( USHORT ) iMask == IT_ANY ) ) + if( ( uiType & ( USHORT ) iMask ) || ( uiType == HB_IT_NIL && ( USHORT ) iMask == HB_IT_ANY ) ) return pItem; } @@ -90,20 +85,15 @@ char * hb_parc( int iParam, ... ) if( ( iParam >= 0 && iParam <= hb_pcount() ) || ( iParam == -1 ) ) { - PHB_ITEM pItem; + PHB_ITEM pItem = ( iParam == -1 ) ? &hb_stack.Return : ( hb_stack.pBase + 1 + iParam ); - if( iParam == -1 ) - pItem = &hb_stack.Return; - else - pItem = hb_stack.pBase + 1 + iParam; - - if( IS_BYREF( pItem ) ) + if( HB_IS_BYREF( pItem ) ) pItem = hb_itemUnRef( pItem ); - if( IS_STRING( pItem ) ) + if( HB_IS_STRING( pItem ) ) return pItem->item.asString.value; - else if( IS_ARRAY( pItem ) ) + else if( HB_IS_ARRAY( pItem ) ) { va_list va; ULONG ulArrayIndex; @@ -125,20 +115,15 @@ ULONG hb_parclen( int iParam, ... ) if( ( iParam >= 0 && iParam <= hb_pcount() ) || ( iParam == -1 ) ) { - PHB_ITEM pItem; + PHB_ITEM pItem = ( iParam == -1 ) ? &hb_stack.Return : ( hb_stack.pBase + 1 + iParam ); - if( iParam == -1 ) - pItem = &hb_stack.Return; - else - pItem = hb_stack.pBase + 1 + iParam; - - if( IS_BYREF( pItem ) ) + if( HB_IS_BYREF( pItem ) ) pItem = hb_itemUnRef( pItem ); - if( IS_STRING( pItem ) ) + if( HB_IS_STRING( pItem ) ) return pItem->item.asString.length; - else if( IS_ARRAY( pItem ) ) + else if( HB_IS_ARRAY( pItem ) ) { va_list va; ULONG ulArrayIndex; @@ -164,24 +149,19 @@ ULONG hb_parcsiz( int iParam, ... ) if( ( iParam >= 0 && iParam <= hb_pcount() ) || ( iParam == -1 ) ) { - PHB_ITEM pItem; - - if( iParam == -1 ) - pItem = &hb_stack.Return; - else - pItem = hb_stack.pBase + 1 + iParam; + PHB_ITEM pItem = ( iParam == -1 ) ? &hb_stack.Return : ( hb_stack.pBase + 1 + iParam ); /* NOTE: hb_parcsiz() will only work for strings passed by reference. CA-Cl*pper works like this. [vszakats] */ - if( IS_BYREF( pItem ) ) + if( HB_IS_BYREF( pItem ) ) { pItem = hb_itemUnRef( pItem ); - if( IS_STRING( pItem ) ) + if( HB_IS_STRING( pItem ) ) return pItem->item.asString.length + 1; - else if( IS_ARRAY( pItem ) ) + else if( HB_IS_ARRAY( pItem ) ) { va_list va; ULONG ulArrayIndex; @@ -207,20 +187,15 @@ char * hb_pards( int iParam, ... ) if( ( iParam >= 0 && iParam <= hb_pcount() ) || ( iParam == -1 ) ) { - PHB_ITEM pItem; + PHB_ITEM pItem = ( iParam == -1 ) ? &hb_stack.Return : ( hb_stack.pBase + 1 + iParam ); - if( iParam == -1 ) - pItem = &hb_stack.Return; - else - pItem = hb_stack.pBase + 1 + iParam; - - if( IS_BYREF( pItem ) ) + if( HB_IS_BYREF( pItem ) ) pItem = hb_itemUnRef( pItem ); - if( IS_DATE( pItem ) ) + if( HB_IS_DATE( pItem ) ) return hb_dateDecStr( hb_stack.szDate, pItem->item.asDate.value ); - else if( IS_ARRAY( pItem ) ) + else if( HB_IS_ARRAY( pItem ) ) { va_list va; ULONG ulArrayIndex; @@ -244,20 +219,15 @@ char * hb_pardsbuff( char * szDate, int iParam, ... ) if( ( iParam >= 0 && iParam <= hb_pcount() ) || ( iParam == -1 ) ) { - PHB_ITEM pItem; + PHB_ITEM pItem = ( iParam == -1 ) ? &hb_stack.Return : ( hb_stack.pBase + 1 + iParam ); - if( iParam == -1 ) - pItem = &hb_stack.Return; - else - pItem = hb_stack.pBase + 1 + iParam; - - if( IS_BYREF( pItem ) ) + if( HB_IS_BYREF( pItem ) ) pItem = hb_itemUnRef( pItem ); - if( IS_DATE( pItem ) ) + if( HB_IS_DATE( pItem ) ) return hb_dateDecStr( szDate, pItem->item.asDate.value ); - else if( IS_ARRAY( pItem ) ) + else if( HB_IS_ARRAY( pItem ) ) { va_list va; ULONG ulArrayIndex; @@ -279,29 +249,24 @@ int hb_parl( int iParam, ... ) if( ( iParam >= 0 && iParam <= hb_pcount() ) || ( iParam == -1 ) ) { - PHB_ITEM pItem; + PHB_ITEM pItem = ( iParam == -1 ) ? &hb_stack.Return : ( hb_stack.pBase + 1 + iParam ); - if( iParam == -1 ) - pItem = &hb_stack.Return; - else - pItem = hb_stack.pBase + 1 + iParam; - - if( IS_BYREF( pItem ) ) + if( HB_IS_BYREF( pItem ) ) pItem = hb_itemUnRef( pItem ); - if( IS_LOGICAL( pItem ) ) + if( HB_IS_LOGICAL( pItem ) ) return pItem->item.asLogical.value ? 1 : 0; - else if( IS_INTEGER( pItem ) ) + else if( HB_IS_INTEGER( pItem ) ) return pItem->item.asInteger.value != 0 ? 1 : 0; - else if( IS_LONG( pItem ) ) + else if( HB_IS_LONG( pItem ) ) return pItem->item.asLong.value != 0 ? 1 : 0; - else if( IS_DOUBLE( pItem ) ) + else if( HB_IS_DOUBLE( pItem ) ) return pItem->item.asDouble.value != 0.0 ? 1 : 0; - else if( IS_ARRAY( pItem ) ) + else if( HB_IS_ARRAY( pItem ) ) { va_list va; ULONG ulArrayIndex; @@ -323,26 +288,21 @@ double hb_parnd( int iParam, ... ) if( ( iParam >= 0 && iParam <= hb_pcount() ) || ( iParam == -1 ) ) { - PHB_ITEM pItem; + PHB_ITEM pItem = ( iParam == -1 ) ? &hb_stack.Return : ( hb_stack.pBase + 1 + iParam ); - if( iParam == -1 ) - pItem = &hb_stack.Return; - else - pItem = hb_stack.pBase + 1 + iParam; - - if( IS_BYREF( pItem ) ) + if( HB_IS_BYREF( pItem ) ) pItem = hb_itemUnRef( pItem ); - if( IS_DOUBLE( pItem ) ) + if( HB_IS_DOUBLE( pItem ) ) return pItem->item.asDouble.value; - else if( IS_INTEGER( pItem ) ) + else if( HB_IS_INTEGER( pItem ) ) return ( double ) pItem->item.asInteger.value; - else if( IS_LONG( pItem ) ) + else if( HB_IS_LONG( pItem ) ) return ( double ) pItem->item.asLong.value; - else if( IS_ARRAY( pItem ) ) + else if( HB_IS_ARRAY( pItem ) ) { va_list va; ULONG ulArrayIndex; @@ -364,26 +324,21 @@ int hb_parni( int iParam, ... ) if( ( iParam >= 0 && iParam <= hb_pcount() ) || ( iParam == -1 ) ) { - PHB_ITEM pItem; + PHB_ITEM pItem = ( iParam == -1 ) ? &hb_stack.Return : ( hb_stack.pBase + 1 + iParam ); - if( iParam == -1 ) - pItem = &hb_stack.Return; - else - pItem = hb_stack.pBase + 1 + iParam; - - if( IS_BYREF( pItem ) ) + if( HB_IS_BYREF( pItem ) ) pItem = hb_itemUnRef( pItem ); - if( IS_INTEGER( pItem ) ) + if( HB_IS_INTEGER( pItem ) ) return pItem->item.asInteger.value; - else if( IS_LONG( pItem ) ) + else if( HB_IS_LONG( pItem ) ) return ( int ) pItem->item.asLong.value; - else if( IS_DOUBLE( pItem ) ) + else if( HB_IS_DOUBLE( pItem ) ) return ( int ) pItem->item.asDouble.value; - else if( IS_ARRAY( pItem ) ) + else if( HB_IS_ARRAY( pItem ) ) { va_list va; ULONG ulArrayIndex; @@ -405,29 +360,24 @@ long hb_parnl( int iParam, ... ) if( ( iParam >= 0 && iParam <= hb_pcount() ) || ( iParam == -1 ) ) { - PHB_ITEM pItem; + PHB_ITEM pItem = ( iParam == -1 ) ? &hb_stack.Return : ( hb_stack.pBase + 1 + iParam ); - if( iParam == -1 ) - pItem = &hb_stack.Return; - else - pItem = hb_stack.pBase + 1 + iParam; - - if( IS_BYREF( pItem ) ) + if( HB_IS_BYREF( pItem ) ) pItem = hb_itemUnRef( pItem ); - if( IS_LONG( pItem ) ) + if( HB_IS_LONG( pItem ) ) return pItem->item.asLong.value; - else if( IS_INTEGER( pItem ) ) + else if( HB_IS_INTEGER( pItem ) ) return ( long ) pItem->item.asInteger.value; - else if( IS_DOUBLE( pItem ) ) + else if( HB_IS_DOUBLE( pItem ) ) return ( long ) pItem->item.asDouble.value; - else if( IS_DATE( pItem ) ) + else if( HB_IS_DATE( pItem ) ) return pItem->item.asDate.value; - else if( IS_ARRAY( pItem ) ) + else if( HB_IS_ARRAY( pItem ) ) { va_list va; ULONG ulArrayIndex; @@ -449,7 +399,7 @@ ULONG hb_parinfa( int iParamNum, ULONG uiArrayIndex ) HB_TRACE(HB_TR_DEBUG, ("hb_parinfa(%d, %lu)", iParamNum, uiArrayIndex)); - pArray = hb_param( iParamNum, IT_ARRAY ); + pArray = hb_param( iParamNum, HB_IT_ARRAY ); if( pArray ) { @@ -472,14 +422,9 @@ int hb_parinfo( int iParam ) { if( ( iParam > 0 && iParam <= hb_pcount() ) || ( iParam == -1 ) ) { - USHORT uiType; + USHORT uiType = ( iParam == -1 ) ? hb_stack.Return.type : ( hb_stack.pBase + 1 + iParam )->type; - if( iParam == -1 ) - uiType = hb_stack.Return.type; - else - uiType = ( hb_stack.pBase + 1 + iParam )->type; - - if( uiType & IT_BYREF ) + if( uiType & HB_IT_BYREF ) { PHB_ITEM pItem; @@ -605,14 +550,9 @@ void hb_storc( char * szText, int iParam, ... ) if( ( iParam >= 0 && iParam <= hb_pcount() ) || ( iParam == -1 ) ) { - PHB_ITEM pItem; + PHB_ITEM pItem = ( iParam == -1 ) ? &hb_stack.Return : ( hb_stack.pBase + 1 + iParam ); - if( iParam == -1 ) - pItem = &hb_stack.Return; - else - pItem = hb_stack.pBase + 1 + iParam; - - if( IS_ARRAY( pItem ) ) + if( HB_IS_ARRAY( pItem ) ) { va_list va; PHB_ITEM pItemNew = hb_itemPutC( NULL, szText ); @@ -622,7 +562,7 @@ void hb_storc( char * szText, int iParam, ... ) hb_itemRelease( pItemNew ); } - else if( IS_BYREF( pItem ) || iParam == -1 ) + else if( HB_IS_BYREF( pItem ) || iParam == -1 ) hb_itemPutC( hb_itemUnRef( pItem ), szText ); } } @@ -633,14 +573,9 @@ void hb_storclen( char * szText, ULONG ulLen, int iParam, ... ) if( ( iParam >= 0 && iParam <= hb_pcount() ) || ( iParam == -1 ) ) { - PHB_ITEM pItem; + PHB_ITEM pItem = ( iParam == -1 ) ? &hb_stack.Return : ( hb_stack.pBase + 1 + iParam ); - if( iParam == -1 ) - pItem = &hb_stack.Return; - else - pItem = hb_stack.pBase + 1 + iParam; - - if( IS_ARRAY( pItem ) ) + if( HB_IS_ARRAY( pItem ) ) { va_list va; PHB_ITEM pItemNew = hb_itemPutCL( NULL, szText, ulLen ); @@ -650,7 +585,7 @@ void hb_storclen( char * szText, ULONG ulLen, int iParam, ... ) hb_itemRelease( pItemNew ); } - else if( IS_BYREF( pItem ) || iParam == -1 ) + else if( HB_IS_BYREF( pItem ) || iParam == -1 ) hb_itemPutCL( hb_itemUnRef( pItem ), szText, ulLen ); } } @@ -663,14 +598,9 @@ void hb_stords( char * szDate, int iParam, ... ) if( ( iParam >= 0 && iParam <= hb_pcount() ) || ( iParam == -1 ) ) { - PHB_ITEM pItem; + PHB_ITEM pItem = ( iParam == -1 ) ? &hb_stack.Return : ( hb_stack.pBase + 1 + iParam ); - if( iParam == -1 ) - pItem = &hb_stack.Return; - else - pItem = hb_stack.pBase + 1 + iParam; - - if( IS_ARRAY( pItem ) ) + if( HB_IS_ARRAY( pItem ) ) { va_list va; PHB_ITEM pItemNew = hb_itemPutDS( NULL, szDate ); @@ -680,7 +610,7 @@ void hb_stords( char * szDate, int iParam, ... ) hb_itemRelease( pItemNew ); } - else if( IS_BYREF( pItem ) || iParam == -1 ) + else if( HB_IS_BYREF( pItem ) || iParam == -1 ) hb_itemPutDS( hb_itemUnRef( pItem ), szDate ); } } @@ -691,14 +621,9 @@ void hb_storl( int iLogical, int iParam, ... ) if( ( iParam >= 0 && iParam <= hb_pcount() ) || ( iParam == -1 ) ) { - PHB_ITEM pItem; + PHB_ITEM pItem = ( iParam == -1 ) ? &hb_stack.Return : ( hb_stack.pBase + 1 + iParam ); - if( iParam == -1 ) - pItem = &hb_stack.Return; - else - pItem = hb_stack.pBase + 1 + iParam; - - if( IS_ARRAY( pItem ) ) + if( HB_IS_ARRAY( pItem ) ) { va_list va; PHB_ITEM pItemNew = hb_itemPutL( NULL, iLogical ? TRUE : FALSE ); @@ -708,7 +633,7 @@ void hb_storl( int iLogical, int iParam, ... ) hb_itemRelease( pItemNew ); } - else if( IS_BYREF( pItem ) || iParam == -1 ) + else if( HB_IS_BYREF( pItem ) || iParam == -1 ) hb_itemPutL( hb_itemUnRef( pItem ), iLogical ? TRUE : FALSE ); } } @@ -719,14 +644,9 @@ void hb_storni( int iValue, int iParam, ... ) if( ( iParam >= 0 && iParam <= hb_pcount() ) || ( iParam == -1 ) ) { - PHB_ITEM pItem; + PHB_ITEM pItem = ( iParam == -1 ) ? &hb_stack.Return : ( hb_stack.pBase + 1 + iParam ); - if( iParam == -1 ) - pItem = &hb_stack.Return; - else - pItem = hb_stack.pBase + 1 + iParam; - - if( IS_ARRAY( pItem ) ) + if( HB_IS_ARRAY( pItem ) ) { va_list va; PHB_ITEM pItemNew = hb_itemPutNI( NULL, iValue ); @@ -736,7 +656,7 @@ void hb_storni( int iValue, int iParam, ... ) hb_itemRelease( pItemNew ); } - else if( IS_BYREF( pItem ) || iParam == -1 ) + else if( HB_IS_BYREF( pItem ) || iParam == -1 ) hb_itemPutNI( hb_itemUnRef( pItem ), iValue ); } } @@ -747,14 +667,9 @@ void hb_stornl( long lValue, int iParam, ... ) if( ( iParam >= 0 && iParam <= hb_pcount() ) || ( iParam == -1 ) ) { - PHB_ITEM pItem; + PHB_ITEM pItem = ( iParam == -1 ) ? &hb_stack.Return : ( hb_stack.pBase + 1 + iParam ); - if( iParam == -1 ) - pItem = &hb_stack.Return; - else - pItem = hb_stack.pBase + 1 + iParam; - - if( IS_ARRAY( pItem ) ) + if( HB_IS_ARRAY( pItem ) ) { va_list va; PHB_ITEM pItemNew = hb_itemPutNL( NULL, lValue ); @@ -764,7 +679,7 @@ void hb_stornl( long lValue, int iParam, ... ) hb_itemRelease( pItemNew ); } - else if( IS_BYREF( pItem ) || iParam == -1 ) + else if( HB_IS_BYREF( pItem ) || iParam == -1 ) hb_itemPutNI( hb_itemUnRef( pItem ), lValue ); } } @@ -775,14 +690,9 @@ void hb_stornd( double dNumber, int iParam, ... ) if( ( iParam >= 0 && iParam <= hb_pcount() ) || ( iParam == -1 ) ) { - PHB_ITEM pItem; + PHB_ITEM pItem = ( iParam == -1 ) ? &hb_stack.Return : ( hb_stack.pBase + 1 + iParam ); - if( iParam == -1 ) - pItem = &hb_stack.Return; - else - pItem = hb_stack.pBase + 1 + iParam; - - if( IS_ARRAY( pItem ) ) + if( HB_IS_ARRAY( pItem ) ) { va_list va; PHB_ITEM pItemNew = hb_itemPutND( NULL, dNumber ); @@ -792,7 +702,7 @@ void hb_stornd( double dNumber, int iParam, ... ) hb_itemRelease( pItemNew ); } - else if( IS_BYREF( pItem ) || iParam == -1 ) + else if( HB_IS_BYREF( pItem ) || iParam == -1 ) hb_itemPutND( hb_itemUnRef( pItem ), dNumber ); } } diff --git a/harbour/source/vm/fm.c b/harbour/source/vm/fm.c index 156504c6c5..86c48bec8d 100644 --- a/harbour/source/vm/fm.c +++ b/harbour/source/vm/fm.c @@ -43,15 +43,15 @@ * * Copyright 1999 Victor Szakats * hb_xquery() - * HB_MEMORY() + * MEMORY() * * See doc/license.txt for licensing terms. * */ /* NOTE: If you turn this on, the memory subsystem will collect information - about several statistical data about memory management, it will show - these on exit if memory seem to have leaked. + and several statistical data about memory management, it will show + these on exit if memory seem to have been leaked. This should be normally turned off in a final release [vszakats] */ #define HB_FM_STATISTICS diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c index 7ca4cf740b..6a62f3ab66 100644 --- a/harbour/source/vm/hvm.c +++ b/harbour/source/vm/hvm.c @@ -230,9 +230,9 @@ void hb_vmInit( BOOL bStartMainProc ) HB_TRACE(HB_TR_DEBUG, ("hb_vmInit()")); /* initialize internal data structures */ - s_aStatics.type = IT_NIL; + s_aStatics.type = HB_IT_NIL; hb_stack.pItems = NULL; /* keep this here as it is used by fm.c */ - hb_stack.Return.type = IT_NIL; + hb_stack.Return.type = HB_IT_NIL; hb_xinit(); hb_errInit(); @@ -591,25 +591,25 @@ void hb_vmExecute( BYTE * pCode, PHB_SYMB pSymbols ) /* * 1) clear the storage for value returned by BREAK statement */ - hb_stack.pPos->type = IT_NIL; + hb_stack.pPos->type = HB_IT_NIL; hb_stackPush(); /* * 2) store the address of RECOVER or END opcode */ - hb_stack.pPos->type = IT_LONG; + hb_stack.pPos->type = HB_IT_LONG; hb_stack.pPos->item.asLong.value = w + pCode[ w + 1 ] + ( pCode[ w + 2 ] * 256 ); hb_stackPush(); /* * 3) store current RECOVER base */ - hb_stack.pPos->type = IT_LONG; + hb_stack.pPos->type = HB_IT_LONG; hb_stack.pPos->item.asLong.value = s_lRecoverBase; hb_stackPush(); /* * 4) store current bCanRecover flag - in a case of nested sequences * in the same procedure/function */ - hb_stack.pPos->type = IT_LOGICAL; + hb_stack.pPos->type = HB_IT_LOGICAL; hb_stack.pPos->item.asLogical.value = bCanRecover; hb_stackPush(); /* @@ -634,18 +634,18 @@ void hb_vmExecute( BYTE * pCode, PHB_SYMB pSymbols ) */ hb_stackDec(); bCanRecover = hb_stack.pPos->item.asLogical.value; - hb_stack.pPos->type = IT_NIL; + hb_stack.pPos->type = HB_IT_NIL; /* * 3) Restore previous RECOVER base */ hb_stackDec(); s_lRecoverBase = hb_stack.pPos->item.asLong.value; - hb_stack.pPos->type = IT_NIL; + hb_stack.pPos->type = HB_IT_NIL; /* * 2) Remove RECOVER address */ hb_stackDec(); - hb_stack.pPos->type = IT_NIL; + hb_stack.pPos->type = HB_IT_NIL; /* 1) Discard the value returned by BREAK statement - there * was no RECOVER clause or there was no BREAK statement */ @@ -665,18 +665,18 @@ void hb_vmExecute( BYTE * pCode, PHB_SYMB pSymbols ) */ hb_stackDec(); bCanRecover = hb_stack.pPos->item.asLogical.value; - hb_stack.pPos->type = IT_NIL; + hb_stack.pPos->type = HB_IT_NIL; /* * 3) Restore previous RECOVER base */ hb_stackDec(); s_lRecoverBase = hb_stack.pPos->item.asLong.value; - hb_stack.pPos->type = IT_NIL; + hb_stack.pPos->type = HB_IT_NIL; /* * 2) Remove RECOVER address */ hb_stackDec(); - hb_stack.pPos->type = IT_NIL; + hb_stack.pPos->type = HB_IT_NIL; /* * 1) Leave the value returned from BREAK - it will be popped * in next executed opcode @@ -726,7 +726,7 @@ void hb_vmExecute( BYTE * pCode, PHB_SYMB pSymbols ) break; case HB_P_PUSHNIL: - hb_stack.pPos->type = IT_NIL; + hb_stack.pPos->type = HB_IT_NIL; hb_stackPush(); HB_TRACE(HB_TR_INFO, ("(hb_vmPushNil)")); w++; @@ -1176,17 +1176,17 @@ static void hb_vmNegate( void ) pItem = hb_stack.pPos - 1; - if( IS_INTEGER( pItem ) ) + if( HB_IS_INTEGER( pItem ) ) { pItem->item.asInteger.value = -pItem->item.asInteger.value; pItem->item.asInteger.length = 10; } - else if( IS_LONG( pItem ) ) + else if( HB_IS_LONG( pItem ) ) { pItem->item.asLong.value = -pItem->item.asLong.value; pItem->item.asLong.length = 10; } - else if( IS_DOUBLE( pItem ) ) + else if( HB_IS_DOUBLE( pItem ) ) { pItem->item.asDouble.value = -pItem->item.asDouble.value; pItem->item.asDouble.length = pItem->item.asDouble.value >= 10000000000.0 ? 20 : 10; @@ -1214,7 +1214,7 @@ static void hb_vmPlus( void ) pItem1 = hb_stack.pPos - 2; pItem2 = hb_stack.pPos - 1; - if( IS_NUMERIC( pItem1 ) && IS_NUMERIC( pItem2 ) ) + if( HB_IS_NUMERIC( pItem1 ) && HB_IS_NUMERIC( pItem2 ) ) { int iDec2, iDec1; double dNumber2 = hb_vmPopDouble( &iDec2 ); @@ -1222,7 +1222,7 @@ static void hb_vmPlus( void ) hb_vmPushNumber( dNumber1 + dNumber2, ( iDec1 > iDec2 ) ? iDec1 : iDec2 ); } - else if( IS_STRING( pItem1 ) && IS_STRING( pItem2 ) ) + else if( HB_IS_STRING( pItem1 ) && HB_IS_STRING( pItem2 ) ) { if( ( double ) ( ( double ) pItem1->item.asString.length + ( double ) pItem2->item.asString.length ) < ( double ) ULONG_MAX ) { @@ -1242,7 +1242,7 @@ static void hb_vmPlus( void ) else hb_errRT_BASE( EG_STROVERFLOW, 1209, NULL, "+" ); } - else if( IS_DATE( pItem1 ) && IS_DATE( pItem2 ) ) + else if( HB_IS_DATE( pItem1 ) && HB_IS_DATE( pItem2 ) ) { long lDate2 = hb_vmPopDate(); long lDate1 = hb_vmPopDate(); @@ -1250,14 +1250,14 @@ static void hb_vmPlus( void ) /* NOTE: This is not a bug. CA-Cl*pper does exactly that. */ hb_vmPushDate( lDate1 + lDate2 ); } - else if( IS_DATE( pItem1 ) && IS_NUMERIC( pItem2 ) ) + else if( HB_IS_DATE( pItem1 ) && HB_IS_NUMERIC( pItem2 ) ) { long lNumber2 = ( long ) hb_vmPopNumber(); long lDate1 = hb_vmPopDate(); hb_vmPushDate( lDate1 + lNumber2 ); } - else if( IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, "+" ) ) + else if( HB_IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, "+" ) ) hb_vmOperatorCall( pItem1, pItem2, "+" ); else @@ -1284,7 +1284,7 @@ static void hb_vmMinus( void ) pItem1 = hb_stack.pPos - 2; pItem2 = hb_stack.pPos - 1; - if( IS_NUMERIC( pItem1 ) && IS_NUMERIC( pItem2 ) ) + if( HB_IS_NUMERIC( pItem1 ) && HB_IS_NUMERIC( pItem2 ) ) { int iDec2, iDec1; double dNumber2 = hb_vmPopDouble( &iDec2 ); @@ -1292,21 +1292,21 @@ static void hb_vmMinus( void ) hb_vmPushNumber( dNumber1 - dNumber2, ( iDec1 > iDec2 ) ? iDec1 : iDec2 ); } - else if( IS_DATE( pItem1 ) && IS_DATE( pItem2 ) ) + else if( HB_IS_DATE( pItem1 ) && HB_IS_DATE( pItem2 ) ) { long lDate2 = hb_vmPopDate(); long lDate1 = hb_vmPopDate(); hb_vmPushLong( lDate1 - lDate2 ); } - else if( IS_DATE( pItem1 ) && IS_NUMERIC( pItem2 ) ) + else if( HB_IS_DATE( pItem1 ) && HB_IS_NUMERIC( pItem2 ) ) { long lNumber2 = ( long ) hb_vmPopNumber(); long lDate1 = hb_vmPopDate(); hb_vmPushDate( lDate1 - lNumber2 ); } - else if( IS_STRING( pItem1 ) && IS_STRING( pItem2 ) ) + else if( HB_IS_STRING( pItem1 ) && HB_IS_STRING( pItem2 ) ) { if( ( double ) ( ( double ) pItem1->item.asString.length + ( double ) pItem2->item.asString.length ) < ( double ) ULONG_MAX ) { @@ -1333,7 +1333,7 @@ static void hb_vmMinus( void ) else hb_errRT_BASE( EG_STROVERFLOW, 1210, NULL, "-" ); } - else if( IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, "-" ) ) + else if( HB_IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, "-" ) ) hb_vmOperatorCall( pItem1, pItem2, "-" ); else @@ -1354,7 +1354,7 @@ static void hb_vmMult( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmMult()")); - if( IS_NUMERIC( hb_stack.pPos - 1 ) && IS_NUMERIC( hb_stack.pPos - 2 ) ) + if( HB_IS_NUMERIC( hb_stack.pPos - 1 ) && HB_IS_NUMERIC( hb_stack.pPos - 2 ) ) { int iDec2, iDec1; double d2 = hb_vmPopDouble( &iDec2 ); @@ -1363,7 +1363,7 @@ static void hb_vmMult( void ) hb_vmPushNumber( d1 * d2, iDec1 + iDec2 ); } - else if( IS_OBJECT( hb_stack.pPos - 2 ) && hb_objHasMsg( hb_stack.pPos - 2, "*" ) ) + else if( HB_IS_OBJECT( hb_stack.pPos - 2 ) && hb_objHasMsg( hb_stack.pPos - 2, "*" ) ) hb_vmOperatorCall( hb_stack.pPos - 2, hb_stack.pPos - 1, "*" ); else @@ -1384,9 +1384,9 @@ static void hb_vmDivide( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmDivide()")); - if( IS_NUMERIC( hb_stack.pPos - 1 ) && IS_NUMERIC( hb_stack.pPos - 2 ) ) + if( HB_IS_NUMERIC( hb_stack.pPos - 1 ) && HB_IS_NUMERIC( hb_stack.pPos - 2 ) ) { - BOOL bIntegerOperands = !IS_DOUBLE( hb_stack.pPos - 1 ) && !IS_DOUBLE( hb_stack.pPos - 2 ); + BOOL bIntegerOperands = !HB_IS_DOUBLE( hb_stack.pPos - 1 ) && !HB_IS_DOUBLE( hb_stack.pPos - 2 ); double d2 = hb_vmPopNumber(); double d1 = hb_vmPopNumber(); @@ -1411,7 +1411,7 @@ static void hb_vmDivide( void ) } } - else if( IS_OBJECT( hb_stack.pPos - 2 ) && hb_objHasMsg( hb_stack.pPos - 2, "/" ) ) + else if( HB_IS_OBJECT( hb_stack.pPos - 2 ) && hb_objHasMsg( hb_stack.pPos - 2, "/" ) ) hb_vmOperatorCall( hb_stack.pPos - 2, hb_stack.pPos - 1, "/" ); else @@ -1432,7 +1432,7 @@ static void hb_vmModulus( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmModulus()")); - if( IS_NUMERIC( hb_stack.pPos - 1 ) && IS_NUMERIC( hb_stack.pPos - 2 ) ) + if( HB_IS_NUMERIC( hb_stack.pPos - 1 ) && HB_IS_NUMERIC( hb_stack.pPos - 2 ) ) { double d2 = hb_vmPopNumber(); double d1 = hb_vmPopNumber(); @@ -1453,7 +1453,7 @@ static void hb_vmModulus( void ) hb_vmPushNumber( fmod( d1, d2 ), hb_set.HB_SET_DECIMALS ); } - else if( IS_OBJECT( hb_stack.pPos - 2 ) && hb_objHasMsg( hb_stack.pPos - 2, "%" ) ) + else if( HB_IS_OBJECT( hb_stack.pPos - 2 ) && hb_objHasMsg( hb_stack.pPos - 2, "%" ) ) hb_vmOperatorCall( hb_stack.pPos - 2, hb_stack.pPos - 1, "%" ); else @@ -1474,7 +1474,7 @@ static void hb_vmPower( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmPower()")); - if( IS_NUMERIC( hb_stack.pPos - 1 ) && IS_NUMERIC( hb_stack.pPos - 2 ) ) + if( HB_IS_NUMERIC( hb_stack.pPos - 1 ) && HB_IS_NUMERIC( hb_stack.pPos - 2 ) ) { double d2 = hb_vmPopNumber(); double d1 = hb_vmPopNumber(); @@ -1484,10 +1484,10 @@ static void hb_vmPower( void ) hb_vmPushNumber( pow( d1, d2 ), hb_set.HB_SET_DECIMALS ); } - else if( IS_OBJECT( hb_stack.pPos - 2 ) && hb_objHasMsg( hb_stack.pPos - 2, "^" ) ) + else if( HB_IS_OBJECT( hb_stack.pPos - 2 ) && hb_objHasMsg( hb_stack.pPos - 2, "^" ) ) hb_vmOperatorCall( hb_stack.pPos - 2, hb_stack.pPos - 1, "^" ); - else if( IS_OBJECT( hb_stack.pPos - 2 ) && hb_objHasMsg( hb_stack.pPos - 2, "**" ) ) + else if( HB_IS_OBJECT( hb_stack.pPos - 2 ) && hb_objHasMsg( hb_stack.pPos - 2, "**" ) ) hb_vmOperatorCall( hb_stack.pPos - 2, hb_stack.pPos - 1, "**" ); else @@ -1508,16 +1508,16 @@ static void hb_vmInc( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmInc()")); - if( IS_NUMERIC( hb_stack.pPos - 1 ) ) + if( HB_IS_NUMERIC( hb_stack.pPos - 1 ) ) { int iDec; double dNumber = hb_vmPopDouble( &iDec ); hb_vmPushNumber( ++dNumber, iDec ); } - else if( IS_DATE( hb_stack.pPos - 1 ) ) + else if( HB_IS_DATE( hb_stack.pPos - 1 ) ) hb_vmPushDate( hb_vmPopDate() + 1 ); - else if( IS_OBJECT( hb_stack.pPos - 1 ) && hb_objHasMsg( hb_stack.pPos - 1, "++" ) ) + else if( HB_IS_OBJECT( hb_stack.pPos - 1 ) && hb_objHasMsg( hb_stack.pPos - 1, "++" ) ) hb_vmOperatorCallUnary( hb_stack.pPos - 1, "++" ); else @@ -1537,16 +1537,16 @@ static void hb_vmDec( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmDec()")); - if( IS_NUMERIC( hb_stack.pPos - 1 ) ) + if( HB_IS_NUMERIC( hb_stack.pPos - 1 ) ) { int iDec; double dNumber = hb_vmPopDouble( &iDec ); hb_vmPushNumber( --dNumber, iDec ); } - else if( IS_DATE( hb_stack.pPos - 1 ) ) + else if( HB_IS_DATE( hb_stack.pPos - 1 ) ) hb_vmPushDate( hb_vmPopDate() - 1 ); - else if( IS_OBJECT( hb_stack.pPos - 1 ) && hb_objHasMsg( hb_stack.pPos - 1, "--" ) ) + else if( HB_IS_OBJECT( hb_stack.pPos - 1 ) && hb_objHasMsg( hb_stack.pPos - 1, "--" ) ) hb_vmOperatorCallUnary( hb_stack.pPos - 1, "--" ); else @@ -1570,7 +1570,7 @@ static void hb_vmFuncPtr( void ) /* pushes a function address pointer. Removes pItem = hb_stack.pPos - 1; - if( IS_SYMBOL( pItem ) ) + if( HB_IS_SYMBOL( pItem ) ) { hb_stackPop(); hb_vmPushLong( ( ULONG ) pItem->item.asSymbol.value->pFunPtr ); @@ -1593,21 +1593,21 @@ static void hb_vmEqual( BOOL bExact ) pItem2 = hb_stack.pPos - 1; pItem1 = hb_stack.pPos - 2; - if( IS_NIL( pItem1 ) && IS_NIL( pItem2 ) ) + if( HB_IS_NIL( pItem1 ) && HB_IS_NIL( pItem2 ) ) { hb_stackPop(); hb_stackPop(); hb_vmPushLogical( TRUE ); } - else if( IS_NIL( pItem1 ) || IS_NIL( pItem2 ) ) + else if( HB_IS_NIL( pItem1 ) || HB_IS_NIL( pItem2 ) ) { hb_stackPop(); hb_stackPop(); hb_vmPushLogical( FALSE ); } - else if( IS_STRING( pItem1 ) && IS_STRING( pItem2 ) ) + else if( HB_IS_STRING( pItem1 ) && HB_IS_STRING( pItem2 ) ) { int i = hb_itemStrCmp( pItem1, pItem2, bExact ); hb_stackPop(); @@ -1615,22 +1615,22 @@ static void hb_vmEqual( BOOL bExact ) hb_vmPushLogical( i == 0 ); } - else if( IS_NUMERIC( pItem1 ) && IS_NUMERIC( pItem2 ) ) + else if( HB_IS_NUMERIC( pItem1 ) && HB_IS_NUMERIC( pItem2 ) ) hb_vmPushLogical( hb_vmPopNumber() == hb_vmPopNumber() ); - else if( IS_DATE( pItem1 ) && IS_DATE( pItem2 ) ) + else if( HB_IS_DATE( pItem1 ) && HB_IS_DATE( pItem2 ) ) hb_vmPushLogical( hb_vmPopDate() == hb_vmPopDate() ); - else if( IS_LOGICAL( pItem1 ) && IS_LOGICAL( pItem2 ) ) + else if( HB_IS_LOGICAL( pItem1 ) && HB_IS_LOGICAL( pItem2 ) ) hb_vmPushLogical( hb_vmPopLogical() == hb_vmPopLogical() ); - else if( IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, "==" ) ) + else if( HB_IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, "==" ) ) hb_vmOperatorCall( pItem1, pItem2, "==" ); - else if( IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, "=" ) ) + else if( HB_IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, "=" ) ) hb_vmOperatorCall( pItem1, pItem2, "=" ); - else if( bExact && IS_ARRAY( pItem1 ) && IS_ARRAY( pItem2 ) ) + else if( bExact && HB_IS_ARRAY( pItem1 ) && HB_IS_ARRAY( pItem2 ) ) { BOOL bResult = pItem1->item.asArray.value->pItems && pItem2->item.asArray.value->pItems && pItem1->item.asArray.value->pItems == pItem2->item.asArray.value->pItems; @@ -1639,8 +1639,8 @@ static void hb_vmEqual( BOOL bExact ) hb_vmPushLogical( bResult ); } else if( pItem1->type != pItem2->type || - ( IS_BLOCK( pItem1 ) && IS_BLOCK( pItem2 ) ) || - ( ! bExact && IS_ARRAY( pItem1 ) && IS_ARRAY( pItem2 ) ) ) + ( HB_IS_BLOCK( pItem1 ) && HB_IS_BLOCK( pItem2 ) ) || + ( ! bExact && HB_IS_ARRAY( pItem1 ) && HB_IS_ARRAY( pItem2 ) ) ) { PHB_ITEM pResult; @@ -1675,21 +1675,21 @@ static void hb_vmNotEqual( void ) pItem2 = hb_stack.pPos - 1; pItem1 = hb_stack.pPos - 2; - if( IS_NIL( pItem1 ) && IS_NIL( pItem2 ) ) + if( HB_IS_NIL( pItem1 ) && HB_IS_NIL( pItem2 ) ) { hb_stackDec(); hb_stackDec(); hb_vmPushLogical( FALSE ); } - else if( IS_NIL( pItem1 ) || IS_NIL( pItem2 ) ) + else if( HB_IS_NIL( pItem1 ) || HB_IS_NIL( pItem2 ) ) { hb_stackPop(); hb_stackPop(); hb_vmPushLogical( TRUE ); } - else if( IS_STRING( pItem1 ) && IS_STRING( pItem2 ) ) + else if( HB_IS_STRING( pItem1 ) && HB_IS_STRING( pItem2 ) ) { int i = hb_itemStrCmp( pItem1, pItem2, FALSE ); hb_stackPop(); @@ -1697,27 +1697,27 @@ static void hb_vmNotEqual( void ) hb_vmPushLogical( i != 0 ); } - else if( IS_NUMERIC( pItem1 ) && IS_NUMERIC( pItem2 ) ) + else if( HB_IS_NUMERIC( pItem1 ) && HB_IS_NUMERIC( pItem2 ) ) hb_vmPushLogical( hb_vmPopNumber() != hb_vmPopNumber() ); - else if( IS_DATE( pItem1 ) && IS_DATE( pItem2 ) ) + else if( HB_IS_DATE( pItem1 ) && HB_IS_DATE( pItem2 ) ) hb_vmPushLogical( hb_vmPopDate() != hb_vmPopDate() ); - else if( IS_LOGICAL( pItem1 ) && IS_LOGICAL( pItem2 ) ) + else if( HB_IS_LOGICAL( pItem1 ) && HB_IS_LOGICAL( pItem2 ) ) hb_vmPushLogical( hb_vmPopLogical() != hb_vmPopLogical() ); - else if( IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, "!=" ) ) + else if( HB_IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, "!=" ) ) hb_vmOperatorCall( pItem1, pItem2, "!=" ); - else if( IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, "<>" ) ) + else if( HB_IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, "<>" ) ) hb_vmOperatorCall( pItem1, pItem2, "<>" ); - else if( IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, "#" ) ) + else if( HB_IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, "#" ) ) hb_vmOperatorCall( pItem1, pItem2, "#" ); else if( pItem1->type != pItem2->type || - ( IS_BLOCK( pItem1 ) && IS_BLOCK( pItem2 ) ) || - ( IS_ARRAY( pItem1 ) && IS_ARRAY( pItem2 ) ) ) + ( HB_IS_BLOCK( pItem1 ) && HB_IS_BLOCK( pItem2 ) ) || + ( HB_IS_ARRAY( pItem1 ) && HB_IS_ARRAY( pItem2 ) ) ) { PHB_ITEM pResult = hb_errRT_BASE_Subst( EG_ARG, 1072, NULL, "<>" ); @@ -1741,7 +1741,7 @@ static void hb_vmLess( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmLess()")); - if( IS_STRING( hb_stack.pPos - 2 ) && IS_STRING( hb_stack.pPos - 1 ) ) + if( HB_IS_STRING( hb_stack.pPos - 2 ) && HB_IS_STRING( hb_stack.pPos - 1 ) ) { int i = hb_itemStrCmp( hb_stack.pPos - 2, hb_stack.pPos - 1, FALSE ); hb_stackPop(); @@ -1749,28 +1749,28 @@ static void hb_vmLess( void ) hb_vmPushLogical( i < 0 ); } - else if( IS_NUMERIC( hb_stack.pPos - 1 ) && IS_NUMERIC( hb_stack.pPos - 2 ) ) + else if( HB_IS_NUMERIC( hb_stack.pPos - 1 ) && HB_IS_NUMERIC( hb_stack.pPos - 2 ) ) { double dNumber2 = hb_vmPopNumber(); double dNumber1 = hb_vmPopNumber(); hb_vmPushLogical( dNumber1 < dNumber2 ); } - else if( IS_DATE( hb_stack.pPos - 1 ) && IS_DATE( hb_stack.pPos - 2 ) ) + else if( HB_IS_DATE( hb_stack.pPos - 1 ) && HB_IS_DATE( hb_stack.pPos - 2 ) ) { long lDate2 = hb_vmPopDate(); long lDate1 = hb_vmPopDate(); hb_vmPushLogical( lDate1 < lDate2 ); } - else if( IS_LOGICAL( hb_stack.pPos - 1 ) && IS_LOGICAL( hb_stack.pPos - 2 ) ) + else if( HB_IS_LOGICAL( hb_stack.pPos - 1 ) && HB_IS_LOGICAL( hb_stack.pPos - 2 ) ) { BOOL bLogical2 = hb_vmPopLogical(); BOOL bLogical1 = hb_vmPopLogical(); hb_vmPushLogical( bLogical1 < bLogical2 ); } - else if( IS_OBJECT( hb_stack.pPos - 2 ) && hb_objHasMsg( hb_stack.pPos - 2, "<" ) ) + else if( HB_IS_OBJECT( hb_stack.pPos - 2 ) && hb_objHasMsg( hb_stack.pPos - 2, "<" ) ) hb_vmOperatorCall( hb_stack.pPos - 2, hb_stack.pPos - 1, "<" ); else @@ -1791,7 +1791,7 @@ static void hb_vmLessEqual( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmLessEqual()")); - if( IS_STRING( hb_stack.pPos - 2 ) && IS_STRING( hb_stack.pPos - 1 ) ) + if( HB_IS_STRING( hb_stack.pPos - 2 ) && HB_IS_STRING( hb_stack.pPos - 1 ) ) { int i = hb_itemStrCmp( hb_stack.pPos - 2, hb_stack.pPos - 1, FALSE ); hb_stackPop(); @@ -1799,28 +1799,28 @@ static void hb_vmLessEqual( void ) hb_vmPushLogical( i <= 0 ); } - else if( IS_NUMERIC( hb_stack.pPos - 1 ) && IS_NUMERIC( hb_stack.pPos - 2 ) ) + else if( HB_IS_NUMERIC( hb_stack.pPos - 1 ) && HB_IS_NUMERIC( hb_stack.pPos - 2 ) ) { double dNumber2 = hb_vmPopNumber(); double dNumber1 = hb_vmPopNumber(); hb_vmPushLogical( dNumber1 <= dNumber2 ); } - else if( IS_DATE( hb_stack.pPos - 1 ) && IS_DATE( hb_stack.pPos - 2 ) ) + else if( HB_IS_DATE( hb_stack.pPos - 1 ) && HB_IS_DATE( hb_stack.pPos - 2 ) ) { long lDate2 = hb_vmPopDate(); long lDate1 = hb_vmPopDate(); hb_vmPushLogical( lDate1 <= lDate2 ); } - else if( IS_LOGICAL( hb_stack.pPos - 1 ) && IS_LOGICAL( hb_stack.pPos - 2 ) ) + else if( HB_IS_LOGICAL( hb_stack.pPos - 1 ) && HB_IS_LOGICAL( hb_stack.pPos - 2 ) ) { BOOL bLogical2 = hb_vmPopLogical(); BOOL bLogical1 = hb_vmPopLogical(); hb_vmPushLogical( bLogical1 <= bLogical2 ); } - else if( IS_OBJECT( hb_stack.pPos - 2 ) && hb_objHasMsg( hb_stack.pPos - 2, "<=" ) ) + else if( HB_IS_OBJECT( hb_stack.pPos - 2 ) && hb_objHasMsg( hb_stack.pPos - 2, "<=" ) ) hb_vmOperatorCall( hb_stack.pPos - 2, hb_stack.pPos - 1, "<=" ); else @@ -1841,7 +1841,7 @@ static void hb_vmGreater( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmGreater()")); - if( IS_STRING( hb_stack.pPos - 2 ) && IS_STRING( hb_stack.pPos - 1 ) ) + if( HB_IS_STRING( hb_stack.pPos - 2 ) && HB_IS_STRING( hb_stack.pPos - 1 ) ) { int i = hb_itemStrCmp( hb_stack.pPos - 2, hb_stack.pPos - 1, FALSE ); hb_stackPop(); @@ -1849,28 +1849,28 @@ static void hb_vmGreater( void ) hb_vmPushLogical( i > 0 ); } - else if( IS_NUMERIC( hb_stack.pPos - 1 ) && IS_NUMERIC( hb_stack.pPos - 2 ) ) + else if( HB_IS_NUMERIC( hb_stack.pPos - 1 ) && HB_IS_NUMERIC( hb_stack.pPos - 2 ) ) { double dNumber2 = hb_vmPopNumber(); double dNumber1 = hb_vmPopNumber(); hb_vmPushLogical( dNumber1 > dNumber2 ); } - else if( IS_DATE( hb_stack.pPos - 1 ) && IS_DATE( hb_stack.pPos - 2 ) ) + else if( HB_IS_DATE( hb_stack.pPos - 1 ) && HB_IS_DATE( hb_stack.pPos - 2 ) ) { long lDate2 = hb_vmPopDate(); long lDate1 = hb_vmPopDate(); hb_vmPushLogical( lDate1 > lDate2 ); } - else if( IS_LOGICAL( hb_stack.pPos - 1 ) && IS_LOGICAL( hb_stack.pPos - 2 ) ) + else if( HB_IS_LOGICAL( hb_stack.pPos - 1 ) && HB_IS_LOGICAL( hb_stack.pPos - 2 ) ) { BOOL bLogical2 = hb_vmPopLogical(); BOOL bLogical1 = hb_vmPopLogical(); hb_vmPushLogical( bLogical1 > bLogical2 ); } - else if( IS_OBJECT( hb_stack.pPos - 2 ) && hb_objHasMsg( hb_stack.pPos - 2, ">" ) ) + else if( HB_IS_OBJECT( hb_stack.pPos - 2 ) && hb_objHasMsg( hb_stack.pPos - 2, ">" ) ) hb_vmOperatorCall( hb_stack.pPos - 2, hb_stack.pPos - 1, ">" ); else @@ -1891,7 +1891,7 @@ static void hb_vmGreaterEqual( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmGreaterEqual()")); - if( IS_STRING( hb_stack.pPos - 2 ) && IS_STRING( hb_stack.pPos - 1 ) ) + if( HB_IS_STRING( hb_stack.pPos - 2 ) && HB_IS_STRING( hb_stack.pPos - 1 ) ) { int i = hb_itemStrCmp( hb_stack.pPos - 2, hb_stack.pPos - 1, FALSE ); hb_stackPop(); @@ -1899,28 +1899,28 @@ static void hb_vmGreaterEqual( void ) hb_vmPushLogical( i >= 0 ); } - else if( IS_NUMERIC( hb_stack.pPos - 1 ) && IS_NUMERIC( hb_stack.pPos - 2 ) ) + else if( HB_IS_NUMERIC( hb_stack.pPos - 1 ) && HB_IS_NUMERIC( hb_stack.pPos - 2 ) ) { double dNumber2 = hb_vmPopNumber(); double dNumber1 = hb_vmPopNumber(); hb_vmPushLogical( dNumber1 >= dNumber2 ); } - else if( IS_DATE( hb_stack.pPos - 1 ) && IS_DATE( hb_stack.pPos - 2 ) ) + else if( HB_IS_DATE( hb_stack.pPos - 1 ) && HB_IS_DATE( hb_stack.pPos - 2 ) ) { long lDate2 = hb_vmPopDate(); long lDate1 = hb_vmPopDate(); hb_vmPushLogical( lDate1 >= lDate2 ); } - else if( IS_LOGICAL( hb_stack.pPos - 1 ) && IS_LOGICAL( hb_stack.pPos - 2 ) ) + else if( HB_IS_LOGICAL( hb_stack.pPos - 1 ) && HB_IS_LOGICAL( hb_stack.pPos - 2 ) ) { BOOL bLogical2 = hb_vmPopLogical(); BOOL bLogical1 = hb_vmPopLogical(); hb_vmPushLogical( bLogical1 >= bLogical2 ); } - else if( IS_OBJECT( hb_stack.pPos - 2 ) && hb_objHasMsg( hb_stack.pPos - 2, ">=" ) ) + else if( HB_IS_OBJECT( hb_stack.pPos - 2 ) && hb_objHasMsg( hb_stack.pPos - 2, ">=" ) ) hb_vmOperatorCall( hb_stack.pPos - 2, hb_stack.pPos - 1, ">=" ); else @@ -1947,7 +1947,7 @@ static void hb_vmInstring( void ) pItem1 = hb_stack.pPos - 2; pItem2 = hb_stack.pPos - 1; - if( IS_STRING( pItem1 ) && IS_STRING( pItem2 ) ) + if( HB_IS_STRING( pItem1 ) && HB_IS_STRING( pItem2 ) ) { BOOL bResult = ( hb_strAt( pItem1->item.asString.value, pItem1->item.asString.length, pItem2->item.asString.value, pItem2->item.asString.length ) != 0 ); @@ -1955,7 +1955,7 @@ static void hb_vmInstring( void ) hb_stackPop(); hb_vmPushLogical( bResult ); } - else if( IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, "$" ) ) + else if( HB_IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, "$" ) ) hb_vmOperatorCall( pItem1, pItem2, "$" ); else { @@ -1984,7 +1984,7 @@ static void hb_vmForTest( void ) /* Test to check the end point of the FO HB_TRACE(HB_TR_DEBUG, ("hb_vmForTest()")); - while( ! IS_NUMERIC( hb_stack.pPos - 1 ) ) + while( ! HB_IS_NUMERIC( hb_stack.pPos - 1 ) ) { PHB_ITEM pResult = hb_errRT_BASE_Subst( EG_ARG, 1073, NULL, "<" ); @@ -2001,7 +2001,7 @@ static void hb_vmForTest( void ) /* Test to check the end point of the FO dStep = hb_vmPopNumber(); - while( ! IS_NUMERIC( hb_stack.pPos - 1 ) ) + while( ! HB_IS_NUMERIC( hb_stack.pPos - 1 ) ) { PHB_ITEM pResult = hb_errRT_BASE_Subst( EG_ARG, 1073, NULL, "<" ); @@ -2018,7 +2018,7 @@ static void hb_vmForTest( void ) /* Test to check the end point of the FO dEnd = hb_vmPopNumber(); - while( ! IS_NUMERIC( hb_stack.pPos - 1 ) ) + while( ! HB_IS_NUMERIC( hb_stack.pPos - 1 ) ) { PHB_ITEM pResult = hb_errRT_BASE_Subst( EG_ARG, 1073, NULL, "<" ); @@ -2053,13 +2053,13 @@ static void hb_vmNot( void ) pItem = hb_stack.pPos - 1; - if( IS_LOGICAL( pItem ) ) + if( HB_IS_LOGICAL( pItem ) ) pItem->item.asLogical.value = ! pItem->item.asLogical.value; - else if( IS_OBJECT( pItem ) && hb_objHasMsg( pItem, "!" ) ) + else if( HB_IS_OBJECT( pItem ) && hb_objHasMsg( pItem, "!" ) ) hb_vmOperatorCallUnary( pItem, "!" ); - else if( IS_OBJECT( pItem ) && hb_objHasMsg( pItem, ".NOT." ) ) + else if( HB_IS_OBJECT( pItem ) && hb_objHasMsg( pItem, ".NOT." ) ) hb_vmOperatorCallUnary( pItem, ".NOT." ); else @@ -2085,7 +2085,7 @@ static void hb_vmAnd( void ) pItem2 = hb_stack.pPos - 1; pItem1 = hb_stack.pPos - 2; - if( IS_LOGICAL( pItem1 ) && IS_LOGICAL( pItem2 ) ) + if( HB_IS_LOGICAL( pItem1 ) && HB_IS_LOGICAL( pItem2 ) ) { BOOL bResult = pItem1->item.asLogical.value && pItem2->item.asLogical.value; hb_stackPop(); @@ -2093,7 +2093,7 @@ static void hb_vmAnd( void ) hb_vmPushLogical( bResult ); } - else if( IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, ".AND." ) ) + else if( HB_IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, ".AND." ) ) hb_vmOperatorCall( pItem1, pItem2, ".AND." ); else @@ -2120,7 +2120,7 @@ static void hb_vmOr( void ) pItem2 = hb_stack.pPos - 1; pItem1 = hb_stack.pPos - 2; - if( IS_LOGICAL( pItem1 ) && IS_LOGICAL( pItem2 ) ) + if( HB_IS_LOGICAL( pItem1 ) && HB_IS_LOGICAL( pItem2 ) ) { BOOL bResult = pItem1->item.asLogical.value || pItem2->item.asLogical.value; hb_stackPop(); @@ -2128,7 +2128,7 @@ static void hb_vmOr( void ) hb_vmPushLogical( bResult ); } - else if( IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, ".OR." ) ) + else if( HB_IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, ".OR." ) ) hb_vmOperatorCall( pItem1, pItem2, ".OR." ); else @@ -2160,13 +2160,13 @@ static void hb_vmArrayPush( void ) pIndex = hb_stack.pPos - 1; pArray = hb_stack.pPos - 2; - if( IS_INTEGER( pIndex ) ) + if( HB_IS_INTEGER( pIndex ) ) ulIndex = ( ULONG ) pIndex->item.asInteger.value; - else if( IS_LONG( pIndex ) ) + else if( HB_IS_LONG( pIndex ) ) ulIndex = ( ULONG ) pIndex->item.asLong.value; - else if( IS_DOUBLE( pIndex ) ) + else if( HB_IS_DOUBLE( pIndex ) ) ulIndex = ( ULONG ) pIndex->item.asDouble.value; else @@ -2211,13 +2211,13 @@ static void hb_vmArrayPop( void ) pArray = hb_stack.pPos - 2; pIndex = hb_stack.pPos - 1; - if( IS_INTEGER( pIndex ) ) + if( HB_IS_INTEGER( pIndex ) ) ulIndex = ( ULONG ) pIndex->item.asInteger.value; - else if( IS_LONG( pIndex ) ) + else if( HB_IS_LONG( pIndex ) ) ulIndex = ( ULONG ) pIndex->item.asLong.value; - else if( IS_DOUBLE( pIndex ) ) + else if( HB_IS_DOUBLE( pIndex ) ) ulIndex = ( ULONG ) pIndex->item.asDouble.value; else @@ -2242,7 +2242,7 @@ static void hb_vmArrayDim( USHORT uiDimensions ) /* generates an uiDimensions Ar HB_TRACE(HB_TR_DEBUG, ("hb_vmArrayDim(%hu)", uiDimensions)); - itArray.type = IT_NIL; + itArray.type = HB_IT_NIL; hb_vmArrayNew( &itArray, uiDimensions ); @@ -2261,7 +2261,7 @@ static void hb_vmArrayGen( ULONG ulElements ) /* generates an ulElements Array a HB_TRACE(HB_TR_DEBUG, ("hb_vmArrayGen(%lu)", ulElements)); - itArray.type = IT_NIL; + itArray.type = HB_IT_NIL; hb_arrayNew( &itArray, ulElements ); for( ulPos = 0; ulPos < ulElements; ulPos++ ) hb_itemCopy( itArray.item.asArray.value->pItems + ulPos, hb_stack.pPos - ulElements + ulPos ); @@ -2287,17 +2287,17 @@ static void hb_vmArrayNew( HB_ITEM_PTR pArray, USHORT uiDimension ) pDim = hb_stack.pPos - uiDimension; /* use the proper type of number of elements */ - switch( pDim->type & ~IT_BYREF ) + switch( pDim->type & ~HB_IT_BYREF ) { - case IT_INTEGER: + case HB_IT_INTEGER: ulElements = ( ULONG ) pDim->item.asInteger.value; break; - case IT_LONG: + case HB_IT_LONG: ulElements = pDim->item.asLong.value; break; - case IT_DOUBLE: + case HB_IT_DOUBLE: ulElements = ( ULONG ) pDim->item.asDouble.value; break; @@ -2332,7 +2332,7 @@ void hb_vmMessage( PHB_SYMB pSymMsg ) /* sends a message to an object */ hb_itemCopy( hb_stack.pPos, hb_stack.pPos - 1 ); /* moves the object forward */ hb_itemClear( hb_stack.pPos - 1 ); - ( hb_stack.pPos - 1 )->type = IT_SYMBOL; + ( hb_stack.pPos - 1 )->type = HB_IT_SYMBOL; ( hb_stack.pPos - 1 )->item.asSymbol.value = pSymMsg; ( hb_stack.pPos - 1 )->item.asSymbol.stackbase = ( hb_stack.pPos - 1 ) - hb_stack.pItems; hb_stackPush(); @@ -2341,13 +2341,13 @@ void hb_vmMessage( PHB_SYMB pSymMsg ) /* sends a message to an object */ static void hb_vmOperatorCall( PHB_ITEM pObjItem, PHB_ITEM pMsgItem, char * szSymbol ) { /* NOTE: There is no need to test if specified symbol exists. It is checked - * by the caller (if IS_OBJECT() && HAS_METHOD() ) + * by the caller (if HB_IS_OBJECT() && HAS_METHOD() ) */ HB_ITEM ItemMsg; HB_TRACE(HB_TR_DEBUG, ("hb_vmOperatorCall(%p, %p, %s)", pObjItem, pMsgItem, szSymbol)); - ItemMsg.type = IT_SYMBOL; + ItemMsg.type = HB_IT_SYMBOL; ItemMsg.item.asSymbol.value = hb_dynsymFind( szSymbol )->pSymbol; ItemMsg.item.asSymbol.stackbase = hb_stack.pPos - hb_stack.pItems; @@ -2371,13 +2371,13 @@ static void hb_vmOperatorCall( PHB_ITEM pObjItem, PHB_ITEM pMsgItem, char * szSy static void hb_vmOperatorCallUnary( PHB_ITEM pObjItem, char * szSymbol ) { /* NOTE: There is no need to test if specified symbol exists. It is checked - * by the caller (if IS_OBJECT() && HAS_METHOD() ) + * by the caller (if HB_IS_OBJECT() && HAS_METHOD() ) */ HB_ITEM ItemMsg; HB_TRACE(HB_TR_DEBUG, ("hb_vmOperatorCallUnary(%p, %s)", pObjItem, szSymbol)); - ItemMsg.type = IT_SYMBOL; + ItemMsg.type = HB_IT_SYMBOL; ItemMsg.item.asSymbol.value = hb_dynsymFind( szSymbol )->pSymbol; ItemMsg.item.asSymbol.stackbase = hb_stack.pPos - hb_stack.pItems; @@ -2407,39 +2407,39 @@ static ERRCODE hb_vmSelectWorkarea( PHB_ITEM pAlias ) /* NOTE: Clipper doesn't generate an error if an workarea specified * as numeric value cannot be selected */ - switch( pAlias->type & ~IT_BYREF ) + switch( pAlias->type & ~HB_IT_BYREF ) { - case IT_INTEGER: + case HB_IT_INTEGER: /* Alias was used as integer value, for example: 4->field * or it was saved on the stack using hb_vmPushAlias() * or was evaluated from an expression, (nWorkArea)->field */ hb_rddSelectWorkAreaNumber( pAlias->item.asInteger.value ); - pAlias->type = IT_NIL; + pAlias->type = HB_IT_NIL; break; - case IT_LONG: + case HB_IT_LONG: /* Alias was evaluated from an expression, (nWorkArea)->field */ hb_rddSelectWorkAreaNumber( pAlias->item.asLong.value ); - pAlias->type = IT_NIL; + pAlias->type = HB_IT_NIL; break; - case IT_DOUBLE: + case HB_IT_DOUBLE: /* Alias was evaluated from an expression, (nWorkArea)->field */ hb_rddSelectWorkAreaNumber( ( int ) pAlias->item.asDouble.value ); - pAlias->type = IT_NIL; + pAlias->type = HB_IT_NIL; break; - case IT_SYMBOL: + case HB_IT_SYMBOL: /* Alias was specified using alias identifier, for example: al->field */ bSuccess = hb_rddSelectWorkAreaSymbol( pAlias->item.asSymbol.value ); - pAlias->type = IT_NIL; + pAlias->type = HB_IT_NIL; break; - case IT_STRING: + case HB_IT_STRING: /* Alias was evaluated from an expression, for example: (cVar)->field */ bSuccess = hb_rddSelectWorkAreaAlias( pAlias->item.asString.value ); @@ -2475,7 +2475,7 @@ static void hb_vmSwapAlias( void ) hb_vmSelectWorkarea( pWorkArea ); memcpy( pWorkArea, pItem, sizeof( HB_ITEM ) ); - pItem->type = IT_NIL; + pItem->type = HB_IT_NIL; hb_stackDec(); } @@ -2506,7 +2506,7 @@ void hb_vmDo( USHORT uiParams ) bDebugPrevState = s_bDebugging; s_bDebugging = FALSE; - if( ! IS_SYMBOL( pItem ) ) + if( ! HB_IS_SYMBOL( pItem ) ) { /* QUESTION: Is this call needed ? [vszakats] */ hb_stackDispLocal(); @@ -2514,7 +2514,7 @@ void hb_vmDo( USHORT uiParams ) } #if 0 - if( ! IS_NIL( pSelf ) ) + if( ! HB_IS_NIL( pSelf ) ) { /* QUESTION: Is this call needed ? [vszakats] */ hb_stackDispLocal(); @@ -2527,14 +2527,14 @@ void hb_vmDo( USHORT uiParams ) hb_stack.pBase = hb_stack.pItems + pItem->item.asSymbol.stackbase; pItem->item.asSymbol.stackbase = wStackBase; - if( ! IS_NIL( pSelf ) ) /* are we sending a message ? */ + if( ! HB_IS_NIL( pSelf ) ) /* are we sending a message ? */ { - if( pSym == &( hb_symEval ) && IS_BLOCK( pSelf ) ) + if( pSym == &( hb_symEval ) && HB_IS_BLOCK( pSelf ) ) pFunc = pSym->pFunPtr; /* __EVAL method = function */ else { pFunc = hb_objGetMethod( pSelf, pSym ); - if( IS_OBJECT( pSelf ) ) /* Object passed */ + if( HB_IS_OBJECT( pSelf ) ) /* Object passed */ { pSelfBase = pSelf->item.asArray.value; if( pSelfBase->uiPrevCls ) /* Is is a Super cast ? */ @@ -2602,7 +2602,7 @@ static HARBOUR hb_vmDoBlock( void ) pBlock = hb_stack.pBase + 1; uiStackBase = hb_stack.pBase - hb_stack.pItems; /* as the stack memory block could change */ - if( ! IS_BLOCK( pBlock ) ) + if( ! HB_IS_BLOCK( pBlock ) ) hb_errInternal( 9999, "Codeblock expected from hb_vmDoBlock()", NULL, NULL ); /* Check for valid count of parameters */ @@ -2684,7 +2684,7 @@ static void hb_vmStatics( PHB_SYMB pSym, USHORT uiStatics ) /* initializes the g { HB_TRACE(HB_TR_DEBUG, ("hb_vmStatics(%p, %hu)", pSym, uiStatics)); - if( IS_NIL( &s_aStatics ) ) + if( HB_IS_NIL( &s_aStatics ) ) { pSym->pFunPtr = NULL; /* statics frame for this PRG */ hb_arrayNew( &s_aStatics, uiStatics ); @@ -2764,7 +2764,7 @@ void hb_vmPushNil( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmPushNil()")); - hb_stack.pPos->type = IT_NIL; + hb_stack.pPos->type = HB_IT_NIL; hb_stackPush(); } @@ -2772,7 +2772,7 @@ void hb_vmPushLogical( BOOL bValue ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmPushLogical(%d)", (int) bValue)); - hb_stack.pPos->type = IT_LOGICAL; + hb_stack.pPos->type = HB_IT_LOGICAL; hb_stack.pPos->item.asLogical.value = bValue; hb_stackPush(); } @@ -2798,7 +2798,7 @@ void hb_vmPushInteger( int iNumber ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmPushInteger(%d)", iNumber)); - hb_stack.pPos->type = IT_INTEGER; + hb_stack.pPos->type = HB_IT_INTEGER; hb_stack.pPos->item.asInteger.value = iNumber; hb_stack.pPos->item.asInteger.length = 10; hb_stackPush(); @@ -2808,7 +2808,7 @@ void hb_vmPushLong( long lNumber ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmPushLong(%ld)", lNumber)); - hb_stack.pPos->type = IT_LONG; + hb_stack.pPos->type = HB_IT_LONG; hb_stack.pPos->item.asLong.value = lNumber; hb_stack.pPos->item.asLong.length = 10; hb_stackPush(); @@ -2818,7 +2818,7 @@ void hb_vmPushDouble( double dNumber, int iDec ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmPushDouble(%lf, %d)", dNumber, iDec)); - hb_stack.pPos->type = IT_DOUBLE; + hb_stack.pPos->type = HB_IT_DOUBLE; hb_stack.pPos->item.asDouble.value = dNumber; hb_stack.pPos->item.asDouble.length = ( dNumber > 10000000000.0 ) ? 20 : 10; if( iDec == HB_DEFAULT_DECIMALS ) @@ -2832,7 +2832,7 @@ void hb_vmPushDate( long lDate ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmPushDate(%ld)", lDate)); - hb_stack.pPos->type = IT_DATE; + hb_stack.pPos->type = HB_IT_DATE; hb_stack.pPos->item.asDate.value = lDate; hb_stackPush(); } @@ -2847,7 +2847,7 @@ void hb_vmPushString( char * szText, ULONG length ) hb_xmemcpy( szTemp, szText, length ); szTemp[ length ] = '\0'; - hb_stack.pPos->type = IT_STRING; + hb_stack.pPos->type = HB_IT_STRING; hb_stack.pPos->item.asString.length = length; hb_stack.pPos->item.asString.value = szTemp; hb_stackPush(); @@ -2857,7 +2857,7 @@ void hb_vmPushSymbol( PHB_SYMB pSym ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmPushSymbol(%p)", pSym)); - hb_stack.pPos->type = IT_SYMBOL; + hb_stack.pPos->type = HB_IT_SYMBOL; hb_stack.pPos->item.asSymbol.value = pSym; hb_stack.pPos->item.asSymbol.stackbase = hb_stack.pPos - hb_stack.pItems; hb_stackPush(); @@ -2877,7 +2877,7 @@ static void hb_vmPushBlock( BYTE * pCode, PHB_SYMB pSymbols ) HB_TRACE(HB_TR_DEBUG, ("hb_vmPushBlock(%p, %p)", pCode, pSymbols)); - hb_stack.pPos->type = IT_BLOCK; + hb_stack.pPos->type = HB_IT_BLOCK; uiLocals = pCode[ 5 ] + ( pCode[ 6 ] * 256 ); hb_stack.pPos->item.asBlock.value = @@ -2911,7 +2911,7 @@ static void hb_vmPushMacroBlock( BYTE * pCode, PHB_SYMB pSymbols ) HB_SYMBOL_UNUSED( pSymbols ); /* TODO: remove pSymbols */ - hb_stack.pPos->type = IT_BLOCK; + hb_stack.pPos->type = HB_IT_BLOCK; hb_stack.pPos->item.asBlock.value = hb_codeblockMacroNew( pCode + 5, pCode[ 1 ] + pCode[ 2 ] * 256 - 5 ); @@ -2933,7 +2933,7 @@ static void hb_vmPushAlias( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmPushAlias()")); - hb_stack.pPos->type = IT_INTEGER; + hb_stack.pPos->type = HB_IT_INTEGER; hb_stack.pPos->item.asInteger.value = hb_rddGetCurrentWorkAreaNumber(); hb_stack.pPos->item.asInteger.length = 10; hb_stackPush(); @@ -2973,7 +2973,7 @@ static void hb_vmPushAliasedVar( PHB_SYMB pSym ) HB_TRACE(HB_TR_DEBUG, ("hb_vmPushAliasedVar(%p)", pSym)); - if( IS_STRING( pAlias ) ) + if( HB_IS_STRING( pAlias ) ) { char * szAlias = hb_strUpper( pAlias->item.asString.value, pAlias->item.asString.length ); @@ -3021,7 +3021,7 @@ static void hb_vmPushLocal( SHORT iLocal ) /* local variable or local parameter */ pLocal = hb_stack.pBase + 1 + iLocal; - if( IS_BYREF( pLocal ) ) + if( HB_IS_BYREF( pLocal ) ) hb_itemCopy( hb_stack.pPos, hb_itemUnRef( pLocal ) ); else hb_itemCopy( hb_stack.pPos, pLocal ); @@ -3039,7 +3039,7 @@ static void hb_vmPushLocalByRef( SHORT iLocal ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmPushLocalByRef(%hd)", iLocal)); - hb_stack.pPos->type = IT_BYREF; + hb_stack.pPos->type = HB_IT_BYREF; /* we store its stack offset instead of a pointer to support a dynamic stack */ hb_stack.pPos->item.asRefer.value = iLocal; hb_stack.pPos->item.asRefer.offset = hb_stack.pBase - hb_stack.pItems +1; @@ -3054,7 +3054,7 @@ static void hb_vmPushStatic( USHORT uiStatic ) HB_TRACE(HB_TR_DEBUG, ("hb_vmPushStatic(%hu)", uiStatic)); pStatic = s_aStatics.item.asArray.value->pItems + hb_stack.iStatics + uiStatic - 1; - if( IS_BYREF( pStatic ) ) + if( HB_IS_BYREF( pStatic ) ) hb_itemCopy( hb_stack.pPos, hb_itemUnRef( pStatic ) ); else hb_itemCopy( hb_stack.pPos, pStatic ); @@ -3065,7 +3065,7 @@ static void hb_vmPushStaticByRef( USHORT uiStatic ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmPushStaticByRef(%hu)", uiStatic)); - hb_stack.pPos->type = IT_BYREF; + hb_stack.pPos->type = HB_IT_BYREF; /* we store the offset instead of a pointer to support a dynamic stack */ hb_stack.pPos->item.asRefer.value = uiStatic - 1; hb_stack.pPos->item.asRefer.offset = hb_stack.iStatics; @@ -3133,11 +3133,11 @@ static BOOL hb_vmPopLogical( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmPopLogical()")); - if( IS_LOGICAL( hb_stack.pPos - 1 ) ) + if( HB_IS_LOGICAL( hb_stack.pPos - 1 ) ) { hb_stackDec(); - hb_stack.pPos->type = IT_NIL; + hb_stack.pPos->type = HB_IT_NIL; return hb_stack.pPos->item.asLogical.value; } else @@ -3155,7 +3155,7 @@ static long hb_vmPopDate( void ) hb_stackDec(); - hb_stack.pPos->type = IT_NIL; + hb_stack.pPos->type = HB_IT_NIL; return hb_stack.pPos->item.asDate.value; } @@ -3171,17 +3171,17 @@ static double hb_vmPopNumber( void ) pItem = hb_stack.pPos - 1; hb_stackDec(); - switch( pItem->type & ~IT_BYREF ) + switch( pItem->type & ~HB_IT_BYREF ) { - case IT_INTEGER: + case HB_IT_INTEGER: dNumber = ( double ) pItem->item.asInteger.value; break; - case IT_LONG: + case HB_IT_LONG: dNumber = ( double ) pItem->item.asLong.value; break; - case IT_DOUBLE: + case HB_IT_DOUBLE: dNumber = pItem->item.asDouble.value; break; @@ -3190,7 +3190,7 @@ static double hb_vmPopNumber( void ) break; } - hb_stack.pPos->type = IT_NIL; + hb_stack.pPos->type = HB_IT_NIL; return dNumber; } @@ -3207,19 +3207,19 @@ static double hb_vmPopDouble( int * piDec ) pItem = hb_stack.pPos - 1; hb_stackDec(); - switch( pItem->type & ~IT_BYREF ) + switch( pItem->type & ~HB_IT_BYREF ) { - case IT_INTEGER: + case HB_IT_INTEGER: dNumber = ( double ) pItem->item.asInteger.value; *piDec = 0; break; - case IT_LONG: + case HB_IT_LONG: dNumber = ( double ) pItem->item.asLong.value; *piDec = 0; break; - case IT_DOUBLE: + case HB_IT_DOUBLE: dNumber = pItem->item.asDouble.value; *piDec = pItem->item.asDouble.decimal; break; @@ -3229,7 +3229,7 @@ static double hb_vmPopDouble( int * piDec ) break; } - hb_stack.pPos->type = IT_NIL; + hb_stack.pPos->type = HB_IT_NIL; return dNumber; } @@ -3276,7 +3276,7 @@ static void hb_vmPopAliasedVar( PHB_SYMB pSym ) /* "M", "MEMV" - "MEMVAR" and "FIEL" - "FIELD" are reserved aliases */ - if( IS_STRING( pAlias ) ) + if( HB_IS_STRING( pAlias ) ) { char * szAlias = pAlias->item.asString.value; @@ -3332,7 +3332,7 @@ static void hb_vmPopLocal( SHORT iLocal ) /* local variable or local parameter */ PHB_ITEM pLocal = hb_stack.pBase + 1 + iLocal; - if( IS_BYREF( pLocal ) ) + if( HB_IS_BYREF( pLocal ) ) hb_itemCopy( hb_itemUnRef( pLocal ), hb_stack.pPos ); else hb_itemCopy( pLocal, hb_stack.pPos ); @@ -3355,7 +3355,7 @@ static void hb_vmPopStatic( USHORT uiStatic ) hb_stackDec(); pStatic = s_aStatics.item.asArray.value->pItems + hb_stack.iStatics + uiStatic - 1; - if( IS_BYREF( pStatic ) ) + if( HB_IS_BYREF( pStatic ) ) hb_itemCopy( hb_itemUnRef( pStatic ), hb_stack.pPos ); else hb_itemCopy( pStatic, hb_stack.pPos ); @@ -3374,7 +3374,7 @@ void hb_stackPop( void ) if( --hb_stack.pPos < hb_stack.pItems ) hb_errInternal( 9999, "Stack underflow", NULL, NULL ); - if( hb_stack.pPos->type != IT_NIL ) + if( hb_stack.pPos->type != HB_IT_NIL ) hb_itemClear( hb_stack.pPos ); } @@ -3424,7 +3424,7 @@ static void hb_stackPush( void ) /* now, push it: */ hb_stack.pPos++; - hb_stack.pPos->type = IT_NIL; + hb_stack.pPos->type = HB_IT_NIL; } static void hb_stackInit( void ) @@ -3455,49 +3455,49 @@ static void hb_stackDispLocal( void ) switch( hb_itemType( pBase ) ) { - case IT_NIL: + case HB_IT_NIL: printf( "NIL " ); break; - case IT_ARRAY: + case HB_IT_ARRAY: if( hb_arrayIsObject( pBase ) ) printf( "OBJECT = %s ", hb_objGetClsName( pBase ) ); else printf( "ARRAY " ); break; - case IT_BLOCK: + case HB_IT_BLOCK: printf( "BLOCK " ); break; - case IT_DATE: + case HB_IT_DATE: { char szDate[ 9 ]; printf( "DATE = \"%s\" ", hb_itemGetDS( pBase, szDate ) ); } break; - case IT_DOUBLE: + case HB_IT_DOUBLE: printf( "DOUBLE = %f ", hb_itemGetND( pBase ) ); break; - case IT_LOGICAL: + case HB_IT_LOGICAL: printf( "LOGICAL = %s ", hb_itemGetL( pBase ) ? ".T." : ".F." ); break; - case IT_LONG: + case HB_IT_LONG: printf( "LONG = %lu ", hb_itemGetNL( pBase ) ); break; - case IT_INTEGER: + case HB_IT_INTEGER: printf( "INTEGER = %i ", hb_itemGetNI( pBase ) ); break; - case IT_STRING: + case HB_IT_STRING: printf( "STRING = \"%s\" ", hb_itemGetCPtr( pBase ) ); break; - case IT_SYMBOL: + case HB_IT_SYMBOL: printf( "SYMBOL = %s ", pBase->item.asSymbol.value->szName ); break; @@ -3520,7 +3520,7 @@ void hb_stackDispCall( void ) pBase = hb_stack.pItems + pBase->item.asSymbol.stackbase; - if( ( pBase + 1 )->type == IT_ARRAY ) + if( ( pBase + 1 )->type == HB_IT_ARRAY ) sprintf( buffer, "Called from %s:%s(%i)", hb_objGetClsName( pBase + 1 ), pBase->item.asSymbol.value->szName, pBase->item.asSymbol.lineno ); @@ -3858,7 +3858,7 @@ WINBASEAPI LONG WINAPI UnhandledExceptionFilter( struct _EXCEPTION_POINTERS * Ex pBase = hb_stack.pItems + pBase->item.asSymbol.stackbase; - if( ( pBase + 1 )->type == IT_ARRAY ) + if( ( pBase + 1 )->type == HB_IT_ARRAY ) sprintf( buffer, "Called from %s:%s(%i)\n", hb_objGetClsName( pBase + 1 ), pBase->item.asSymbol.value->szName, pBase->item.asSymbol.lineno ); diff --git a/harbour/source/vm/itemapi.c b/harbour/source/vm/itemapi.c index 60be23dd32..d16461eb32 100644 --- a/harbour/source/vm/itemapi.c +++ b/harbour/source/vm/itemapi.c @@ -120,7 +120,7 @@ PHB_ITEM hb_evalLaunch( PEVALINFO pEvalInfo ) { USHORT uiParam = 1; - if( IS_STRING( pEvalInfo->pItems[ 0 ] ) ) + if( HB_IS_STRING( pEvalInfo->pItems[ 0 ] ) ) { hb_vmPushSymbol( hb_dynsymFindName( hb_itemGetCPtr( pEvalInfo->pItems[ 0 ] ) )->pSymbol ); hb_vmPushNil(); @@ -131,7 +131,7 @@ PHB_ITEM hb_evalLaunch( PEVALINFO pEvalInfo ) pResult = hb_itemNew( NULL ); hb_itemCopy( pResult, &hb_stack.Return ); } - else if( IS_BLOCK( pEvalInfo->pItems[ 0 ] ) ) + else if( HB_IS_BLOCK( pEvalInfo->pItems[ 0 ] ) ) { hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pEvalInfo->pItems[ 0 ] ); @@ -192,7 +192,7 @@ PHB_ITEM hb_itemDo( PHB_ITEM pItem, USHORT uiPCount, PHB_ITEM pItemArg1, ... ) if( pItem ) { - if( IS_STRING( pItem ) ) + if( HB_IS_STRING( pItem ) ) { PHB_DYNS pDynSym = hb_dynsymFindName( hb_itemGetCPtr( pItem ) ); @@ -214,7 +214,7 @@ PHB_ITEM hb_itemDo( PHB_ITEM pItem, USHORT uiPCount, PHB_ITEM pItemArg1, ... ) hb_itemCopy( pResult, &hb_stack.Return ); } } - else if( IS_BLOCK( pItem ) ) + else if( HB_IS_BLOCK( pItem ) ) { USHORT uiParam; va_list va; @@ -231,7 +231,7 @@ PHB_ITEM hb_itemDo( PHB_ITEM pItem, USHORT uiPCount, PHB_ITEM pItemArg1, ... ) pResult = hb_itemNew( NULL ); hb_itemCopy( pResult, &hb_stack.Return ); } - else if( IS_SYMBOL( pItem ) ) + else if( HB_IS_SYMBOL( pItem ) ) { USHORT uiParam; va_list va; @@ -314,7 +314,7 @@ PHB_ITEM hb_itemNew( PHB_ITEM pNull ) else { memset( pItem, 0, sizeof( HB_ITEM ) ); - pItem->type = IT_NIL; + pItem->type = HB_IT_NIL; } return pItem; @@ -328,7 +328,7 @@ PHB_ITEM hb_itemParam( USHORT uiParam ) HB_TRACE(HB_TR_DEBUG, ("hb_itemParam(%hu)", uiParam)); pNew = hb_itemNew( NULL ); - pItem = hb_param( uiParam, IT_ANY ); + pItem = hb_param( uiParam, HB_IT_ANY ); if( pItem ) hb_itemCopy( pNew, pItem ); @@ -416,7 +416,7 @@ PHB_ITEM hb_itemPutC( PHB_ITEM pItem, char * szText ) if( szText == NULL ) szText = ""; - pItem->type = IT_STRING; + pItem->type = HB_IT_STRING; pItem->item.asString.length = strlen( szText ); pItem->item.asString.value = ( char * ) hb_xgrab( pItem->item.asString.length + 1 ); strcpy( pItem->item.asString.value, szText ); @@ -443,7 +443,7 @@ PHB_ITEM hb_itemPutCL( PHB_ITEM pItem, char * szText, ULONG ulLen ) ulLen = 0; } - pItem->type = IT_STRING; + pItem->type = HB_IT_STRING; pItem->item.asString.length = ulLen; pItem->item.asString.value = ( char * ) hb_xgrab( ulLen + 1 ); hb_xmemcpy( pItem->item.asString.value, szText, ulLen ); @@ -461,7 +461,7 @@ PHB_ITEM hb_itemPutCPtr( PHB_ITEM pItem, char * szText, ULONG ulLen ) else pItem = hb_itemNew( NULL ); - pItem->type = IT_STRING; + pItem->type = HB_IT_STRING; pItem->item.asString.length = ulLen; pItem->item.asString.value = szText; pItem->item.asString.value[ ulLen ] = '\0'; @@ -475,7 +475,7 @@ char * hb_itemGetC( PHB_ITEM pItem ) { HB_TRACE(HB_TR_DEBUG, ("hb_itemGetC(%p)", pItem)); - if( pItem && IS_STRING( pItem ) ) + if( pItem && HB_IS_STRING( pItem ) ) { char * szResult = ( char * ) hb_xgrab( pItem->item.asString.length + 1 ); hb_xmemcpy( szResult, pItem->item.asString.value, pItem->item.asString.length ); @@ -494,7 +494,7 @@ char * hb_itemGetCPtr( PHB_ITEM pItem ) { HB_TRACE(HB_TR_DEBUG, ("hb_itemGetCPtr(%p)", pItem)); - if( pItem && IS_STRING( pItem ) ) + if( pItem && HB_IS_STRING( pItem ) ) return pItem->item.asString.value; else return ""; @@ -504,7 +504,7 @@ ULONG hb_itemGetCLen( PHB_ITEM pItem ) { HB_TRACE(HB_TR_DEBUG, ("hb_itemGetCLen(%p)", pItem)); - if( pItem && IS_STRING( pItem ) ) + if( pItem && HB_IS_STRING( pItem ) ) return pItem->item.asString.length; else return 0; @@ -514,7 +514,7 @@ ULONG hb_itemCopyC( PHB_ITEM pItem, char * szBuffer, ULONG ulLen ) { HB_TRACE(HB_TR_DEBUG, ("hb_itemCopyC(%p, %s, %lu)", pItem, szBuffer, ulLen)); - if( pItem && IS_STRING( pItem ) ) + if( pItem && HB_IS_STRING( pItem ) ) { if( ulLen == 0 ) ulLen = pItem->item.asString.length; @@ -551,7 +551,7 @@ char * hb_itemGetDS( PHB_ITEM pItem, char * szDate ) { HB_TRACE(HB_TR_DEBUG, ("hb_itemGetDS(%p, %s)", szDate)); - if( pItem && IS_DATE( pItem ) ) + if( pItem && HB_IS_DATE( pItem ) ) hb_dateDecStr( szDate, pItem->item.asDate.value ); else hb_dateDecStr( szDate, 0 ); @@ -563,7 +563,7 @@ long hb_itemGetDL( PHB_ITEM pItem ) { HB_TRACE(HB_TR_DEBUG, ("hb_itemGetDL(%p)", pItem)); - return ( pItem && IS_DATE( pItem ) ) ? pItem->item.asDate.value : 0; + return ( pItem && HB_IS_DATE( pItem ) ) ? pItem->item.asDate.value : 0; } BOOL hb_itemGetL( PHB_ITEM pItem ) @@ -574,16 +574,16 @@ BOOL hb_itemGetL( PHB_ITEM pItem ) { switch( pItem->type ) { - case IT_LOGICAL: + case HB_IT_LOGICAL: return pItem->item.asLogical.value; - case IT_INTEGER: + case HB_IT_INTEGER: return pItem->item.asInteger.value != 0; - case IT_LONG: + case HB_IT_LONG: return pItem->item.asLong.value != 0; - case IT_DOUBLE: + case HB_IT_DOUBLE: return pItem->item.asDouble.value != 0.0; } } @@ -599,13 +599,13 @@ double hb_itemGetND( PHB_ITEM pItem ) { switch( pItem->type ) { - case IT_DOUBLE: + case HB_IT_DOUBLE: return pItem->item.asDouble.value; - case IT_INTEGER: + case HB_IT_INTEGER: return ( double ) pItem->item.asInteger.value; - case IT_LONG: + case HB_IT_LONG: return ( double ) pItem->item.asLong.value; } } @@ -621,13 +621,13 @@ int hb_itemGetNI( PHB_ITEM pItem ) { switch( pItem->type ) { - case IT_INTEGER: + case HB_IT_INTEGER: return pItem->item.asInteger.value; - case IT_LONG: + case HB_IT_LONG: return ( int ) pItem->item.asLong.value; - case IT_DOUBLE: + case HB_IT_DOUBLE: return ( int ) pItem->item.asDouble.value; } } @@ -643,16 +643,16 @@ long hb_itemGetNL( PHB_ITEM pItem ) { switch( pItem->type ) { - case IT_LONG: + case HB_IT_LONG: return pItem->item.asLong.value; - case IT_INTEGER: + case HB_IT_INTEGER: return ( long ) pItem->item.asInteger.value; - case IT_DOUBLE: + case HB_IT_DOUBLE: return ( long ) pItem->item.asDouble.value; - case IT_DATE: + case HB_IT_DATE: return pItem->item.asDate.value; } } @@ -698,7 +698,7 @@ PHB_ITEM hb_itemPutDS( PHB_ITEM pItem, char * szDate ) else pItem = hb_itemNew( NULL ); - pItem->type = IT_DATE; + pItem->type = HB_IT_DATE; pItem->item.asDate.value = hb_dateEncStr( szDate ); return pItem; @@ -713,7 +713,7 @@ PHB_ITEM hb_itemPutDL( PHB_ITEM pItem, long lJulian ) else pItem = hb_itemNew( NULL ); - pItem->type = IT_DATE; + pItem->type = HB_IT_DATE; pItem->item.asDate.value = lJulian; return pItem; @@ -728,7 +728,7 @@ PHB_ITEM hb_itemPutL( PHB_ITEM pItem, BOOL bValue ) else pItem = hb_itemNew( NULL ); - pItem->type = IT_LOGICAL; + pItem->type = HB_IT_LOGICAL; pItem->item.asLogical.value = bValue; return pItem; @@ -743,7 +743,7 @@ PHB_ITEM hb_itemPutND( PHB_ITEM pItem, double dNumber ) else pItem = hb_itemNew( NULL ); - pItem->type = IT_DOUBLE; + pItem->type = HB_IT_DOUBLE; pItem->item.asDouble.length = ( dNumber > 10000000000.0 ) ? 20 : 10; pItem->item.asDouble.decimal = hb_set.HB_SET_DECIMALS; pItem->item.asDouble.value = dNumber; @@ -760,7 +760,7 @@ PHB_ITEM hb_itemPutNI( PHB_ITEM pItem, int iNumber ) else pItem = hb_itemNew( NULL ); - pItem->type = IT_INTEGER; + pItem->type = HB_IT_INTEGER; pItem->item.asInteger.length = 10; pItem->item.asInteger.value = iNumber; @@ -776,7 +776,7 @@ PHB_ITEM hb_itemPutNL( PHB_ITEM pItem, long lNumber ) else pItem = hb_itemNew( NULL ); - pItem->type = IT_LONG; + pItem->type = HB_IT_LONG; pItem->item.asLong.length = 10; pItem->item.asLong.value = lNumber; @@ -820,7 +820,7 @@ PHB_ITEM hb_itemPutNDLen( PHB_ITEM pItem, double dNumber, int iWidth, int iDec ) if( iDec < 0 ) iDec = hb_set.HB_SET_DECIMALS; - pItem->type = IT_DOUBLE; + pItem->type = HB_IT_DOUBLE; pItem->item.asDouble.length = iWidth; pItem->item.asDouble.decimal = iDec; pItem->item.asDouble.value = dNumber; @@ -840,7 +840,7 @@ PHB_ITEM hb_itemPutNILen( PHB_ITEM pItem, int iNumber, int iWidth ) if( iWidth <= 0 || iWidth > 99 ) iWidth = 10; - pItem->type = IT_INTEGER; + pItem->type = HB_IT_INTEGER; pItem->item.asInteger.length = iWidth; pItem->item.asInteger.value = iNumber; @@ -859,7 +859,7 @@ PHB_ITEM hb_itemPutNLLen( PHB_ITEM pItem, long lNumber, int iWidth ) if( iWidth <= 0 || iWidth > 99 ) iWidth = 10; - pItem->type = IT_LONG; + pItem->type = HB_IT_LONG; pItem->item.asLong.length = iWidth; pItem->item.asLong.value = lNumber; @@ -875,7 +875,7 @@ PHB_ITEM hb_itemPutPtr( PHB_ITEM pItem, void * pValue ) else pItem = hb_itemNew( NULL ); - pItem->type = IT_POINTER; + pItem->type = HB_IT_POINTER; pItem->item.asPointer.value = pValue; return pItem; @@ -889,17 +889,17 @@ void hb_itemGetNLen( PHB_ITEM pItem, int * piWidth, int * piDecimal ) { switch( pItem->type ) { - case IT_DOUBLE: + case HB_IT_DOUBLE: if( piWidth ) *piWidth = ( int ) pItem->item.asDouble.length; if( piDecimal ) *piDecimal = ( int ) pItem->item.asDouble.decimal; break; - case IT_LONG: + case HB_IT_LONG: if( piWidth ) *piWidth = ( int ) pItem->item.asLong.length; if( piDecimal ) *piDecimal = 0; break; - case IT_INTEGER: + case HB_IT_INTEGER: if( piWidth ) *piWidth = ( int ) pItem->item.asInteger.length; if( piDecimal ) *piDecimal = 0; break; @@ -919,10 +919,10 @@ ULONG hb_itemSize( PHB_ITEM pItem ) { switch( pItem->type ) { - case IT_ARRAY: + case HB_IT_ARRAY: return hb_arrayLen( pItem ); - case IT_STRING: + case HB_IT_STRING: return pItem->item.asString.length; } } @@ -937,34 +937,36 @@ USHORT hb_itemType( PHB_ITEM pItem ) if( pItem ) return ( USHORT ) pItem->type; else - return IT_NIL; + return HB_IT_NIL; } char * hb_itemTypeStr( PHB_ITEM pItem ) { - switch( pItem->type & ~IT_BYREF ) + HB_TRACE(HB_TR_DEBUG, ("hb_itemTypeStr(%p)", pItem)); + + switch( pItem->type & ~HB_IT_BYREF ) { - case IT_ARRAY: + case HB_IT_ARRAY: return ( hb_arrayIsObject( pItem ) ? "O" : "A" ); - case IT_BLOCK: + case HB_IT_BLOCK: return "B"; - case IT_DATE: + case HB_IT_DATE: return "D"; - case IT_LOGICAL: + case HB_IT_LOGICAL: return "L"; - case IT_INTEGER: - case IT_LONG: - case IT_DOUBLE: + case HB_IT_INTEGER: + case HB_IT_LONG: + case HB_IT_DOUBLE: return "N"; - case IT_STRING: + case HB_IT_STRING: return "C"; - case IT_MEMO: + case HB_IT_MEMO: return "M"; } @@ -977,7 +979,7 @@ void hb_itemClear( PHB_ITEM pItem ) { HB_TRACE(HB_TR_DEBUG, ("hb_itemClear(%p)", pItem)); - if( IS_STRING( pItem ) ) + if( HB_IS_STRING( pItem ) ) { if( pItem->item.asString.value ) { @@ -986,18 +988,18 @@ void hb_itemClear( PHB_ITEM pItem ) } pItem->item.asString.length = 0; } - else if( IS_ARRAY( pItem ) && pItem->item.asArray.value ) + else if( HB_IS_ARRAY( pItem ) && pItem->item.asArray.value ) { if( --( pItem->item.asArray.value )->uiHolders == 0 ) hb_arrayRelease( pItem ); } - else if( IS_BLOCK( pItem ) ) + else if( HB_IS_BLOCK( pItem ) ) hb_codeblockDelete( pItem ); - else if( IS_MEMVAR( pItem ) ) + else if( HB_IS_MEMVAR( pItem ) ) hb_memvarValueDecRef( pItem->item.asMemvar.value ); - pItem->type = IT_NIL; + pItem->type = HB_IT_NIL; } /* Internal API, not standard Clipper */ @@ -1014,20 +1016,20 @@ void hb_itemCopy( PHB_ITEM pDest, PHB_ITEM pSource ) memcpy( pDest, pSource, sizeof( HB_ITEM ) ); - if( IS_STRING( pSource ) ) + if( HB_IS_STRING( pSource ) ) { pDest->item.asString.value = ( char * ) hb_xgrab( pSource->item.asString.length + 1 ); hb_xmemcpy( pDest->item.asString.value, pSource->item.asString.value, pSource->item.asString.length ); pDest->item.asString.value[ pSource->item.asString.length ] = '\0'; } - else if( IS_ARRAY( pSource ) ) + else if( HB_IS_ARRAY( pSource ) ) ( pSource->item.asArray.value )->uiHolders++; - else if( IS_BLOCK( pSource ) ) + else if( HB_IS_BLOCK( pSource ) ) hb_codeblockCopy( pDest, pSource ); - else if( IS_MEMVAR( pSource ) ) + else if( HB_IS_MEMVAR( pSource ) ) hb_memvarValueIncRef( pSource->item.asMemvar.value ); } @@ -1038,9 +1040,9 @@ PHB_ITEM hb_itemUnRef( PHB_ITEM pItem ) { HB_TRACE(HB_TR_DEBUG, ("hb_itemUnRef(%p)", pItem)); - while( IS_BYREF( pItem ) ) + while( HB_IS_BYREF( pItem ) ) { - if( IS_MEMVAR( pItem ) ) + if( HB_IS_MEMVAR( pItem ) ) { HB_VALUE_PTR pValue; @@ -1206,7 +1208,7 @@ char * hb_itemStr( PHB_ITEM pNumber, PHB_ITEM pWidth, PHB_ITEM pDec ) /* Be paranoid and use a large amount of padding */ szResult = ( char * ) hb_xgrab( HB_MAX_DOUBLE_LENGTH ); - if( IS_DOUBLE( pNumber ) || iDec != 0 ) + if( HB_IS_DOUBLE( pNumber ) || iDec != 0 ) { double dNumber = hb_itemGetND( pNumber ); @@ -1233,7 +1235,7 @@ char * hb_itemStr( PHB_ITEM pNumber, PHB_ITEM pWidth, PHB_ITEM pDec ) iBytes = iSize + 1; else { - if( IS_DOUBLE( pNumber ) && iDec < pNumber->item.asDouble.decimal ) + if( HB_IS_DOUBLE( pNumber ) && iDec < pNumber->item.asDouble.decimal ) dNumber = hb_numRound( dNumber, iDec ); if( iDec == 0 ) @@ -1244,13 +1246,13 @@ char * hb_itemStr( PHB_ITEM pNumber, PHB_ITEM pWidth, PHB_ITEM pDec ) } else { - switch( pNumber->type & ~IT_BYREF ) + switch( pNumber->type & ~HB_IT_BYREF ) { - case IT_INTEGER: + case HB_IT_INTEGER: iBytes = sprintf( szResult, "%*i", iWidth, pNumber->item.asInteger.value ); break; - case IT_LONG: + case HB_IT_LONG: iBytes = sprintf( szResult, "%*li", iWidth, pNumber->item.asLong.value ); break; @@ -1287,13 +1289,13 @@ char * hb_itemString( PHB_ITEM pItem, ULONG * ulLen, BOOL * bFreeReq ) switch( pItem->type ) { - case IT_STRING: + case HB_IT_STRING: buffer = hb_itemGetCPtr( pItem ); * ulLen = hb_itemGetCLen( pItem ); * bFreeReq = FALSE; break; - case IT_DATE: + case HB_IT_DATE: { char szDate[ 9 ]; @@ -1306,9 +1308,9 @@ char * hb_itemString( PHB_ITEM pItem, ULONG * ulLen, BOOL * bFreeReq ) } break; - case IT_DOUBLE: - case IT_INTEGER: - case IT_LONG: + case HB_IT_DOUBLE: + case HB_IT_INTEGER: + case HB_IT_LONG: buffer = hb_itemStr( pItem, NULL, NULL ); if( buffer ) { @@ -1323,13 +1325,13 @@ char * hb_itemString( PHB_ITEM pItem, ULONG * ulLen, BOOL * bFreeReq ) } break; - case IT_NIL: + case HB_IT_NIL: buffer = "NIL"; * ulLen = 3; * bFreeReq = FALSE; break; - case IT_LOGICAL: + case HB_IT_LOGICAL: buffer = ( hb_itemGetL( pItem ) ? ".T." : ".F." ); * ulLen = 3; * bFreeReq = FALSE; diff --git a/harbour/source/vm/memvars.c b/harbour/source/vm/memvars.c index 2b6bbcb3c0..75809a8388 100644 --- a/harbour/source/vm/memvars.c +++ b/harbour/source/vm/memvars.c @@ -213,7 +213,7 @@ HB_HANDLE hb_memvarValueNew( HB_ITEM_PTR pSource, BOOL bTrueMemvar ) memcpy( &pValue->item, pSource, sizeof( HB_ITEM ) ); } else - pValue->item.type = IT_NIL; + pValue->item.type = HB_IT_NIL; HB_TRACE(HB_TR_INFO, ("hb_memvarValueNew: memvar item created with handle %i", hValue)); @@ -385,7 +385,7 @@ void hb_memvarSetValue( PHB_SYMB pMemvarSymb, HB_ITEM_PTR pItem ) { /* value is already created */ HB_ITEM_PTR pSetItem = &s_globalTable[ pDyn->hMemvar ].item; - if( IS_BYREF( pSetItem ) ) + if( HB_IS_BYREF( pSetItem ) ) hb_itemCopy( hb_itemUnRef( pSetItem ), pItem ); else hb_itemCopy( pSetItem, pItem ); @@ -418,7 +418,7 @@ ERRCODE hb_memvarGet( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb ) /* value is already created */ HB_ITEM_PTR pGetItem = &s_globalTable[ pDyn->hMemvar ].item; - if( IS_BYREF( pGetItem ) ) + if( HB_IS_BYREF( pGetItem ) ) hb_itemCopy( pItem, hb_itemUnRef( pGetItem ) ); else hb_itemCopy( pItem, pGetItem ); @@ -473,7 +473,7 @@ void hb_memvarGetRefer( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb ) if( pDyn->hMemvar ) { /* value is already created */ - pItem->type = IT_BYREF | IT_MEMVAR; + pItem->type = HB_IT_BYREF | HB_IT_MEMVAR; pItem->item.asMemvar.offset = 0; pItem->item.asMemvar.value = pDyn->hMemvar; pItem->item.asMemvar.itemsbase = &s_globalTable; @@ -498,7 +498,7 @@ void hb_memvarGetRefer( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb ) if( pDyn->hMemvar ) { /* value is already created */ - pItem->type = IT_BYREF | IT_MEMVAR; + pItem->type = HB_IT_BYREF | HB_IT_MEMVAR; pItem->item.asMemvar.offset = 0; pItem->item.asMemvar.value = pDyn->hMemvar; pItem->item.asMemvar.itemsbase = &s_globalTable; @@ -531,7 +531,7 @@ char * hb_memvarGetStrValuePtr( char * szVarName, ULONG *pulLen ) HB_TRACE(HB_TR_DEBUG, ("hb_memvarGetStrValuePtr(%s, %li)", szVarName, pulLen)); - itName.type = IT_STRING; + itName.type = HB_IT_STRING; itName.item.asString.value = szVarName; itName.item.asString.length = *pulLen; pDynVar = hb_memvarFindSymbol( &itName ); @@ -546,9 +546,9 @@ char * hb_memvarGetStrValuePtr( char * szVarName, ULONG *pulLen ) /* variable contains some data */ HB_ITEM_PTR pItem = &s_globalTable[ pDynVar->hMemvar ].item; - if( IS_BYREF( pItem ) ) + if( HB_IS_BYREF( pItem ) ) pItem = hb_itemUnRef( pItem ); /* it is a PARAMETER variable */ - if( IS_STRING( pItem ) ) + if( HB_IS_STRING( pItem ) ) { szValue = pItem->item.asString.value; *pulLen = pItem->item.asString.length; @@ -563,7 +563,7 @@ char * hb_memvarGetStrValuePtr( char * szVarName, ULONG *pulLen ) * This function creates a value for memvar variable * * pMemvar - an item that stores the name of variable - it can be either - * the IT_SYMBOL (if created by PUBLIC statement) or IT_STRING + * the HB_IT_SYMBOL (if created by PUBLIC statement) or HB_IT_STRING * (if created by direct call to __PUBLIC function) * bScope - the scope of created variable - if a variable with the same name * exists already then it's value is hidden by new variable with @@ -579,9 +579,9 @@ static void hb_memvarCreateFromItem( PHB_ITEM pMemvar, BYTE bScope, PHB_ITEM pVa HB_TRACE(HB_TR_DEBUG, ("hb_memvarCreateFromItem(%p, %d, %p)", pMemvar, bScope, pValue)); /* find dynamic symbol or creeate one */ - if( IS_SYMBOL( pMemvar ) ) + if( HB_IS_SYMBOL( pMemvar ) ) pDynVar = hb_dynsymGet( pMemvar->item.asSymbol.value->szName ); - else if( IS_STRING( pMemvar ) ) + else if( HB_IS_STRING( pMemvar ) ) pDynVar = hb_dynsymGet( pMemvar->item.asString.value ); else hb_errRT_BASE( EG_ARG, 3008, NULL, "&" ); @@ -607,7 +607,7 @@ static void hb_memvarCreateFromDynSymbol( PHB_DYNS pDynVar, BYTE bScope, PHB_ITE /* new PUBLIC variable - initialize it to .F. */ - s_globalTable[ pDynVar->hMemvar ].item.type = IT_LOGICAL; + s_globalTable[ pDynVar->hMemvar ].item.type = HB_IT_LOGICAL; /* NOTE: PUBLIC variables named CLIPPER and HARBOUR are initialized */ /* to .T., this is normal Clipper behaviour. [vszakats] */ @@ -645,7 +645,7 @@ static void hb_memvarRelease( HB_ITEM_PTR pMemvar ) { HB_TRACE(HB_TR_DEBUG, ("hb_memvarRelease(%p)", pMemvar)); - if( IS_STRING( pMemvar ) ) + if( HB_IS_STRING( pMemvar ) ) { ULONG ulBase = s_privateStackCnt; @@ -916,11 +916,11 @@ HB_FUNC( __MVPUBLIC ) for( i = 1; i <= iCount; i++ ) { - PHB_ITEM pMemvar = hb_param( i, IT_ANY ); + PHB_ITEM pMemvar = hb_param( i, HB_IT_ANY ); if( pMemvar ) { - if( IS_ARRAY( pMemvar ) ) + if( HB_IS_ARRAY( pMemvar ) ) { /* we are accepting an one-dimensional array of strings only */ @@ -945,7 +945,7 @@ HB_FUNC( __MVPUBLIC ) HB_FUNC( __QQPUB ) { - PHB_ITEM pItem = hb_param( 1, IT_STRING ); + PHB_ITEM pItem = hb_param( 1, HB_IT_STRING ); if( pItem ) hb_memvarCreateFromItem( pItem, VS_PUBLIC, NULL ); @@ -961,11 +961,11 @@ HB_FUNC( __MVPRIVATE ) for( i = 1; i <= iCount; i++ ) { - PHB_ITEM pMemvar = hb_param( i, IT_ANY ); + PHB_ITEM pMemvar = hb_param( i, HB_IT_ANY ); if( pMemvar ) { - if( IS_ARRAY( pMemvar ) ) + if( HB_IS_ARRAY( pMemvar ) ) { /* we are accepting an one-dimensional array of strings only */ @@ -996,11 +996,11 @@ HB_FUNC( __MVXRELEASE ) for( i = 1; i <= iCount; i++ ) { - PHB_ITEM pMemvar = hb_param( i, IT_ANY ); + PHB_ITEM pMemvar = hb_param( i, HB_IT_ANY ); if( pMemvar ) { - if( IS_ARRAY( pMemvar ) ) + if( HB_IS_ARRAY( pMemvar ) ) { /* we are accepting an one-dimensional array of strings only */ @@ -1027,7 +1027,7 @@ HB_FUNC( __MVRELEASE ) if( iCount ) { - PHB_ITEM pMask = hb_param( 1, IT_STRING ); + PHB_ITEM pMask = hb_param( 1, HB_IT_STRING ); if( pMask ) { @@ -1051,7 +1051,7 @@ HB_FUNC( __MVSCOPE ) if( hb_pcount() ) { - PHB_ITEM pVarName = hb_param( 1, IT_STRING ); + PHB_ITEM pVarName = hb_param( 1, HB_IT_STRING ); if( pVarName ) iMemvar = hb_memvarScope( pVarName->item.asString.value, pVarName->item.asString.length + 1 ); @@ -1087,7 +1087,7 @@ HB_FUNC( __MVDBGINFO ) { /* we have to use this variable regardless of its current value */ - HB_ITEM_PTR pName = hb_param( 3, IT_ANY ); + HB_ITEM_PTR pName = hb_param( 3, HB_IT_ANY ); hb_itemPutC( pName, szName ); /* clear an old value and copy a new one */ /* szName points directly to a symbol name - it cannot be released @@ -1108,7 +1108,7 @@ HB_FUNC( __MVDBGINFO ) { /* we have to use this variable regardless of its current value */ - HB_ITEM_PTR pName = hb_param( 3, IT_ANY ); + HB_ITEM_PTR pName = hb_param( 3, HB_IT_ANY ); hb_itemPutC( pName, "?" ); /* clear an old value and copy a new one */ } @@ -1118,7 +1118,7 @@ HB_FUNC( __MVDBGINFO ) HB_FUNC( __MVGET ) { - HB_ITEM_PTR pName = hb_param( 1, IT_STRING ); + HB_ITEM_PTR pName = hb_param( 1, HB_IT_STRING ); if( pName ) { @@ -1182,13 +1182,13 @@ HB_FUNC( __MVGET ) HB_FUNC( __MVPUT ) { - HB_ITEM_PTR pName = hb_param( 1, IT_STRING ); + HB_ITEM_PTR pName = hb_param( 1, HB_IT_STRING ); HB_ITEM nil; HB_ITEM_PTR pValue = &nil; - nil.type = IT_NIL; + nil.type = HB_IT_NIL; if( hb_pcount() >= 2 ) - pValue = hb_param( 2, IT_ANY ); + pValue = hb_param( 2, HB_IT_ANY ); if( pName ) { @@ -1297,7 +1297,7 @@ HB_FUNC( __MVSAVE ) strncpy( ( char * ) buffer, pDynVar->pSymbol->szName, 10 ); buffer[ 10 ] = '\0'; - if( IS_STRING( pItem ) && ( hb_itemGetCLen( pItem ) + 1 ) <= SHRT_MAX ) + if( HB_IS_STRING( pItem ) && ( hb_itemGetCLen( pItem ) + 1 ) <= SHRT_MAX ) { /* Store the closing zero byte, too */ USHORT uiLength = ( USHORT ) ( hb_itemGetCLen( pItem ) + 1 ); @@ -1309,7 +1309,7 @@ HB_FUNC( __MVSAVE ) hb_fsWrite( fhnd, buffer, HB_MEM_REC_LEN ); hb_fsWrite( fhnd, ( BYTE * ) hb_itemGetCPtr( pItem ), uiLength ); } - else if( IS_NUMERIC( pItem ) ) + else if( HB_IS_NUMERIC( pItem ) ) { double dNumber = hb_itemGetND( pItem ); int iWidth; @@ -1320,7 +1320,7 @@ HB_FUNC( __MVSAVE ) buffer[ 11 ] = 'N' + 128; #ifdef HARBOUR_STRICT_CLIPPER_COMPATIBILITY /* NOTE: This is the buggy, but fully CA-Cl*pper compatible method. [vszakats] */ - buffer[ 16 ] = ( BYTE ) iWidth + ( IS_DOUBLE( pItem ) ? iDec + 1 : 0 ); + buffer[ 16 ] = ( BYTE ) iWidth + ( HB_IS_DOUBLE( pItem ) ? iDec + 1 : 0 ); #else /* NOTE: This would be the correct method, but Clipper is buggy here. [vszakats] */ buffer[ 16 ] = ( BYTE ) iWidth + ( iDec == 0 ? 0 : iDec + 1 ); @@ -1330,7 +1330,7 @@ HB_FUNC( __MVSAVE ) hb_fsWrite( fhnd, buffer, HB_MEM_REC_LEN ); hb_fsWrite( fhnd, ( BYTE * ) &dNumber, sizeof( dNumber ) ); } - else if( IS_DATE( pItem ) ) + else if( HB_IS_DATE( pItem ) ) { double dNumber = ( double ) hb_itemGetDL( pItem ); @@ -1341,7 +1341,7 @@ HB_FUNC( __MVSAVE ) hb_fsWrite( fhnd, buffer, HB_MEM_REC_LEN ); hb_fsWrite( fhnd, ( BYTE * ) &dNumber, sizeof( dNumber ) ); } - else if( IS_LOGICAL( pItem ) ) + else if( HB_IS_LOGICAL( pItem ) ) { BYTE byLogical[ 1 ]; diff --git a/harbour/source/vm/proc.c b/harbour/source/vm/proc.c index 8a9490ea79..2277856e9a 100644 --- a/harbour/source/vm/proc.c +++ b/harbour/source/vm/proc.c @@ -56,7 +56,7 @@ HB_FUNC( PROCNAME ) if( ( iLevel == -1 ) ) { - if( ( pBase + 1 )->type == IT_ARRAY ) /* it is a method name */ + if( ( pBase + 1 )->type == HB_IT_ARRAY ) /* it is a method name */ { char * szProcName; diff --git a/harbour/source/vm/runner.c b/harbour/source/vm/runner.c index 528cb9168f..6ff8d6c831 100644 --- a/harbour/source/vm/runner.c +++ b/harbour/source/vm/runner.c @@ -258,7 +258,7 @@ HB_FUNC( __HRBRUN ) hb_vmPushSymbol( pSymRead + ul ); hb_vmPushNil(); for( i = 0; i < ( hb_pcount() - 1 ); i++ ) - hb_vmPush( hb_param( i + 2, IT_ANY ) ); + hb_vmPush( hb_param( i + 2, HB_IT_ANY ) ); /* Push other cmdline params*/ hb_vmDo( hb_pcount() - 1 ); /* Run init function */ } @@ -267,7 +267,7 @@ HB_FUNC( __HRBRUN ) hb_vmPushSymbol( pSymRead ); hb_vmPushNil(); for( i = 0; i < ( hb_pcount() - 1 ); i++ ) - hb_vmPush( hb_param( i + 2, IT_ANY ) ); /* Push other cmdline params*/ + hb_vmPush( hb_param( i + 2, HB_IT_ANY ) ); /* Push other cmdline params*/ hb_vmDo( hb_pcount() - 1 ); /* Run the thing !!! */ pRetVal = hb_itemNew( NULL );