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

2009-06-13 23:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbxbp/hbxbp.hbc
    + Added gtgui as default GT on win/wce systems.

  * include/extend.api
  * include/hbsetup.ch
  * include/hbapi.h
    + Added new HB_LEGACY_LEVEL3 macro to wrap legacy
      constructs to be deprecated in the next major release.
      Currently legacy IS*() parameter type checking macros
      are marked as such, ones present in CA-Cl*pper retained
      in extend.api even when this macro off.

    ; NOTE: It's recommended for 3rd party developers to
            start using new HB_IS*() macros. They work
            the same as Clipper compatible IS*() macros,
            but got a HB_ prefix: ISNUM( 1 ) -> HB_ISNUM( 1 )
            (not to be confused with HB_IS_*() macros which
            accept a PHB_ITEM)
            Here's a little batch which helps this process:
            ---
            gsar -o -s:x20ISNUM(       -r:x20HB_ISNUM(       *.c *.cpp
            gsar -o -s:x20ISCHAR(      -r:x20HB_ISCHAR(      *.c *.cpp
            gsar -o -s:x20ISLOG(       -r:x20HB_ISLOG(       *.c *.cpp
            gsar -o -s:x20ISARRAY(     -r:x20HB_ISARRAY(     *.c *.cpp
            gsar -o -s:x20ISBYREF(     -r:x20HB_ISBYREF(     *.c *.cpp
            gsar -o -s:x20ISDATE(      -r:x20HB_ISDATE(      *.c *.cpp
            gsar -o -s:x20ISDATETIME(  -r:x20HB_ISDATETIME(  *.c *.cpp
            gsar -o -s:x20ISNIL(       -r:x20HB_ISNIL(       *.c *.cpp
            gsar -o -s:x20ISTIMESTAMP( -r:x20HB_ISTIMESTAMP( *.c *.cpp
            gsar -o -s:x20ISBLOCK(     -r:x20HB_ISBLOCK(     *.c *.cpp
            gsar -o -s:x20ISPOINTER(   -r:x20HB_ISPOINTER(   *.c *.cpp
            gsar -o -s:x20ISSYMBOL(    -r:x20HB_ISSYMBOL(    *.c *.cpp
            gsar -o -s:x20ISOBJECT(    -r:x20HB_ISOBJECT(    *.c *.cpp
            gsar -o -s:x20ISHASH(      -r:x20HB_ISHASH(      *.c *.cpp
            gsar -o -s!ISNUM(          -r!HB_ISNUM(          *.c *.cpp
            gsar -o -s!ISCHAR(         -r!HB_ISCHAR(         *.c *.cpp
            gsar -o -s!ISLOG(          -r!HB_ISLOG(          *.c *.cpp
            gsar -o -s!ISARRAY(        -r!HB_ISARRAY(        *.c *.cpp
            gsar -o -s!ISBYREF(        -r!HB_ISBYREF(        *.c *.cpp
            gsar -o -s!ISDATE(         -r!HB_ISDATE(         *.c *.cpp
            gsar -o -s!ISDATETIME(     -r!HB_ISDATETIME(     *.c *.cpp
            gsar -o -s!ISNIL(          -r!HB_ISNIL(          *.c *.cpp
            gsar -o -s!ISTIMESTAMP(    -r!HB_ISTIMESTAMP(    *.c *.cpp
            gsar -o -s!ISBLOCK(        -r!HB_ISBLOCK(        *.c *.cpp
            gsar -o -s!ISPOINTER(      -r!HB_ISPOINTER(      *.c *.cpp
            gsar -o -s!ISSYMBOL(       -r!HB_ISSYMBOL(       *.c *.cpp
            gsar -o -s!ISOBJECT(       -r!HB_ISOBJECT(       *.c *.cpp
            gsar -o -s!ISHASH(         -r!HB_ISHASH(         *.c *.cpp
            ---

  * source/rtl/hbinet.c
    * Formatting.
    % Minor optimizations.

  * source/debug/dbgentry.c
  * source/rdd/dbcmd.c
  * source/rdd/dbcmd53.c
  * source/rdd/dbcmdx.c
  * source/rdd/dbdetach.c
  * source/rdd/dbsql.c
  * source/rdd/hbsix/sxfname.c
  * source/rdd/hbsix/sxord.c
  * source/rdd/hbsix/sxtable.c
  * source/rdd/usrrdd/usrrdd.c
  * source/rtl/at.c
  * source/rtl/box.c
  * source/rtl/cdpapi.c
  * source/rtl/chrasc.c
  * source/rtl/colorind.c
  * source/rtl/console.c
  * source/rtl/copyfile.c
  * source/rtl/dateshb.c
  * source/rtl/dirdrive.c
  * source/rtl/diskspac.c
  * source/rtl/disksphb.c
  * source/rtl/errapi.c
  * source/rtl/filesys.c
  * source/rtl/fscopy.c
  * source/rtl/fssize.c
  * source/rtl/fstemp.c
  * source/rtl/gete.c
  * source/rtl/gtfunc.c
  * source/rtl/gx.c
  * source/rtl/hbbit.c
  * source/rtl/hbgtcore.c
  * source/rtl/hbhex.c
  * source/rtl/hbi18n1.c
  * source/rtl/hbinet.c
  * source/rtl/hbprocfn.c
  * source/rtl/hbrandom.c
  * source/rtl/hbregex.c
  * source/rtl/hbstrsh.c
  * source/rtl/hbtoken.c
  * source/rtl/hbzlib.c
  * source/rtl/hbzlibgz.c
  * source/rtl/inkey.c
  * source/rtl/itemseri.c
  * source/rtl/left.c
  * source/rtl/math.c
  * source/rtl/maxrow.c
  * source/rtl/mlcfunc.c
  * source/rtl/mouse53.c
  * source/rtl/mousex.c
  * source/rtl/mtran.c
  * source/rtl/natmsg.c
  * source/rtl/padc.c
  * source/rtl/padl.c
  * source/rtl/padr.c
  * source/rtl/philes.c
  * source/rtl/philes53.c
  * source/rtl/rat.c
  * source/rtl/replic.c
  * source/rtl/right.c
  * source/rtl/round.c
  * source/rtl/run.c
  * source/rtl/saverest.c
  * source/rtl/scroll.c
  * source/rtl/setcolor.c
  * source/rtl/setcurs.c
  * source/rtl/setpos.c
  * source/rtl/shadow.c
  * source/rtl/strc.c
  * source/rtl/strmatch.c
  * source/rtl/strpeek.c
  * source/rtl/strtoexp.c
  * source/rtl/strtran.c
  * source/rtl/stuff.c
  * source/rtl/substr.c
  * source/rtl/tone.c
  * source/rtl/trace.c
  * source/rtl/transfrm.c
  * source/rtl/valtype.c
  * source/rtl/word.c
  * source/vm/arrayshb.c
  * source/vm/asort.c
  * source/vm/classes.c
  * source/vm/cmdarg.c
  * source/vm/eval.c
  * source/vm/hashfunc.c
  * source/vm/hvm.c
  * source/vm/memvars.c
  * source/vm/proc.c
  * source/vm/thread.c
    * IS*() -> HB_IS*() macro rename.
      (pass 1 - sf.net SVN works badly today, so I've split 
      the commit to raise the chances of a successfully 
      finished one)
This commit is contained in:
Viktor Szakats
2009-06-13 22:44:34 +00:00
parent a613de0049
commit e4ddd5f914
94 changed files with 734 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

171
harbour/ChangeLog
View File

@@ -17,15 +17,164 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-06-13 23:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbxbp/hbxbp.hbc
+ Added gtgui as default GT on win/wce systems.
* include/extend.api
* include/hbsetup.ch
* include/hbapi.h
+ Added new HB_LEGACY_LEVEL3 macro to wrap legacy
constructs to be deprecated in the next major release.
Currently legacy IS*() parameter type checking macros
are marked as such, ones present in CA-Cl*pper retained
in extend.api even when this macro off.
; NOTE: It's recommended for 3rd party developers to
start using new HB_IS*() macros. They work
the same as Clipper compatible IS*() macros,
but got a HB_ prefix: ISNUM( 1 ) -> HB_ISNUM( 1 )
(not to be confused with HB_IS_*() macros which
accept a PHB_ITEM)
Here's a little batch which helps this process:
---
gsar -o -s:x20ISNUM( -r:x20HB_ISNUM( *.c *.cpp
gsar -o -s:x20ISCHAR( -r:x20HB_ISCHAR( *.c *.cpp
gsar -o -s:x20ISLOG( -r:x20HB_ISLOG( *.c *.cpp
gsar -o -s:x20ISARRAY( -r:x20HB_ISARRAY( *.c *.cpp
gsar -o -s:x20ISBYREF( -r:x20HB_ISBYREF( *.c *.cpp
gsar -o -s:x20ISDATE( -r:x20HB_ISDATE( *.c *.cpp
gsar -o -s:x20ISDATETIME( -r:x20HB_ISDATETIME( *.c *.cpp
gsar -o -s:x20ISNIL( -r:x20HB_ISNIL( *.c *.cpp
gsar -o -s:x20ISTIMESTAMP( -r:x20HB_ISTIMESTAMP( *.c *.cpp
gsar -o -s:x20ISBLOCK( -r:x20HB_ISBLOCK( *.c *.cpp
gsar -o -s:x20ISPOINTER( -r:x20HB_ISPOINTER( *.c *.cpp
gsar -o -s:x20ISSYMBOL( -r:x20HB_ISSYMBOL( *.c *.cpp
gsar -o -s:x20ISOBJECT( -r:x20HB_ISOBJECT( *.c *.cpp
gsar -o -s:x20ISHASH( -r:x20HB_ISHASH( *.c *.cpp
gsar -o -s!ISNUM( -r!HB_ISNUM( *.c *.cpp
gsar -o -s!ISCHAR( -r!HB_ISCHAR( *.c *.cpp
gsar -o -s!ISLOG( -r!HB_ISLOG( *.c *.cpp
gsar -o -s!ISARRAY( -r!HB_ISARRAY( *.c *.cpp
gsar -o -s!ISBYREF( -r!HB_ISBYREF( *.c *.cpp
gsar -o -s!ISDATE( -r!HB_ISDATE( *.c *.cpp
gsar -o -s!ISDATETIME( -r!HB_ISDATETIME( *.c *.cpp
gsar -o -s!ISNIL( -r!HB_ISNIL( *.c *.cpp
gsar -o -s!ISTIMESTAMP( -r!HB_ISTIMESTAMP( *.c *.cpp
gsar -o -s!ISBLOCK( -r!HB_ISBLOCK( *.c *.cpp
gsar -o -s!ISPOINTER( -r!HB_ISPOINTER( *.c *.cpp
gsar -o -s!ISSYMBOL( -r!HB_ISSYMBOL( *.c *.cpp
gsar -o -s!ISOBJECT( -r!HB_ISOBJECT( *.c *.cpp
gsar -o -s!ISHASH( -r!HB_ISHASH( *.c *.cpp
---
* source/rtl/hbinet.c
* Formatting.
% Minor optimizations.
* source/debug/dbgentry.c
* source/rdd/dbcmd.c
* source/rdd/dbcmd53.c
* source/rdd/dbcmdx.c
* source/rdd/dbdetach.c
* source/rdd/dbsql.c
* source/rdd/hbsix/sxfname.c
* source/rdd/hbsix/sxord.c
* source/rdd/hbsix/sxtable.c
* source/rdd/usrrdd/usrrdd.c
* source/rtl/at.c
* source/rtl/box.c
* source/rtl/cdpapi.c
* source/rtl/chrasc.c
* source/rtl/colorind.c
* source/rtl/console.c
* source/rtl/copyfile.c
* source/rtl/dateshb.c
* source/rtl/dirdrive.c
* source/rtl/diskspac.c
* source/rtl/disksphb.c
* source/rtl/errapi.c
* source/rtl/filesys.c
* source/rtl/fscopy.c
* source/rtl/fssize.c
* source/rtl/fstemp.c
* source/rtl/gete.c
* source/rtl/gtfunc.c
* source/rtl/gx.c
* source/rtl/hbbit.c
* source/rtl/hbgtcore.c
* source/rtl/hbhex.c
* source/rtl/hbi18n1.c
* source/rtl/hbinet.c
* source/rtl/hbprocfn.c
* source/rtl/hbrandom.c
* source/rtl/hbregex.c
* source/rtl/hbstrsh.c
* source/rtl/hbtoken.c
* source/rtl/hbzlib.c
* source/rtl/hbzlibgz.c
* source/rtl/inkey.c
* source/rtl/itemseri.c
* source/rtl/left.c
* source/rtl/math.c
* source/rtl/maxrow.c
* source/rtl/mlcfunc.c
* source/rtl/mouse53.c
* source/rtl/mousex.c
* source/rtl/mtran.c
* source/rtl/natmsg.c
* source/rtl/padc.c
* source/rtl/padl.c
* source/rtl/padr.c
* source/rtl/philes.c
* source/rtl/philes53.c
* source/rtl/rat.c
* source/rtl/replic.c
* source/rtl/right.c
* source/rtl/round.c
* source/rtl/run.c
* source/rtl/saverest.c
* source/rtl/scroll.c
* source/rtl/setcolor.c
* source/rtl/setcurs.c
* source/rtl/setpos.c
* source/rtl/shadow.c
* source/rtl/strc.c
* source/rtl/strmatch.c
* source/rtl/strpeek.c
* source/rtl/strtoexp.c
* source/rtl/strtran.c
* source/rtl/stuff.c
* source/rtl/substr.c
* source/rtl/tone.c
* source/rtl/trace.c
* source/rtl/transfrm.c
* source/rtl/valtype.c
* source/rtl/word.c
* source/vm/arrayshb.c
* source/vm/asort.c
* source/vm/classes.c
* source/vm/cmdarg.c
* source/vm/eval.c
* source/vm/hashfunc.c
* source/vm/hvm.c
* source/vm/memvars.c
* source/vm/proc.c
* source/vm/thread.c
* IS*() -> HB_IS*() macro rename.
(pass 1 - sf.net SVN works badly today, so I've split
the commit to raise the chances of a successfully
finished one)
2009-06-13 15:28 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* harbour/contrib/hbxbp/tests/demoxbp.prg
! Added AppSys() call as it is required for Xbase++ to flag
! Added AppSys() call as it is required for Xbase++ to flag
that application is GUI one.
2009-06-13 15:26 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* harbour/contrib/hbxbp/xbp_temp.prg
+ Added missing functions.
2009-06-13 14:28 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* harbour/contrib/hbxbp/xbp.ch
* harbour/contrib/hbxbp/xbpdialog.prg
@@ -36,21 +185,21 @@
* harbour/contrib/hbxbp/tests/demoxbp.prg
+ Implemented XbpMenuBar() | XbpMenu() classes.
+ Implemented :setColorFG() | :setColorBG() for all widgets.
/*
Almost all the features of XbpMenuBar() and XbpMenu()
/*
Almost all the features of XbpMenuBar() and XbpMenu()
classes are implemented with the exception of following:
TODO: XbpMenu*()
: beginMenu - callback
: endMenu - callback
: selectItem() - method
: selectItem() - method
: setItem() - method
: insItem()[P] - method - Prompts-OK Submenu-NotOK
: XBPMENUBAR_MIA_FRAMED - 4th parameter of <aItem>
NOTE: I could not find how or with which method Xbase++ is
setting a menu item both with 'text' and 'bitmap'. It is
NOTE: I could not find how or with which method Xbase++ is
setting a menu item both with 'text' and 'bitmap'. It is
done via separate calls. So I have extended the <xCaption>
slot of <aItem> property ( whereever applicable ) as:
<cIcon>+"|"+cCaption which is parsed and then both objects
@@ -60,14 +209,14 @@
in the menu's or not but in Harbour you can set them for
indivisual menu basis.
REQUEST: Please test the code both with Xbase++ and Harbour and
REQUEST: Please test the code both with Xbase++ and Harbour and
report on the list any differeces. I want to set these right
from the very begining.
NEXT: Working on XbpToolbar() class.
*/
*/
2009-06-13 14:19 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* harbour/contrib/hbqt/generator/hbqtgen.prg
* harbour/contrib/hbqt/generator/qt45.qtp

2
harbour/contrib/hbxbp/hbxbp.hbc
View File

@@ -4,3 +4,5 @@
libs=hbxbp
hbcs=../hbqt/hbqt.hbc
{allwin}gt=gtgui

10
harbour/include/extend.api
View File

@@ -91,6 +91,16 @@ typedef PHB_ITEM ITEM;
#define PCOUNT hb_pcount()
#define ALENGTH( n ) hb_parinfa( n, 0 )
#ifndef HB_LEGACY_LEVEL3
#define ISCHAR( n ) HB_ISCHAR( n )
#define ISNUM( n ) HB_ISNUM( n )
#define ISLOG( n ) HB_ISLOG( n )
#define ISDATE( n ) HB_ISDATE( n )
#define ISMEMO( n ) HB_ISMEMO( n )
#define ISBYREF( n ) HB_ISBYREF( n )
#define ISARRAY( n ) HB_ISARRAY( n )
#endif
/* Functions */
#define _parc hb_parc

33
harbour/include/hbapi.h
View File

@@ -240,22 +240,23 @@ HB_EXTERN_BEGIN
#define HB_ISDATETIME( n ) ( hb_param( n, HB_IT_DATETIME ) != NULL ) /* Not available in CA-Cl*pper. */
/* Compatibility #defines, deprecated */
#define ISNIL( n ) HB_ISNIL( n )
#define ISCHAR( n ) HB_ISCHAR( n )
#define ISNUM( n ) HB_ISNUM( n )
#define ISLOG( n ) HB_ISLOG( n )
#define ISDATE( n ) HB_ISDATE( n )
#define ISTIMESTAMP( n ) HB_ISTIMESTAMP( n )
#define ISMEMO( n ) HB_ISMEMO( n )
#define ISBYREF( n ) HB_ISBYREF( n )
#define ISARRAY( n ) HB_ISARRAY( n )
#define ISOBJECT( n ) HB_ISOBJECT( n )
#define ISBLOCK( n ) HB_ISBLOCK( n )
#define ISPOINTER( n ) HB_ISPOINTER( n )
#define ISHASH( n ) HB_ISHASH( n )
#define ISSYMBOL( n ) HB_ISSYMBOL( n )
#define ISDATETIME( n ) HB_ISDATETIME( n )
#ifdef HB_LEGACY_LEVEL3
#define ISNIL( n ) HB_ISNIL( n )
#define ISCHAR( n ) HB_ISCHAR( n )
#define ISNUM( n ) HB_ISNUM( n )
#define ISLOG( n ) HB_ISLOG( n )
#define ISDATE( n ) HB_ISDATE( n )
#define ISTIMESTAMP( n ) HB_ISTIMESTAMP( n )
#define ISMEMO( n ) HB_ISMEMO( n )
#define ISBYREF( n ) HB_ISBYREF( n )
#define ISARRAY( n ) HB_ISARRAY( n )
#define ISOBJECT( n ) HB_ISOBJECT( n )
#define ISBLOCK( n ) HB_ISBLOCK( n )
#define ISPOINTER( n ) HB_ISPOINTER( n )
#define ISHASH( n ) HB_ISHASH( n )
#define ISSYMBOL( n ) HB_ISSYMBOL( n )
#define ISDATETIME( n ) HB_ISDATETIME( n )
#endif
#ifdef _HB_API_INTERNAL_

3
harbour/include/hbsetup.ch
View File

@@ -82,4 +82,7 @@
#define HB_LEGACY_LEVEL2
#endif
/* Future level of legacy cleanup */
#define HB_LEGACY_LEVEL3
#endif /* HB_SETUP_CH_ */

2
harbour/source/debug/dbgentry.c
View File

@@ -1665,7 +1665,7 @@ HB_FUNC( __DBGGETEXPRVALUE )
{
PHB_ITEM pItem;
if( ISCHAR( 2 ) )
if( HB_ISCHAR( 2 ) )
pItem = hb_dbgGetExpressionValue( hb_parptr( 1 ), hb_parc( 2 ) );
else
pItem = hb_dbgGetWatchValue( hb_parptr( 1 ), hb_parni( 2 ) - 1 );

60
harbour/source/rdd/dbcmd.c
View File

@@ -206,35 +206,35 @@ HB_FUNC( DBEVAL )
}
pEvalInfo.dbsci.itmCobFor = hb_param( 2, HB_IT_BLOCK );
if( !pEvalInfo.dbsci.itmCobFor && !ISNIL( 2 ) )
if( !pEvalInfo.dbsci.itmCobFor && ! HB_ISNIL( 2 ) )
{
hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, HB_ERR_FUNCNAME );
return;
}
pEvalInfo.dbsci.itmCobWhile = hb_param( 3, HB_IT_BLOCK );
if( !pEvalInfo.dbsci.itmCobWhile && !ISNIL( 3 ) )
if( !pEvalInfo.dbsci.itmCobWhile && ! HB_ISNIL( 3 ) )
{
hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, HB_ERR_FUNCNAME );
return;
}
pEvalInfo.dbsci.lNext = hb_param( 4, HB_IT_NUMERIC );
if( !pEvalInfo.dbsci.lNext && !ISNIL( 4 ) )
if( !pEvalInfo.dbsci.lNext && ! HB_ISNIL( 4 ) )
{
hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, HB_ERR_FUNCNAME );
return;
}
pEvalInfo.dbsci.itmRecID = hb_param( 5, HB_IT_NUMERIC );
if( !pEvalInfo.dbsci.itmRecID && !ISNIL( 5 ) )
if( !pEvalInfo.dbsci.itmRecID && ! HB_ISNIL( 5 ) )
{
hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, HB_ERR_FUNCNAME );
return;
}
pEvalInfo.dbsci.fRest = hb_param( 6, HB_IT_LOGICAL );
if( !pEvalInfo.dbsci.fRest && !ISNIL( 6 ) )
if( !pEvalInfo.dbsci.fRest && ! HB_ISNIL( 6 ) )
{
hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, HB_ERR_FUNCNAME );
return;
@@ -280,7 +280,7 @@ HB_FUNC( DBAPPEND )
if( pArea )
{
BOOL bUnLockAll = ISLOG( 1 ) ? hb_parl( 1 ) : TRUE;
BOOL bUnLockAll = HB_ISLOG( 1 ) ? hb_parl( 1 ) : TRUE;
HB_ERRCODE errCode;
/* Clipper clears NETERR flag before APPEND */
@@ -350,7 +350,7 @@ HB_FUNC( DBCREATE )
szFileName = hb_parc( 1 );
pStruct = hb_param( 2, HB_IT_ARRAY );
szDriver = hb_parc( 3 );
fKeepOpen = ISLOG( 4 );
fKeepOpen = HB_ISLOG( 4 );
fCurrArea = fKeepOpen && !hb_parl( 4 );
szAlias = hb_parc( 5 );
pDelim = hb_param( 6, HB_IT_ANY );
@@ -477,7 +477,7 @@ HB_FUNC( __DBOPENSDF )
szFileName = hb_parc( 1 );
pStruct = hb_param( 2, HB_IT_ARRAY );
szDriver = hb_parc( 3 );
fKeepOpen = ISLOG( 4 );
fKeepOpen = HB_ISLOG( 4 );
fCurrArea = fKeepOpen && !hb_parl( 4 );
szAlias = hb_parc( 5 );
pDelim = hb_param( 6, HB_IT_ANY );
@@ -694,7 +694,7 @@ HB_FUNC( DBRLOCK )
DBLOCKINFO dbLockInfo;
dbLockInfo.fResult = FALSE;
dbLockInfo.itmRecID = hb_param( 1, HB_IT_ANY );
if( !dbLockInfo.itmRecID || ISNIL( 1 ) )
if( !dbLockInfo.itmRecID || HB_ISNIL( 1 ) )
dbLockInfo.uiMethod = DBLM_EXCLUSIVE;
else
dbLockInfo.uiMethod = DBLM_MULTIPLE;
@@ -736,11 +736,11 @@ HB_FUNC( DBSEEK )
if( pArea )
{
if( !ISNIL( 1 ) )
if( ! HB_ISNIL( 1 ) )
{
PHB_ITEM pKey = hb_param( 1, HB_IT_ANY );
BOOL bSoftSeek = ISLOG( 2 ) ? ( BOOL ) hb_parl( 2 ) : hb_setGetSoftSeek();
BOOL bFindLast = ISLOG( 3 ) ? hb_parl( 3 ) : FALSE, fFound = FALSE;
BOOL bSoftSeek = HB_ISLOG( 2 ) ? ( BOOL ) hb_parl( 2 ) : hb_setGetSoftSeek();
BOOL bFindLast = HB_ISLOG( 3 ) ? hb_parl( 3 ) : FALSE, fFound = FALSE;
if( SELF_SEEK( pArea, bSoftSeek, pKey, bFindLast ) == HB_SUCCESS )
{
if( SELF_FOUND( pArea, &fFound ) != HB_SUCCESS )
@@ -834,7 +834,7 @@ HB_FUNC( DBSKIP )
{
AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
if( pArea )
SELF_SKIP( pArea, ISNUM( 1 ) ? hb_parnl( 1 ) : 1 );
SELF_SKIP( pArea, HB_ISNUM( 1 ) ? hb_parnl( 1 ) : 1 );
else
hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME );
}
@@ -894,7 +894,7 @@ HB_FUNC( DBUSEAREA )
{
hb_retl( hb_rddOpenTable( hb_parc( 3 ), hb_parc( 2 ),
hb_parl( 1 ) ? 0 : hb_rddGetCurrentWorkAreaNumber(),
hb_parc( 4 ), ISLOG( 5 ) ? hb_parl( 5 ) : !hb_setGetExclusive(),
hb_parc( 4 ), HB_ISLOG( 5 ) ? hb_parl( 5 ) : !hb_setGetExclusive(),
hb_parl( 6 ), hb_parc( 7 ), hb_parnl( 8 ), NULL, NULL ) == HB_SUCCESS );
}
@@ -1114,7 +1114,7 @@ HB_FUNC( NETERR )
{
hb_retl( hb_rddGetNetErr() );
if( ISLOG( 1 ) )
if( HB_ISLOG( 1 ) )
hb_rddSetNetErr( hb_parl( 1 ) );
}
@@ -1195,7 +1195,7 @@ HB_FUNC( ORDCONDSET )
pItem = hb_param( 2, HB_IT_BLOCK );
lpdbOrdCondInfo->itmCobFor = pItem ? hb_itemNew( pItem ) : NULL;
lpdbOrdCondInfo->fAll = !ISLOG( 3 ) || hb_parl( 3 );
lpdbOrdCondInfo->fAll = ! HB_ISLOG( 3 ) || hb_parl( 3 );
lpdbOrdCondInfo->abWhile = hb_parclen( 17 ) > 0 ?
( BYTE * ) hb_strdup( hb_parc( 17 ) ) : NULL;
@@ -1206,9 +1206,9 @@ HB_FUNC( ORDCONDSET )
lpdbOrdCondInfo->itmCobEval = pItem ? hb_itemNew( pItem ) : NULL;
lpdbOrdCondInfo->lStep = hb_parnl( 6 );
lpdbOrdCondInfo->itmStartRecID = ISNIL( 7 ) ? NULL : hb_itemNew( hb_param( 7, HB_IT_ANY ) );
lpdbOrdCondInfo->itmStartRecID = HB_ISNIL( 7 ) ? NULL : hb_itemNew( hb_param( 7, HB_IT_ANY ) );
lpdbOrdCondInfo->lNextCount = hb_parnl( 8 );
lpdbOrdCondInfo->itmRecID = ISNIL( 9 ) ? NULL : hb_itemNew( hb_param( 9, HB_IT_ANY ) );
lpdbOrdCondInfo->itmRecID = HB_ISNIL( 9 ) ? NULL : hb_itemNew( hb_param( 9, HB_IT_ANY ) );
lpdbOrdCondInfo->fRest = hb_parl( 10 );
lpdbOrdCondInfo->fDescending = hb_parl( 11 );
/* 12th parameter is always nil in CL5.3, in CL5.2 it's compound flag */
@@ -1268,7 +1268,7 @@ HB_FUNC( ORDCREATE )
dbOrderInfo.abBagName = ( BYTE * ) hb_parcx( 1 );
dbOrderInfo.atomBagName = ( BYTE * ) hb_parcx( 2 );
dbOrderInfo.itmOrder = NULL;
dbOrderInfo.fUnique = ISLOG( 5 ) ? ( BOOL ) hb_parl( 5 ) : hb_setGetUnique();
dbOrderInfo.fUnique = HB_ISLOG( 5 ) ? ( BOOL ) hb_parl( 5 ) : hb_setGetUnique();
dbOrderInfo.abExpr = hb_param( 3, HB_IT_STRING );
if( ( ( dbOrderInfo.abBagName == NULL || strlen( ( char * ) dbOrderInfo.abBagName ) == 0 ) &&
( dbOrderInfo.atomBagName == NULL || strlen( ( char * ) dbOrderInfo.atomBagName ) == 0 ) ) ||
@@ -1419,7 +1419,7 @@ HB_FUNC( ORDLISTADD )
if( !pOrderInfo.atomBagName )
{
if( !ISNIL( 1 ) )
if( ! HB_ISNIL( 1 ) )
hb_errRT_DBCMD( EG_ARG, EDBCMD_ORDLSTADD_BADPARAMETER, NULL, HB_ERR_FUNCNAME );
return;
}
@@ -1503,8 +1503,8 @@ HB_FUNC( ORDNUMBER )
memset( &pOrderInfo, 0, sizeof( DBORDERINFO ) );
pOrderInfo.itmOrder = hb_param( 1, HB_IT_STRING );
pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING );
if( !( pOrderInfo.itmOrder || ISNIL( 1 ) ) ||
!( pOrderInfo.atomBagName || ISNIL( 2 ) ) )
if( !( pOrderInfo.itmOrder || HB_ISNIL( 1 ) ) ||
!( pOrderInfo.atomBagName || HB_ISNIL( 2 ) ) )
{
hb_errRT_DBCMD( EG_ARG, EDBCMD_REL_BADPARAMETER, NULL, HB_ERR_FUNCNAME );
return;
@@ -1699,7 +1699,7 @@ HB_FUNC( ORDSCOPE )
pInfo.itmResult = hb_itemNew( NULL );
if( iScope == 2 )
{
if( hb_pcount() > 1 && !ISNIL( 2 ) )
if( hb_pcount() > 1 && ! HB_ISNIL( 2 ) )
{
uiAction = DBOI_SCOPESET;
pInfo.itmNewVal = hb_param( 2, HB_IT_ANY);
@@ -1712,7 +1712,7 @@ HB_FUNC( ORDSCOPE )
uiAction = ( iScope == 0 ) ? DBOI_SCOPETOP : DBOI_SCOPEBOTTOM;
if( hb_pcount() > 1 )
{
if( ISNIL( 2 ) )
if( HB_ISNIL( 2 ) )
uiAction = ( iScope == 0 ) ? DBOI_SCOPETOPCLEAR : DBOI_SCOPEBOTTOMCLEAR;
else
pInfo.itmNewVal = hb_param( 2, HB_IT_ANY);
@@ -1770,7 +1770,7 @@ HB_FUNC( DBSETRELATION )
USHORT uiChildArea;
char * szAlias = NULL;
if( hb_pcount() < 2 || ( !( hb_parinfo( 1 ) & HB_IT_NUMERIC ) && ( hb_parinfo( 1 ) != HB_IT_STRING ) ) || !( ISNIL( 4 ) || ISLOG( 4 ) ) )
if( hb_pcount() < 2 || ( !( hb_parinfo( 1 ) & HB_IT_NUMERIC ) && ( hb_parinfo( 1 ) != HB_IT_STRING ) ) || !( HB_ISNIL( 4 ) || HB_ISLOG( 4 ) ) )
{
hb_errRT_DBCMD( EG_ARG, EDBCMD_REL_BADPARAMETER, NULL, HB_ERR_FUNCNAME );
return;
@@ -1870,7 +1870,7 @@ HB_FUNC( __DBARRANGE )
dbSortInfo.dbtri.dbsci.itmCobWhile = hb_param( 4, HB_IT_BLOCK );
dbSortInfo.dbtri.dbsci.lpstrWhile = NULL;
dbSortInfo.dbtri.dbsci.lNext = hb_param( 5, HB_IT_NUMERIC );
dbSortInfo.dbtri.dbsci.itmRecID = ISNIL( 6 ) ? NULL : hb_param( 6, HB_IT_ANY );
dbSortInfo.dbtri.dbsci.itmRecID = HB_ISNIL( 6 ) ? NULL : hb_param( 6, HB_IT_ANY );
dbSortInfo.dbtri.dbsci.fRest = hb_param( 7, HB_IT_LOGICAL );
dbSortInfo.dbtri.dbsci.fIgnoreFilter =
dbSortInfo.dbtri.dbsci.fLast =
@@ -1945,7 +1945,7 @@ HB_FUNC( __DBARRANGE )
/* __dbTrans( nDstArea, aFieldsStru, bFor, bWhile, nNext, nRecord, lRest ) */
HB_FUNC( __DBTRANS )
{
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
{
USHORT uiSrcArea, uiDstArea;
AREAP pSrcArea, pDstArea;
@@ -1974,7 +1974,7 @@ HB_FUNC( __DBTRANS )
dbTransInfo.dbsci.itmCobWhile = hb_param( 4, HB_IT_BLOCK );
dbTransInfo.dbsci.lpstrWhile = NULL;
dbTransInfo.dbsci.lNext = hb_param( 5, HB_IT_NUMERIC );
dbTransInfo.dbsci.itmRecID = ISNIL( 6 ) ? NULL : hb_param( 6, HB_IT_ANY );
dbTransInfo.dbsci.itmRecID = HB_ISNIL( 6 ) ? NULL : hb_param( 6, HB_IT_ANY );
dbTransInfo.dbsci.fRest = hb_param( 7, HB_IT_LOGICAL );
dbTransInfo.dbsci.fIgnoreFilter = TRUE;
@@ -2015,7 +2015,7 @@ HB_FUNC( __DBAPP )
hb_param( 4, HB_IT_BLOCK ), /* cobWhile */
NULL, /* lpStrWhile */
hb_param( 5, HB_IT_NUMERIC ), /* Next */
ISNIL( 6 ) ? NULL : hb_param( 6, HB_IT_ANY ), /* RecID */
HB_ISNIL( 6 ) ? NULL : hb_param( 6, HB_IT_ANY ), /* RecID */
hb_param( 7, HB_IT_LOGICAL ), /* Rest */
hb_parc( 10 ), /* Codepage */
hb_param( 11, HB_IT_ANY ) ) ); /* Delimiter */
@@ -2038,7 +2038,7 @@ HB_FUNC( __DBCOPY )
hb_param( 4, HB_IT_BLOCK ), /* cobWhile */
NULL, /* lpStrWhile */
hb_param( 5, HB_IT_NUMERIC ), /* Next */
ISNIL( 6 ) ? NULL : hb_param( 6, HB_IT_ANY ), /* RecID */
HB_ISNIL( 6 ) ? NULL : hb_param( 6, HB_IT_ANY ), /* RecID */
hb_param( 7, HB_IT_LOGICAL ), /* Rest */
hb_parc( 10 ), /* Codepage */
hb_param( 11, HB_IT_ANY ) ) ); /* Delimiter */

4
harbour/source/rdd/dbcmd53.c
View File

@@ -159,7 +159,7 @@ HB_FUNC( ORDFINDREC )
memset( &pOrderInfo, 0, sizeof( DBORDERINFO ) );
pOrderInfo.itmNewVal = hb_param( 1 , HB_IT_NUMERIC );
pOrderInfo.itmResult = hb_itemPutL( NULL, FALSE );
SELF_ORDINFO( pArea, ISLOG( 2 ) && hb_parl( 2 ) ? DBOI_FINDRECCONT :
SELF_ORDINFO( pArea, HB_ISLOG( 2 ) && hb_parl( 2 ) ? DBOI_FINDRECCONT :
DBOI_FINDREC, &pOrderInfo );
hb_itemReturnRelease( pOrderInfo.itmResult );
}
@@ -171,7 +171,7 @@ HB_FUNC( ORDSKIPRAW )
{
AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
if( pArea )
SELF_SKIPRAW( pArea, ISNUM( 1 ) ? hb_parnl( 1 ) : 1 );
SELF_SKIPRAW( pArea, HB_ISNUM( 1 ) ? hb_parnl( 1 ) : 1 );
else
hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME );
}

2
harbour/source/rdd/dbcmdx.c
View File

@@ -138,7 +138,7 @@ HB_FUNC( DBSKIPPER )
if( SELF_RECCOUNT( pArea, &ulRecords ) == HB_SUCCESS && ulRecords > 0 )
{
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
lRecs = hb_parnl( 1 );
if( lRecs == 0 )

8
harbour/source/rdd/dbdetach.c
View File

@@ -105,12 +105,12 @@ HB_FUNC( HB_DBREQUEST )
BOOL fNewArea, fWait;
AREAP pArea;
if( ISNIL( 1 ) || ISCHAR( 1 ) )
if( HB_ISNIL( 1 ) || HB_ISCHAR( 1 ) )
{
szAlias = hb_parc( 1 );
fNewArea = ISLOG( 2 ) && hb_parl( 2 );
fWait = ISLOG( 4 ) && hb_parl( 4 );
pCargo = ISBYREF( 3 ) ? hb_itemNew( NULL ) : NULL;
fNewArea = HB_ISLOG( 2 ) && hb_parl( 2 );
fWait = HB_ISLOG( 4 ) && hb_parl( 4 );
pCargo = HB_ISBYREF( 3 ) ? hb_itemNew( NULL ) : NULL;
pArea = hb_rddRequestArea( szAlias, pCargo, fNewArea, fWait );
if( pArea )

10
harbour/source/rdd/dbsql.c
View File

@@ -354,11 +354,11 @@ HB_FUNC( __DBSQL )
PHB_ITEM pFor = hb_param( 5, HB_IT_BLOCK );
PHB_ITEM pWhile = hb_param( 6, HB_IT_BLOCK );
PHB_ITEM pNext = hb_param( 7, HB_IT_NUMERIC );
PHB_ITEM pRecord = ISNIL( 8 ) ? NULL : hb_param( 8, HB_IT_ANY );
BOOL fRest = pWhile != NULL || ( ISLOG( 9 ) && hb_parl( 9 ) );
BOOL fAppend = ISLOG( 10 ) && hb_parl( 10 );
BOOL fInsert = ISLOG( 11 ) && hb_parl( 11 );
BOOL fRecno = ISLOG( 12 ) && hb_parl( 12 );
PHB_ITEM pRecord = HB_ISNIL( 8 ) ? NULL : hb_param( 8, HB_IT_ANY );
BOOL fRest = pWhile != NULL || ( HB_ISLOG( 9 ) && hb_parl( 9 ) );
BOOL fAppend = HB_ISLOG( 10 ) && hb_parl( 10 );
BOOL fInsert = HB_ISLOG( 11 ) && hb_parl( 11 );
BOOL fRecno = HB_ISLOG( 12 ) && hb_parl( 12 );
char * szSep = hb_parcx( 13 );
char * szDelim = hb_parcx( 14 );
char * szEsc = hb_parcx( 15 );

4
harbour/source/rdd/hbsix/sxfname.c
View File

@@ -70,9 +70,9 @@ HB_FUNC( SX_FNAMEPARSER )
pFileName = hb_fsFNameSplit( szFileName );
if( !ISLOG( 2 ) || !hb_parl( 2 ) )
if( ! HB_ISLOG( 2 ) || ! hb_parl( 2 ) )
pFileName->szPath = NULL;
if( !ISLOG( 3 ) || !hb_parl( 3 ) )
if( ! HB_ISLOG( 3 ) || ! hb_parl( 3 ) )
pFileName->szExtension = NULL;
if( !hb_setGetTrimFileName() )

18
harbour/source/rdd/hbsix/sxord.c
View File

@@ -91,15 +91,15 @@ static BOOL hb_sxOrdParam( LPDBORDERINFO pInfo )
{
memset( pInfo, 0, sizeof( DBORDERINFO ) );
if( ISCHAR( 1 ) )
if( HB_ISCHAR( 1 ) )
{
pInfo->itmOrder = hb_param( 1, HB_IT_STRING );
pInfo->atomBagName = hb_param( 2, HB_IT_STRING );
}
else if( ISNUM( 1 ) )
else if( HB_ISNUM( 1 ) )
{
pInfo->itmOrder = hb_param( 1, HB_IT_NUMERIC );
if( ! ISNIL( 2 ) ) /* hb_pcount() > 2 */
if( ! HB_ISNIL( 2 ) ) /* hb_pcount() > 2 */
{
pInfo->atomBagName = hb_param( 2, HB_IT_NUMERIC );
if( hb_parni( 2 ) <= 0 )
@@ -296,7 +296,7 @@ HB_FUNC( SX_CLRSCOPE )
if( hb_sxOrdParam( &Info ) )
{
int iScope = ISNUM( 1 ) ? hb_parni( 1 ) : 2;
int iScope = HB_ISNUM( 1 ) ? hb_parni( 1 ) : 2;
Info.itmResult = hb_itemNew( NULL );
if( iScope )
SELF_ORDINFO( pArea, DBOI_SCOPEBOTTOMCLEAR, &Info );
@@ -319,7 +319,7 @@ HB_FUNC( SX_SETSCOPE )
{
int iScope = hb_parni( 1 );
Info.itmResult = hb_itemNew( NULL );
if( !ISNIL( 2 ) )
if( ! HB_ISNIL( 2 ) )
Info.itmNewVal = hb_param( 2, HB_IT_ANY );
SELF_ORDINFO( pArea, ( USHORT ) ( iScope ? DBOI_SCOPEBOTTOM : DBOI_SCOPETOP ), &Info );
hb_itemReturnRelease( Info.itmResult );
@@ -461,7 +461,7 @@ HB_FUNC( SX_INDEXTYPE )
DBORDERINFO Info;
if( hb_sxOrdParam( &Info ) )
{
if( hb_pcount() == 1 && ISCHAR( 1 ) )
if( hb_pcount() == 1 && HB_ISCHAR( 1 ) )
{
Info.atomBagName = Info.itmOrder;
Info.itmOrder = NULL;
@@ -559,7 +559,7 @@ HB_FUNC( SX_KEYSKIP )
if( pArea )
{
if( SELF_SKIPRAW( pArea, ISNUM( 1 ) ? hb_parnl( 1 ) : 1 ) == HB_SUCCESS )
if( SELF_SKIPRAW( pArea, HB_ISNUM( 1 ) ? hb_parnl( 1 ) : 1 ) == HB_SUCCESS )
{
if( SELF_EOF( pArea, &fBEof ) == HB_SUCCESS && !fBEof )
fResult = SELF_BOF( pArea, &fBEof ) == HB_SUCCESS && !fBEof;
@@ -652,7 +652,7 @@ HB_FUNC( SX_SEEKLAST )
if( pArea && hb_pcount() > 0 )
{
PHB_ITEM pKey = hb_param( 1, HB_IT_ANY );
BOOL bSoftSeek = ISLOG( 2 ) && hb_parl( 2 );
BOOL bSoftSeek = HB_ISLOG( 2 ) && hb_parl( 2 );
if( SELF_SEEK( pArea, bSoftSeek, pKey, TRUE ) == HB_SUCCESS )
{
@@ -683,7 +683,7 @@ HB_FUNC( SX_WILDSEEK )
{
AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
char * szPattern = hb_parc( 1 );
BOOL fCont = ISLOG( 2 ) && hb_parl( 2 );
BOOL fCont = HB_ISLOG( 2 ) && hb_parl( 2 );
BOOL fFound = FALSE;
int iOrder = 0;

16
harbour/source/rdd/hbsix/sxtable.c
View File

@@ -199,7 +199,7 @@ HB_FUNC( SX_ROLLBACK )
int iArea = 0;
AREAP pArea;
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
{
iArea = hb_parni( 1 );
fRollChild = iArea == 0;
@@ -289,7 +289,7 @@ HB_FUNC( SX_SETPASS )
if( iPCount >=1 )
{
if( ISCHAR( 1 ) )
if( HB_ISCHAR( 1 ) )
{
AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
if( pArea )
@@ -303,8 +303,8 @@ HB_FUNC( SX_SETPASS )
}
else if( iPCount >= 2 || iPCount <= 4 )
{
if( ISCHAR( 1 ) && ISNUM( 2 ) && ( iPCount < 3 || ISCHAR( 3 ) ) &&
( iPCount < 4 || ISNUM( 4 ) ) )
if( HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) && ( iPCount < 3 || HB_ISCHAR( 3 ) ) &&
( iPCount < 4 || HB_ISNUM( 4 ) ) )
{
/* Set pending password for table which will be open
* 3-rd and 4-th parameters are optional Harbour extensions
@@ -327,7 +327,7 @@ HB_FUNC( SX_SETPASS )
hb_itemRelease( pItem );
}
}
else if( iPCount == 2 && ISNUM( 1 ) && ISCHAR( 2 ) )
else if( iPCount == 2 && HB_ISNUM( 1 ) && HB_ISCHAR( 2 ) )
{
AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
if( pArea )
@@ -474,11 +474,11 @@ HB_FUNC( _SXOPENINIT )
hb_itemRelease( pItem );
if( pInfo )
{
if( ISLOG( 2 ) )
if( HB_ISLOG( 2 ) )
pInfo->fShared = hb_parl( 2 );
if( ISLOG( 3 ) )
if( HB_ISLOG( 3 ) )
pInfo->fReadonly = hb_parl( 2 );
if( ISCHAR( 4 ) )
if( HB_ISCHAR( 4 ) )
{
char * szAlias = hb_parc( 1 );
if( szAlias && szAlias[ 0 ] )

34
harbour/source/rdd/usrrdd/usrrdd.c
View File

@@ -2902,7 +2902,7 @@ HB_FUNC( USRRDD_ID )
{
AREAP pArea;
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
pArea = hb_usrGetAreaPointer( hb_parni( 1 ) );
else
pArea = ( AREAP ) hb_parptr( 1 );
@@ -2915,7 +2915,7 @@ HB_FUNC( USRRDD_AREADATA )
{
AREAP pArea;
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
pArea = hb_usrGetAreaPointer( hb_parni( 1 ) );
else
pArea = ( AREAP ) hb_parptr( 1 );
@@ -2936,7 +2936,7 @@ HB_FUNC( USRRDD_AREARESULT )
{
AREAP pArea;
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
pArea = hb_usrGetAreaPointer( hb_parni( 1 ) );
else
pArea = ( AREAP ) hb_parptr( 1 );
@@ -2958,9 +2958,9 @@ HB_FUNC( USRRDD_SETBOF )
{
AREAP pArea;
if( ISLOG( 2 ) )
if( HB_ISLOG( 2 ) )
{
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
pArea = hb_usrGetAreaPointer( hb_parni( 1 ) );
else
pArea = ( AREAP ) hb_parptr( 1 );
@@ -2974,9 +2974,9 @@ HB_FUNC( USRRDD_SETEOF )
{
AREAP pArea;
if( ISLOG( 2 ) )
if( HB_ISLOG( 2 ) )
{
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
pArea = hb_usrGetAreaPointer( hb_parni( 1 ) );
else
pArea = ( AREAP ) hb_parptr( 1 );
@@ -2990,9 +2990,9 @@ HB_FUNC( USRRDD_SETFOUND )
{
AREAP pArea;
if( ISLOG( 2 ) )
if( HB_ISLOG( 2 ) )
{
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
pArea = hb_usrGetAreaPointer( hb_parni( 1 ) );
else
pArea = ( AREAP ) hb_parptr( 1 );
@@ -3006,9 +3006,9 @@ HB_FUNC( USRRDD_SETTOP )
{
AREAP pArea;
if( ISLOG( 2 ) )
if( HB_ISLOG( 2 ) )
{
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
pArea = hb_usrGetAreaPointer( hb_parni( 1 ) );
else
pArea = ( AREAP ) hb_parptr( 1 );
@@ -3022,9 +3022,9 @@ HB_FUNC( USRRDD_SETBOTTOM )
{
AREAP pArea;
if( ISLOG( 2 ) )
if( HB_ISLOG( 2 ) )
{
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
pArea = hb_usrGetAreaPointer( hb_parni( 1 ) );
else
pArea = ( AREAP ) hb_parptr( 1 );
@@ -3058,7 +3058,7 @@ static AREAP hb_usrGetAreaParam( int iParams )
if( iParams <= hb_pcount() )
{
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
pArea = hb_usrGetAreaPointer( hb_parni( 1 ) );
else
pArea = ( AREAP ) hb_parptr( 1 );
@@ -3346,11 +3346,11 @@ HB_FUNC_UR_SUPER( PUTREC )
if( pArea )
{
if( ISPOINTER( 2 ) )
if( HB_ISPOINTER( 2 ) )
{
hb_retni( SUPER_PUTREC( pArea, ( BYTE * ) hb_parptr( 2 ) ) );
}
else if( ISCHAR( 2 ) )
else if( HB_ISCHAR( 2 ) )
{
hb_retni( SUPER_PUTREC( pArea, ( BYTE * ) hb_parc( 2 ) ) );
}
@@ -4063,7 +4063,7 @@ HB_FUNC_UR_SUPER( COMPILE )
if( pArea )
{
if( ISCHAR( 2 ) )
if( HB_ISCHAR( 2 ) )
{
hb_retni( SUPER_COMPILE( pArea, ( BYTE * ) hb_parc( 2 ) ) );
}

4
harbour/source/rtl/at.c
View File

@@ -64,8 +64,8 @@ HB_FUNC( HB_AT )
if( pText && pSub )
{
ULONG ulTextLength = hb_itemGetCLen( pText );
ULONG ulStart = ISNUM( 3 ) ? hb_parnl( 3 ) : 1;
ULONG ulEnd = ISNUM( 4 ) ? ( ULONG ) hb_parnl( 4 ) : ulTextLength;
ULONG ulStart = HB_ISNUM( 3 ) ? hb_parnl( 3 ) : 1;
ULONG ulEnd = HB_ISNUM( 4 ) ? ( ULONG ) hb_parnl( 4 ) : ulTextLength;
ULONG ulPos;
if( ulStart > ulTextLength || ulEnd < ulStart )

4
harbour/source/rtl/box.c
View File

@@ -72,7 +72,7 @@ HB_FUNC( DISPBOX )
if( pszColor )
iColor = hb_gtColorToN( pszColor );
else if( ISNUM( 6 ) )
else if( HB_ISNUM( 6 ) )
iColor = hb_parni( 6 );
else
iColor = -1;
@@ -126,7 +126,7 @@ HB_FUNC( HB_DISPBOX )
if( pszColor )
iColor = hb_gtColorToN( pszColor );
else if( ISNUM( 6 ) )
else if( HB_ISNUM( 6 ) )
iColor = hb_parni( 6 );
else
iColor = -1;

22
harbour/source/rtl/cdpapi.c
View File

@@ -1186,7 +1186,7 @@ HB_FUNC( HB_CDPSELECT )
{
hb_retc( hb_cdpID() );
if( ISCHAR( 1 ) )
if( HB_ISCHAR( 1 ) )
hb_cdpSelectID( hb_parc( 1 ) );
}
@@ -1252,7 +1252,7 @@ HB_FUNC( HB_STRTOUTF8 )
if( ulLen )
{
PHB_CODEPAGE cdp = ISCHAR( 2 ) ? hb_cdpFind( hb_parc( 2 ) ) : hb_vmCDP();
PHB_CODEPAGE cdp = HB_ISCHAR( 2 ) ? hb_cdpFind( hb_parc( 2 ) ) : hb_vmCDP();
if( cdp )
{
@@ -1270,7 +1270,7 @@ HB_FUNC( HB_STRTOUTF8 )
HB_FUNC( HB_UTF8CHR )
{
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
{
char utf8Char[ HB_MAX_UTF8 ];
int iLen;
@@ -1295,7 +1295,7 @@ HB_FUNC( HB_UTF8TOSTR )
if( ulLen )
{
PHB_CODEPAGE cdp = ISCHAR( 2 ) ? hb_cdpFind( hb_parc( 2 ) ) : hb_vmCDP();
PHB_CODEPAGE cdp = HB_ISCHAR( 2 ) ? hb_cdpFind( hb_parc( 2 ) ) : hb_vmCDP();
if( cdp )
{
@@ -1320,7 +1320,7 @@ HB_FUNC( HB_UTF8SUBSTR )
char *szString = hb_parc( 1 );
int iPCount = hb_pcount();
if( szString && ( iPCount < 2 || ( ISNUM( 2 ) && ( iPCount < 3 || ISNUM( 3 ) ) ) ) )
if( szString && ( iPCount < 2 || ( HB_ISNUM( 2 ) && ( iPCount < 3 || HB_ISNUM( 3 ) ) ) ) )
{
char *szDest = NULL;
ULONG ulLen = hb_parclen( 1 ), ulDest = 0;
@@ -1352,7 +1352,7 @@ HB_FUNC( HB_UTF8LEFT )
{
char *szString = hb_parc( 1 );
if( szString && ISNUM( 2 ) )
if( szString && HB_ISNUM( 2 ) )
{
LONG lLen = hb_parnl( 2 );
ULONG ulDest = 0;
@@ -1375,7 +1375,7 @@ HB_FUNC( HB_UTF8RIGHT )
{
char *szString = hb_parc( 1 );
if( szString && ISNUM( 2 ) )
if( szString && HB_ISNUM( 2 ) )
{
LONG lLen = hb_parnl( 2 ), lFrom;
ULONG ulLen = hb_parclen( 1 ), ulDest = 0;
@@ -1403,7 +1403,7 @@ HB_FUNC( HB_UTF8PEEK )
{
char *szString = hb_parc( 1 );
if( szString && ISNUM( 2 ) )
if( szString && HB_ISNUM( 2 ) )
{
ULONG ulPos = hb_parnl( 2 );
ULONG ulLen = hb_parclen( 1 );
@@ -1421,7 +1421,7 @@ HB_FUNC( HB_UTF8POKE )
{
PHB_ITEM pText = hb_param( 1, HB_IT_STRING );
if( pText && ISNUM( 2 ) && ISNUM( 3 ) )
if( pText && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) )
{
char *szString = hb_itemGetCPtr( pText );
ULONG ulLen = hb_parclen( 1 ), ulPos;
@@ -1451,7 +1451,7 @@ HB_FUNC( HB_UTF8POKE )
memcpy( szResult, szString, ulPos );
u16toutf8( ( BYTE * ) & szResult[ulPos], uc );
memcpy( szResult + ulPos + n, szString + ulPos + n2, ulLen - ulPos - n2 );
if( ISBYREF( 1 ) )
if( HB_ISBYREF( 1 ) )
hb_storclen( szResult, ulLen - n2 + n, 1 );
hb_retclen_buffer( szResult, ulLen - n2 + n );
}
@@ -1467,7 +1467,7 @@ HB_FUNC( HB_UTF8STUFF )
{
char *szString = hb_parc( 1 );
if( szString && ISNUM( 2 ) && ISNUM( 3 ) && ISCHAR( 4 ) )
if( szString && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISCHAR( 4 ) )
{
ULONG ulLen = hb_parclen( 1 );
ULONG ulPos = hb_parnl( 2 );

2
harbour/source/rtl/chrasc.c
View File

@@ -57,7 +57,7 @@
/* converts an ASCII code to a character value */
HB_FUNC( CHR )
{
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
{
/* NOTE: CA-Cl*pper's compiler optimizer will be wrong for those
CHR() cases where the passed parameter is a constant which

2
harbour/source/rtl/colorind.c
View File

@@ -54,7 +54,7 @@
HB_FUNC( HB_COLORINDEX )
{
if( ISCHAR( 1 ) && ISNUM( 2 ) )
if( HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) )
{
char * pszColor = hb_parc( 1 );
ULONG ulColorPos;

18
harbour/source/rtl/console.c
View File

@@ -479,13 +479,13 @@ static void hb_conDevPos( SHORT iRow, SHORT iCol )
HB_FUNC( DEVPOS ) /* Sets the screen and/or printer position */
{
if( ISNUM( 1 ) && ISNUM( 2 ) )
if( HB_ISNUM( 1 ) && HB_ISNUM( 2 ) )
hb_conDevPos( ( SHORT ) hb_parni( 1 ), ( SHORT ) hb_parni( 2 ) );
}
HB_FUNC( SETPRC ) /* Sets the current printer row and column positions */
{
if( hb_pcount() == 2 && ISNUM( 1 ) && ISNUM( 2 ) )
if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) )
{
PHB_PRNPOS pPrnPos = hb_prnPos();
pPrnPos->row = ( USHORT ) hb_parni( 1 );
@@ -499,7 +499,7 @@ HB_FUNC( DEVOUT ) /* writes a single value to the current device (screen or prin
ULONG ulLen;
BOOL fFree;
if( ISCHAR( 2 ) )
if( HB_ISCHAR( 2 ) )
{
char szOldColor[ HB_CLRSTR_LEN ];
@@ -530,7 +530,7 @@ HB_FUNC( DISPOUT ) /* writes a single value to the screen, but is not affected b
ULONG ulLen;
BOOL bFreeReq;
if( ISCHAR( 2 ) )
if( HB_ISCHAR( 2 ) )
{
char szOldColor[ HB_CLRSTR_LEN ];
@@ -567,7 +567,7 @@ HB_FUNC( DISPOUTAT ) /* writes a single value to the screen at speficic position
ULONG ulLen;
BOOL bFreeReq;
if( ISCHAR( 4 ) )
if( HB_ISCHAR( 4 ) )
{
char szOldColor[ HB_CLRSTR_LEN ];
@@ -607,9 +607,9 @@ HB_FUNC( HB_DISPOUTAT )
pszString = hb_itemStringCon( hb_param( 3, HB_IT_ANY ), &ulLen, &bFreeReq );
if( ISCHAR( 4 ) )
if( HB_ISCHAR( 4 ) )
iColor = hb_gtColorToN( hb_parc( 4 ) );
else if( ISNUM( 4 ) )
else if( HB_ISNUM( 4 ) )
iColor = hb_parni( 4 );
else
iColor = -1;
@@ -631,9 +631,9 @@ HB_FUNC( HB_DISPOUTATBOX )
ULONG nStringLen = hb_parclen( 3 );
int iColor;
if( ISCHAR( 4 ) )
if( HB_ISCHAR( 4 ) )
iColor = hb_gtColorToN( hb_parc( 4 ) );
else if( ISNUM( 4 ) )
else if( HB_ISNUM( 4 ) )
iColor = hb_parni( 4 );
else
iColor = hb_gtGetCurrColor();

2
harbour/source/rtl/copyfile.c
View File

@@ -152,7 +152,7 @@ static BOOL hb_copyfile( const char * szSource, const char * szDest )
HB_FUNC( __COPYFILE )
{
if( ISCHAR( 1 ) && ISCHAR( 2 ) )
if( HB_ISCHAR( 1 ) && HB_ISCHAR( 2 ) )
{
if( ! hb_copyfile( hb_parc( 1 ), hb_parc( 2 ) ) )
hb_retl( FALSE );

12
harbour/source/rtl/dateshb.c
View File

@@ -79,7 +79,7 @@
HB_FUNC( CTOD )
{
if( ISCHAR( 1 ) )
if( HB_ISCHAR( 1 ) )
hb_retdl( hb_dateUnformat( hb_parc( 1 ), hb_setGetDateFormat() ) );
else
hb_errRT_BASE_SubstR( EG_ARG, 1119, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
@@ -87,7 +87,7 @@ HB_FUNC( CTOD )
HB_FUNC( HB_CTOD )
{
if( ISCHAR( 1 ) )
if( HB_ISCHAR( 1 ) )
{
const char * szFormat = hb_parc( 2 );
@@ -101,7 +101,7 @@ HB_FUNC( HB_CTOD )
HB_FUNC( DTOC )
{
if( ISDATETIME( 1 ) )
if( HB_ISDATETIME( 1 ) )
{
char szDate[ 9 ];
char szFormatted[ 11 ];
@@ -114,7 +114,7 @@ HB_FUNC( DTOC )
HB_FUNC( HB_DTOC )
{
if( ISDATETIME( 1 ) )
if( HB_ISDATETIME( 1 ) )
{
char szDate[ 9 ];
char szFormatted[ 11 ];
@@ -130,7 +130,7 @@ HB_FUNC( HB_DTOC )
HB_FUNC( DTOS )
{
if( ISDATETIME( 1 ) )
if( HB_ISDATETIME( 1 ) )
{
char szDate[ 9 ];
@@ -376,7 +376,7 @@ HB_FUNC( HB_TSTOSTR )
char szBuffer[ 24 ];
hb_timeStampStr( szBuffer, lDate, lTime );
if( ISLOG( 2 ) && hb_parl( 2 ) )
if( HB_ISLOG( 2 ) && hb_parl( 2 ) )
{
if( lTime == 0 )
{

6
harbour/source/rtl/dirdrive.c
View File

@@ -59,7 +59,7 @@
HB_FUNC( DIRCHANGE )
{
if( ISCHAR( 1 ) )
if( HB_ISCHAR( 1 ) )
hb_retni( hb_fsChDir( ( BYTE * ) hb_parc( 1 ) ) ? 0 : hb_fsError() );
else
hb_retni( F_ERROR );
@@ -70,7 +70,7 @@ HB_FUNC( DIRCHANGE )
HB_FUNC( MAKEDIR )
{
if( ISCHAR( 1 ) )
if( HB_ISCHAR( 1 ) )
hb_retni( hb_fsMkDir( ( BYTE * ) hb_parc( 1 ) ) ? 0 : hb_fsError() );
else
hb_retni( F_ERROR );
@@ -78,7 +78,7 @@ HB_FUNC( MAKEDIR )
HB_FUNC( DIRREMOVE )
{
if( ISCHAR( 1 ) )
if( HB_ISCHAR( 1 ) )
hb_retni( hb_fsRmDir( ( BYTE * ) hb_parc( 1 ) ) ? 0 : hb_fsError() );
else
hb_retni( F_ERROR );

4
harbour/source/rtl/diskspac.c
View File

@@ -84,7 +84,7 @@ HB_FUNC( DISKSPACE )
#if defined(HB_OS_DOS)
{
USHORT uiDrive = ISNUM( 1 ) ? hb_parni( 1 ) : 0;
USHORT uiDrive = HB_ISNUM( 1 ) ? hb_parni( 1 ) : 0;
union REGS regs;
regs.HB_XREGS.dx = uiDrive;
@@ -177,7 +177,7 @@ HB_FUNC( DISKSPACE )
}
#elif defined(HB_OS_OS2)
{
USHORT uiDrive = ISNUM( 1 ) ? hb_parni( 1 ) : 0;
USHORT uiDrive = HB_ISNUM( 1 ) ? hb_parni( 1 ) : 0;
struct _FSALLOCATE fsa;
/* Query level 1 info from filesystem */

4
harbour/source/rtl/disksphb.c
View File

@@ -71,7 +71,7 @@ HB_FUNC( HB_DISKSPACE )
{
char szPathBuf[ 4 ];
char * szPath = hb_parc( 1 );
USHORT uiType = ISNUM( 2 ) ? ( USHORT ) hb_parni( 2 ) : HB_DISK_AVAIL;
USHORT uiType = HB_ISNUM( 2 ) ? ( USHORT ) hb_parni( 2 ) : HB_DISK_AVAIL;
double dSpace = 0.0;
if( uiType > HB_DISK_TOTAL )
@@ -80,7 +80,7 @@ HB_FUNC( HB_DISKSPACE )
if( !szPath )
{
#ifdef HB_OS_HAS_DRIVE_LETTER
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
{
szPathBuf[ 0 ] = ( char ) hb_parni( 1 ) + 'A' - 1;
szPathBuf[ 1 ] = HB_OS_DRIVE_DELIM_CHR;

8
harbour/source/rtl/errapi.c
View File

@@ -200,7 +200,7 @@ HB_FUNC_STATIC( CANDEFAULT )
HB_FUNC_STATIC( _CANDEFAULT )
{
if( ISLOG( 1 ) )
if( HB_ISLOG( 1 ) )
{
PHB_ITEM pError = hb_stackSelfItem();
BOOL fCan = hb_parl( 1 );
@@ -222,7 +222,7 @@ HB_FUNC_STATIC( CANRETRY )
HB_FUNC_STATIC( _CANRETRY )
{
if( ISLOG( 1 ) )
if( HB_ISLOG( 1 ) )
{
PHB_ITEM pError = hb_stackSelfItem();
BOOL fCan = hb_parl( 1 );
@@ -244,7 +244,7 @@ HB_FUNC_STATIC( CANSUBST )
HB_FUNC_STATIC( _CANSUBST )
{
if( ISLOG( 1 ) )
if( HB_ISLOG( 1 ) )
{
PHB_ITEM pError = hb_stackSelfItem();
BOOL fCan = hb_parl( 1 );
@@ -501,7 +501,7 @@ HB_FUNC( DOSERROR )
hb_retni( pErrData->uiErrorDOS );
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
pErrData->uiErrorDOS = ( USHORT ) hb_parni( 1 );
}

2
harbour/source/rtl/filesys.c
View File

@@ -3273,5 +3273,5 @@ static BOOL hb_fsDisableWaitLocks( int iSet )
HB_FUNC( HB_DISABLEWAITLOCKS )
{
hb_retl( hb_fsDisableWaitLocks( ISLOG( 1 ) ? ( hb_parl( 1 ) ? 1 : 0 ) : -1 ) );
hb_retl( hb_fsDisableWaitLocks( HB_ISLOG( 1 ) ? ( hb_parl( 1 ) ? 1 : 0 ) : -1 ) );
}

2
harbour/source/rtl/fscopy.c
View File

@@ -96,7 +96,7 @@ HB_FUNC( HB_FCOPY )
{
USHORT uiError = 2;
if( ISCHAR( 1 ) && ISCHAR( 2 ) )
if( HB_ISCHAR( 1 ) && HB_ISCHAR( 2 ) )
{
hb_retni( hb_fsCopy( ( BYTE * ) hb_parc( 1 ),
( BYTE * ) hb_parc( 2 ) ) ? 0 : F_ERROR );

4
harbour/source/rtl/fssize.c
View File

@@ -140,6 +140,6 @@ HB_FOFFSET hb_fsFSize( BYTE * pszFileName, BOOL bUseDirEntry )
HB_FUNC( HB_FSIZE )
{
hb_retnint( ISCHAR( 1 ) ? hb_fsFSize( ( BYTE * ) hb_parc( 1 ),
ISLOG( 2 ) ? hb_parl( 2 ) : TRUE ) : 0 );
hb_retnint( HB_ISCHAR( 1 ) ? hb_fsFSize( ( BYTE * ) hb_parc( 1 ),
HB_ISLOG( 2 ) ? hb_parl( 2 ) : TRUE ) : 0 );
}

4
harbour/source/rtl/fstemp.c
View File

@@ -281,7 +281,7 @@ HB_FUNC( HB_FTEMPCREATE )
hb_retnint( ( HB_NHANDLE ) hb_fsCreateTemp( ( BYTE * ) hb_parc( 1 ),
( BYTE * ) hb_parc( 2 ),
( ULONG ) ( ISNUM( 3 ) ? ( ULONG ) hb_parnl( 3 ) : FC_NORMAL ),
( ULONG ) ( HB_ISNUM( 3 ) ? ( ULONG ) hb_parnl( 3 ) : FC_NORMAL ),
szName ) );
hb_storc( ( char * ) szName, 4 );
@@ -300,7 +300,7 @@ HB_FUNC( HB_FTEMPCREATEEX )
( BYTE * ) hb_parc( 2 ),
( BYTE * ) hb_parc( 3 ),
( BYTE * ) hb_parc( 4 ),
( ULONG ) ( ISNUM( 5 ) ? ( ULONG ) hb_parnl( 5 ) : FC_NORMAL ) ) );
( ULONG ) ( HB_ISNUM( 5 ) ? ( ULONG ) hb_parnl( 5 ) : FC_NORMAL ) ) );
hb_storc( ( char * ) szName, 1 );
}

4
harbour/source/rtl/gete.c
View File

@@ -177,7 +177,7 @@ HB_FUNC( HB_GETENV )
szValue = hb_getenv( pszName );
if( szValue && szValue[ 0 ] != '\0' )
{
if( ! ISLOG( 3 ) || hb_parl( 3 ) )
if( ! HB_ISLOG( 3 ) || hb_parl( 3 ) )
{
/* Convert from OS codepage */
BOOL fFree;
@@ -216,7 +216,7 @@ HB_FUNC( HB_SETENV )
char * pszValue = hb_parc( 2 );
BOOL fFreeName = FALSE, fFreeVal = FALSE;
if( ( ! ISLOG( 3 ) || hb_parl( 3 ) ) )
if( ( ! HB_ISLOG( 3 ) || hb_parl( 3 ) ) )
{
pszName = ( char * ) hb_osEncode( ( BYTE * ) pszName, &fFreeName );
if( pszValue )

16
harbour/source/rtl/gtfunc.c
View File

@@ -56,9 +56,9 @@
HB_FUNC( HB_SETDISPCP )
{
if( ISCHAR( 1 ) )
if( HB_ISCHAR( 1 ) )
{
if( hb_pcount() == 2 && ISLOG( 2 ) )
if( hb_pcount() == 2 && HB_ISLOG( 2 ) )
hb_gtSetDispCP( hb_parc( 1 ), NULL, hb_parl( 2 ) );
else
hb_gtSetDispCP( hb_parc( 1 ), hb_parc( 2 ), hb_parl( 3 ) );
@@ -69,7 +69,7 @@ HB_FUNC( HB_SETDISPCP )
HB_FUNC( HB_SETKEYCP )
{
if( ISCHAR( 1 ) )
if( HB_ISCHAR( 1 ) )
hb_gtSetKeyCP( hb_parc( 1 ), hb_parc( 2 ) );
else
hb_errRT_BASE_SubstR( EG_ARG, 1089, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
@@ -77,9 +77,9 @@ HB_FUNC( HB_SETKEYCP )
HB_FUNC( HB_SETTERMCP )
{
if( ISCHAR( 1 ) )
if( HB_ISCHAR( 1 ) )
{
if( hb_pcount() == 2 && ISLOG( 2 ) )
if( hb_pcount() == 2 && HB_ISLOG( 2 ) )
{
hb_gtSetDispCP( hb_parc( 1 ), NULL, hb_parl( 2 ) );
hb_gtSetKeyCP( hb_parc( 1 ), NULL );
@@ -96,7 +96,7 @@ HB_FUNC( HB_SETTERMCP )
HB_FUNC( HB_GTINFO )
{
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
{
HB_GT_INFO gtInfo;
@@ -121,8 +121,8 @@ HB_FUNC( HB_GTALERT )
{
hb_retni( hb_gtAlert( hb_param( 1, HB_IT_ANY ),
hb_param( 2, HB_IT_ANY ),
ISCHAR( 3 ) ? hb_gtColorToN( hb_parc( 3 ) ) : hb_parni( 3 ) /* iClrNorm */,
ISCHAR( 4 ) ? hb_gtColorToN( hb_parc( 4 ) ) : hb_parni( 4 ) /* iClrHigh */,
HB_ISCHAR( 3 ) ? hb_gtColorToN( hb_parc( 3 ) ) : hb_parni( 3 ) /* iClrNorm */,
HB_ISCHAR( 4 ) ? hb_gtColorToN( hb_parc( 4 ) ) : hb_parni( 4 ) /* iClrHigh */,
hb_parnd( 5 ) ) );
}

6
harbour/source/rtl/gx.c
View File

@@ -71,7 +71,7 @@ HB_FUNC( ISCOLOR )
HB_FUNC( NOSNOW )
{
if( ISLOG( 1 ) )
if( HB_ISLOG( 1 ) )
hb_gtSetSnowFlag( hb_parl( 1 ) );
}
@@ -80,9 +80,9 @@ HB_FUNC( SETMODE )
USHORT uiRows, uiCols;
hb_gtScrDim( &uiRows, &uiCols );
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
uiRows = ( USHORT ) hb_parni( 1 );
if( ISNUM( 2 ) )
if( HB_ISNUM( 2 ) )
uiCols = ( USHORT ) hb_parni( 2 );
hb_retl( hb_gtSetMode( uiRows, uiCols ) == HB_SUCCESS );

2
harbour/source/rtl/hbbit.c
View File

@@ -62,7 +62,7 @@
static BOOL hb_numParam( int iParam, HB_LONG * plNum )
{
if( ISNUM( iParam ) )
if( HB_ISNUM( iParam ) )
{
*plNum = hb_parnint( iParam );
return TRUE;

12
harbour/source/rtl/hbgtcore.c
View File

@@ -3401,9 +3401,9 @@ PHB_GT hb_gt_ItemBase( PHB_ITEM pItemGT )
HB_FUNC( HB_GTRELOAD )
{
hb_retl( hb_gtReload( hb_parc( 1 ),
ISNUM( 2 ) ? hb_numToHandle( hb_parnint( 1 ) ) : HB_STDIN_HANDLE,
ISNUM( 3 ) ? hb_numToHandle( hb_parnint( 2 ) ) : HB_STDOUT_HANDLE,
ISNUM( 4 ) ? hb_numToHandle( hb_parnint( 3 ) ) : HB_STDERR_HANDLE ) );
HB_ISNUM( 2 ) ? hb_numToHandle( hb_parnint( 1 ) ) : HB_STDIN_HANDLE,
HB_ISNUM( 3 ) ? hb_numToHandle( hb_parnint( 2 ) ) : HB_STDOUT_HANDLE,
HB_ISNUM( 4 ) ? hb_numToHandle( hb_parnint( 3 ) ) : HB_STDERR_HANDLE ) );
}
HB_FUNC( HB_GTCREATE )
@@ -3411,9 +3411,9 @@ HB_FUNC( HB_GTCREATE )
void * hGT;
hGT = hb_gtCreate( hb_parc( 1 ),
ISNUM( 2 ) ? hb_numToHandle( hb_parnint( 1 ) ) : HB_STDIN_HANDLE,
ISNUM( 3 ) ? hb_numToHandle( hb_parnint( 2 ) ) : HB_STDOUT_HANDLE,
ISNUM( 4 ) ? hb_numToHandle( hb_parnint( 3 ) ) : HB_STDERR_HANDLE );
HB_ISNUM( 2 ) ? hb_numToHandle( hb_parnint( 1 ) ) : HB_STDIN_HANDLE,
HB_ISNUM( 3 ) ? hb_numToHandle( hb_parnint( 2 ) ) : HB_STDOUT_HANDLE,
HB_ISNUM( 4 ) ? hb_numToHandle( hb_parnint( 3 ) ) : HB_STDERR_HANDLE );
if( hGT )
{

6
harbour/source/rtl/hbhex.c
View File

@@ -93,7 +93,7 @@ HB_FUNC( HB_NUMTOHEX )
BOOL fDefaultLen;
char ret[ 33 ];
if( ISNUM( 2 ) )
if( HB_ISNUM( 2 ) )
{
iLen = hb_parni( 2 );
iLen = ( iLen < 1 ) ? 1 : ( ( iLen > 32 ) ? 32 : iLen );
@@ -105,9 +105,9 @@ HB_FUNC( HB_NUMTOHEX )
fDefaultLen = 1;
}
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
ulNum = hb_parnint( 1 );
else if( ISPOINTER( 1 ) )
else if( HB_ISPOINTER( 1 ) )
ulNum = ( HB_PTRDIFF ) hb_parptr( 1 );
else
{

8
harbour/source/rtl/hbi18n1.c
View File

@@ -902,8 +902,8 @@ HB_FUNC( HB_I18N_CODEPAGE )
if( pI18N )
hb_retc( hb_i18n_setcodepage( pI18N, hb_parc( iParam ),
ISLOG( iParam + 1 ) && hb_parl( iParam + 1 ),
ISLOG( iParam + 2 ) && hb_parl( iParam + 2 ) ) );
HB_ISLOG( iParam + 1 ) && hb_parl( iParam + 1 ),
HB_ISLOG( iParam + 2 ) && hb_parl( iParam + 2 ) ) );
else
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
@@ -919,7 +919,7 @@ HB_FUNC( HB_I18N_PLURALFORM )
{
PHB_ITEM pOldForm = hb_itemNew( NULL );
PHB_ITEM pForm = hb_param( iParam, HB_IT_STRING | HB_IT_BLOCK );
BOOL fBase = ISLOG( iParam + 1 ) && hb_parl( iParam + 1 );
BOOL fBase = HB_ISLOG( iParam + 1 ) && hb_parl( iParam + 1 );
if( hb_i18n_getpluralform( pI18N, pOldForm, fBase ) )
hb_itemReturn( pOldForm );
@@ -997,7 +997,7 @@ HB_FUNC( HB_I18N_SET )
if( hb_pcount() > 0 )
{
if( ISNIL( 1 ) )
if( HB_ISNIL( 1 ) )
hb_vmSetI18N( NULL );
else
{

403
harbour/source/rtl/hbinet.c
View File

File diff suppressed because it is too large Load Diff

14
harbour/source/rtl/hbprocfn.c
View File

@@ -69,11 +69,11 @@ HB_FUNC( HB_PROCESSOPEN )
ULONG ulPID;
if( szName &&
( pStdIn || ISNIL( 2 ) ) &&
( pStdOut || ISNIL( 3 ) ) &&
( pStdErr || ISNIL( 4 ) ) &&
( ISLOG( 5 ) || ISNIL( 5 ) ) &&
( ISBYREF( 6 ) || ISNIL( 6 ) ) &&
( pStdIn || HB_ISNIL( 2 ) ) &&
( pStdOut || HB_ISNIL( 3 ) ) &&
( pStdErr || HB_ISNIL( 4 ) ) &&
( HB_ISLOG( 5 ) || HB_ISNIL( 5 ) ) &&
( HB_ISBYREF( 6 ) || HB_ISNIL( 6 ) ) &&
( !pStdIn || ( pStdIn != pStdOut && pStdIn != pStdErr ) ) )
{
phStdIn = pStdIn ? &hStdIn : NULL;
@@ -102,7 +102,7 @@ HB_FUNC( HB_PROCESSVALUE )
{
HB_FHANDLE hProcess = hb_numToHandle( hb_parnint( 1 ) );
if( hProcess != 0 && hProcess != FS_ERROR && ( hb_pcount() < 2 || ISLOG( 2 ) ) )
if( hProcess != 0 && hProcess != FS_ERROR && ( hb_pcount() < 2 || HB_ISLOG( 2 ) ) )
hb_retni( hb_fsProcessValue( hProcess, hb_pcount() < 2 || hb_parl( 2 ) ) );
else
hb_errRT_BASE_SubstR( EG_ARG, 4001, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
@@ -112,7 +112,7 @@ HB_FUNC( HB_PROCESSCLOSE )
{
HB_FHANDLE hProcess = hb_numToHandle( hb_parnint( 1 ) );
if( hProcess != 0 && hProcess != FS_ERROR && ( hb_pcount() < 2 || ISLOG( 2 ) ) )
if( hProcess != 0 && hProcess != FS_ERROR && ( hb_pcount() < 2 || HB_ISLOG( 2 ) ) )
hb_retl( hb_fsProcessClose( hProcess, hb_pcount() < 2 || hb_parl( 2 ) ) );
else
hb_errRT_BASE_SubstR( EG_ARG, 4001, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );

10
harbour/source/rtl/hbrandom.c
View File

@@ -73,9 +73,9 @@ HB_FUNC( HB_RANDOM )
{
double dRnd = hb_random_num();
if( ! ISNUM( 1 ) )
if( ! HB_ISNUM( 1 ) )
hb_retnd( dRnd );
else if( ! ISNUM( 2 ) )
else if( ! HB_ISNUM( 2 ) )
hb_retnd( dRnd * hb_parnd( 1 ) );
else
{
@@ -103,9 +103,9 @@ HB_FUNC( HB_RANDOMINT )
{
double dRnd = hb_random_num();
if( ! ISNUM( 1 ) )
if( ! HB_ISNUM( 1 ) )
hb_retni( dRnd >= 0.5 ? 0 : 1 );
else if( ! ISNUM( 2 ) )
else if( ! HB_ISNUM( 2 ) )
hb_retnint( ( HB_LONG ) ( 1 + ( dRnd * hb_parnint( 1 ) ) ) );
else
{
@@ -123,7 +123,7 @@ HB_FUNC( HB_RANDOMINT )
HB_FUNC( HB_RANDOMSEED )
{
srand( ISNUM( 1 ) ? ( unsigned ) hb_parni( 1 ) : ( unsigned ) hb_dateMilliSeconds() );
srand( HB_ISNUM( 1 ) ? ( unsigned ) hb_parni( 1 ) : ( unsigned ) hb_dateMilliSeconds() );
s_fInit = TRUE;
}

8
harbour/source/rtl/hbregex.c
View File

@@ -166,7 +166,7 @@ HB_FUNC( HB_REGEXCOMP )
int iFlags = HBREG_EXTENDED;
PHB_REGEX pRegEx;
if( ISLOG( 2 ) && !hb_parl( 2 ) )
if( HB_ISLOG( 2 ) && !hb_parl( 2 ) )
iFlags |= HBREG_ICASE;
if( hb_parl( 3 ) )
iFlags |= HBREG_NEWLINE;
@@ -204,7 +204,7 @@ HB_FUNC( HB_ATX )
pszString = hb_itemGetCPtr( pString );
ulLen = hb_itemGetCLen( pString );
pRegEx = hb_regexGet( hb_param( 1, HB_IT_ANY ),
ISLOG( 3 ) && !hb_parl( 3 ) ? HBREG_ICASE : 0 );
HB_ISLOG( 3 ) && !hb_parl( 3 ) ? HBREG_ICASE : 0 );
if( !pRegEx )
return;
@@ -261,7 +261,7 @@ static BOOL hb_regex( int iRequest )
return FALSE;
}
pRegEx = hb_regexGet( hb_param( 1, HB_IT_ANY ),
( ISLOG( 3 ) && !hb_parl( 3 ) ? HBREG_ICASE : 0 ) |
( HB_ISLOG( 3 ) && !hb_parl( 3 ) ? HBREG_ICASE : 0 ) |
( hb_parl( 4 ) ? HBREG_NEWLINE : 0 ) );
if( !pRegEx )
return FALSE;
@@ -364,7 +364,7 @@ static BOOL hb_regex( int iRequest )
PHB_ITEM pAtxArray;
int iMax = hb_parni( 5 ); /* max nuber of matches I want, 0 = unlimited */
int iGetMatch = hb_parni( 6 ); /* Gets if want only one single match or a sub-match */
BOOL fOnlyMatch = !ISLOG( 7 ) || hb_parl( 7 ); /* if TRUE returns only matches and sub-matches, not positions */
BOOL fOnlyMatch = ! HB_ISLOG( 7 ) || hb_parl( 7 ); /* if TRUE returns only matches and sub-matches, not positions */
ULONG ulOffSet = 0;
int iCount = 0;
int iSO, iEO;

2
harbour/source/rtl/hbstrsh.c
View File

@@ -60,7 +60,7 @@ HB_FUNC( HB_STRSHRINK )
if( pText )
{
long lLen = hb_itemGetCLen( pText );
long lShrinkBy = ISNUM( 2 ) ? hb_parnl( 2 ) : 1;
long lShrinkBy = HB_ISNUM( 2 ) ? hb_parnl( 2 ) : 1;
if( lShrinkBy > 0 )
{

4
harbour/source/rtl/hbtoken.c
View File

@@ -217,10 +217,10 @@ static BOOL hb_tokenParam( int iParam, ULONG ulSkip,
while( ulLen && szLine[ ulLen - 1 ] == szDelim[ 0 ] )
--ulLen;
}
if( ISLOG( iParam + 1 ) && hb_parl( iParam + 1 ) )
if( HB_ISLOG( iParam + 1 ) && hb_parl( iParam + 1 ) )
{
iFlags |= _HB_TOK_RESPECT_DQUOTE | _HB_TOK_RESPECT_SQUOTE;
if( ISLOG( iParam + 2 ) && hb_parl( iParam + 2 ) )
if( HB_ISLOG( iParam + 2 ) && hb_parl( iParam + 2 ) )
iFlags &= ~_HB_TOK_RESPECT_SQUOTE;
}
}

14
harbour/source/rtl/hbzlib.c
View File

@@ -104,9 +104,9 @@ HB_FUNC( HB_ZLIBVERSION )
*/
HB_FUNC( HB_ZCOMPRESSBOUND )
{
if( ISCHAR( 1 ) )
if( HB_ISCHAR( 1 ) )
hb_retnint( compressBound( hb_parclen( 1 ) ) );
else if( ISNUM( 1 ) )
else if( HB_ISNUM( 1 ) )
hb_retnint( compressBound( ( uLong ) hb_parnint( 1 ) ) );
else
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
@@ -135,7 +135,7 @@ HB_FUNC( HB_ZCOMPRESS )
if( ulLen )
{
PHB_ITEM pBuffer = ISBYREF( 2 ) ? hb_param( 2, HB_IT_STRING ) : NULL;
PHB_ITEM pBuffer = HB_ISBYREF( 2 ) ? hb_param( 2, HB_IT_STRING ) : NULL;
uLong ulDstLen;
char * pDest;
int iResult;
@@ -148,14 +148,14 @@ HB_FUNC( HB_ZCOMPRESS )
}
else
{
ulDstLen = ISNUM( 2 ) ? ( uLong ) hb_parnint( 2 ) :
ulDstLen = HB_ISNUM( 2 ) ? ( uLong ) hb_parnint( 2 ) :
compressBound( ulLen );
pDest = ( char * ) hb_xalloc( ulDstLen + 1 );
}
if( pDest )
{
if( ISNUM( 4 ) )
if( HB_ISNUM( 4 ) )
iResult = compress2( ( Bytef * ) pDest, &ulDstLen, ( Bytef * ) szData, ulLen, hb_parni( 4 ) );
else
iResult = compress( ( Bytef * ) pDest, &ulDstLen, ( Bytef * ) szData, ulLen );
@@ -191,7 +191,7 @@ HB_FUNC( HB_ZCOMPRESS )
*/
HB_FUNC( HB_ZUNCOMPRESS )
{
PHB_ITEM pBuffer = ISBYREF( 2 ) ? hb_param( 2, HB_IT_STRING ) : NULL;
PHB_ITEM pBuffer = HB_ISBYREF( 2 ) ? hb_param( 2, HB_IT_STRING ) : NULL;
char * szData = hb_parc( 1 );
if( szData )
@@ -212,7 +212,7 @@ HB_FUNC( HB_ZUNCOMPRESS )
}
else
{
ulDstLen = ISNUM( 2 ) ? ( uLong ) hb_parnint( 2 ) :
ulDstLen = HB_ISNUM( 2 ) ? ( uLong ) hb_parnint( 2 ) :
hb_zlibUncompressedSize( szData, ulLen );
pDest = ( char * ) hb_xalloc( ulDstLen + 1 );
}

20
harbour/source/rtl/hbzlibgz.c
View File

@@ -104,7 +104,7 @@ HB_FUNC( HB_GZOPEN )
HB_FUNC( HB_GZDOPEN )
{
char * cMode = hb_parc( 2 );
if( ISNUM( 1 ) && cMode )
if( HB_ISNUM( 1 ) && cMode )
{
gzFile gz = gzdopen( hb_parni( 1 ), cMode );
if( gz )
@@ -141,7 +141,7 @@ HB_FUNC( HB_GZCLOSE )
*/
HB_FUNC( HB_GZSETPARAMS )
{
if( ISNUM( 2 ) && ISNUM( 3 ) )
if( HB_ISNUM( 2 ) && HB_ISNUM( 3 ) )
{
gzFile gz = hb_gzParam( 1 );
if( gz )
@@ -156,7 +156,7 @@ HB_FUNC( HB_GZSETPARAMS )
*/
HB_FUNC( HB_GZREAD )
{
PHB_ITEM pBuffer = ISBYREF( 2 ) ? hb_param( 2, HB_IT_STRING ) : NULL;
PHB_ITEM pBuffer = HB_ISBYREF( 2 ) ? hb_param( 2, HB_IT_STRING ) : NULL;
if( pBuffer )
{
@@ -164,7 +164,7 @@ HB_FUNC( HB_GZREAD )
if( gz )
{
pBuffer = hb_itemUnShareString( pBuffer );
hb_retni( gzread( gz, hb_itemGetCPtr( pBuffer ), ISNUM( 3 ) ?
hb_retni( gzread( gz, hb_itemGetCPtr( pBuffer ), HB_ISNUM( 3 ) ?
( ULONG ) hb_parnl( 3 ) : hb_itemGetCLen( pBuffer ) ) );
}
}
@@ -182,7 +182,7 @@ HB_FUNC( HB_GZWRITE )
{
gzFile gz = hb_gzParam( 1 );
if( gz )
hb_retni( gzwrite( gz, szData, ISNUM( 3 ) ?
hb_retni( gzwrite( gz, szData, HB_ISNUM( 3 ) ?
( ULONG ) hb_parnl( 3 ) : hb_parclen( 2 ) ) );
}
else
@@ -236,7 +236,7 @@ HB_FUNC( HB_GZPUTS )
*/
HB_FUNC( HB_GZPUTC )
{
if( ISNUM( 2 ) )
if( HB_ISNUM( 2 ) )
{
gzFile gz = hb_gzParam( 1 );
if( gz )
@@ -261,7 +261,7 @@ HB_FUNC( HB_GZGETC )
*/
HB_FUNC( HB_GZUNGETC )
{
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
{
gzFile gz = hb_gzParam( 2 );
if( gz )
@@ -278,7 +278,7 @@ HB_FUNC( HB_GZFLUSH )
{
gzFile gz = hb_gzParam( 1 );
if( gz )
hb_retni( gzflush( gz, ISNUM( 2 ) ? hb_parni( 2 ) : Z_SYNC_FLUSH ) );
hb_retni( gzflush( gz, HB_ISNUM( 2 ) ? hb_parni( 2 ) : Z_SYNC_FLUSH ) );
}
/*
@@ -286,11 +286,11 @@ HB_FUNC( HB_GZFLUSH )
*/
HB_FUNC( HB_GZSEEK )
{
if( ISNUM( 2 ) )
if( HB_ISNUM( 2 ) )
{
gzFile gz = hb_gzParam( 1 );
if( gz )
hb_retnint( gzseek( gz, ( z_off_t ) hb_parnint( 2 ), ISNUM( 3 ) ?
hb_retnint( gzseek( gz, ( z_off_t ) hb_parnint( 2 ), HB_ISNUM( 3 ) ?
hb_parni( 3 ) : SEEK_SET ) );
}
else

24
harbour/source/rtl/inkey.c
View File

@@ -107,9 +107,9 @@ HB_FUNC( INKEY )
do
{
iKey = hb_inkey( uiPCount == 1 || ( uiPCount > 1 && ISNUM( 1 ) ),
iKey = hb_inkey( uiPCount == 1 || ( uiPCount > 1 && HB_ISNUM( 1 ) ),
hb_parnd( 1 ),
ISNUM( 2 ) ? hb_parni( 2 ) : hb_setGetEventMask() );
HB_ISNUM( 2 ) ? hb_parni( 2 ) : hb_setGetEventMask() );
if( iKey == 0 || !pInkeyBlock || !pInkeyBlock->after )
break;
@@ -169,7 +169,7 @@ HB_FUNC( __KEYBOARD )
/* Clear the typeahead buffer without reallocating the keyboard buffer */
hb_inkeyReset();
if( ISCHAR( 1 ) )
if( HB_ISCHAR( 1 ) )
hb_inkeySetText( hb_parc( 1 ), hb_parclen( 1 ) );
}
@@ -180,15 +180,15 @@ HB_FUNC( HB_KEYCLEAR )
HB_FUNC( HB_KEYPUT )
{
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
{
hb_inkeyPut( hb_parni( 1 ) );
}
else if( ISCHAR( 1 ) )
else if( HB_ISCHAR( 1 ) )
{
hb_inkeySetText( hb_parc( 1 ), hb_parclen( 1 ) );
}
else if( ISARRAY( 1 ) )
else if( HB_ISARRAY( 1 ) )
{
PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY );
ULONG ulIndex;
@@ -212,15 +212,15 @@ HB_FUNC( HB_KEYPUT )
HB_FUNC( HB_KEYINS )
{
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
{
hb_inkeyIns( hb_parni( 1 ) );
}
else if( ISCHAR( 1 ) )
else if( HB_ISCHAR( 1 ) )
{
hb_inkeySetText( hb_parc( 1 ), hb_parclen( 1 ) );
}
else if( ISARRAY( 1 ) )
else if( HB_ISARRAY( 1 ) )
{
PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY );
ULONG ulIndex;
@@ -244,16 +244,16 @@ HB_FUNC( HB_KEYINS )
HB_FUNC( NEXTKEY )
{
hb_retni( hb_inkeyNext( ISNUM( 1 ) ? hb_parni( 1 ) : hb_setGetEventMask() ) );
hb_retni( hb_inkeyNext( HB_ISNUM( 1 ) ? hb_parni( 1 ) : hb_setGetEventMask() ) );
}
HB_FUNC( LASTKEY )
{
hb_retni( hb_inkeyLast( ISNUM( 1 ) ? hb_parni( 1 ) : INKEY_ALL ) );
hb_retni( hb_inkeyLast( HB_ISNUM( 1 ) ? hb_parni( 1 ) : INKEY_ALL ) );
}
HB_FUNC( HB_SETLASTKEY )
{
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
hb_retni( hb_inkeySetLast( hb_parni( 1 ) ) );
}

2
harbour/source/rtl/itemseri.c
View File

@@ -1225,7 +1225,7 @@ HB_FUNC( HB_SERIALIZE )
if( pItem )
{
ULONG ulSize;
char * pBuffer = hb_itemSerialize( pItem, ISLOG( 2 ) && hb_parl( 2 ), &ulSize );
char * pBuffer = hb_itemSerialize( pItem, HB_ISLOG( 2 ) && hb_parl( 2 ), &ulSize );
hb_retclen_buffer( pBuffer, ulSize );
}
}

2
harbour/source/rtl/left.c
View File

@@ -60,7 +60,7 @@ HB_FUNC( LEFT )
{
PHB_ITEM pText = hb_param( 1, HB_IT_STRING );
if( pText && ISNUM( 2 ) )
if( pText && HB_ISNUM( 2 ) )
{
long lLen = hb_parnl( 2 );
if( lLen <= 0 )

8
harbour/source/rtl/math.c
View File

@@ -448,7 +448,7 @@ HB_FUNC( HB_MATHERMODE ) /* ([<nNewMode>]) -> <nOldMode> */
hb_retni( hb_mathGetErrMode() );
/* set new mode */
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
hb_mathSetErrMode( hb_parni( 1 ) );
}
@@ -651,7 +651,7 @@ HB_FUNC( HB_MATHERBLOCK ) /* ([<nNewErrorBlock>]) -> <nOldErrorBlock> */
HB_FUNC( EXP )
{
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
{
HB_MATH_EXCEPTION hb_exc;
double dResult, dArg = hb_parnd( 1 );
@@ -680,7 +680,7 @@ HB_FUNC( EXP )
HB_FUNC( LOG )
{
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
{
HB_MATH_EXCEPTION hb_exc;
double dResult, dArg = hb_parnd( 1 );
@@ -721,7 +721,7 @@ HB_FUNC( LOG )
HB_FUNC( SQRT )
{
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
{
HB_MATH_EXCEPTION hb_exc;
double dResult, dArg = hb_parnd( 1 );

4
harbour/source/rtl/maxrow.c
View File

@@ -79,7 +79,7 @@ HB_FUNC( MAXROW ) /* Return the maximum screen/window row number (zero origin) *
* in CT3, [druzus]
*/
if( ISLOG( 1 ) && hb_parl( 1 ) )
if( HB_ISLOG( 1 ) && hb_parl( 1 ) )
{
USHORT uiRows, uiCols;
hb_gtScrDim( &uiRows, &uiCols );
@@ -94,7 +94,7 @@ HB_FUNC( MAXCOL ) /* Return the maximum screen/window column number (zero origin
{
#ifdef HB_COMPAT_CT3
/* See notes about MaxRow(.T.) above */
if( ISLOG( 1 ) && hb_parl( 1 ) )
if( HB_ISLOG( 1 ) && hb_parl( 1 ) )
{
USHORT uiRows, uiCols;
hb_gtScrDim( &uiRows, &uiCols );

10
harbour/source/rtl/mlcfunc.c
View File

@@ -178,7 +178,7 @@ static PHB_EOL_INFO hb_mlGetEOLs( int iParam, int * piEOLs )
iEOLs = 1;
}
}
else if( ISARRAY( iParam ) )
else if( HB_ISARRAY( iParam ) )
{
PHB_ITEM pArray = hb_param( iParam, HB_IT_ARRAY );
ULONG ulSize = hb_arrayLen( pArray );
@@ -228,7 +228,7 @@ static char * hb_mlGetParams( int iParAdd, ULONG * pulLen, ULONG * pulLineLength
char * pszString = hb_parc( 1 );
if( pszString )
{
if( ISNUM( 2 ) )
if( HB_ISNUM( 2 ) )
{
if( hb_parnd( 2 ) <= 0 )
return NULL;
@@ -237,8 +237,8 @@ static char * hb_mlGetParams( int iParAdd, ULONG * pulLen, ULONG * pulLineLength
else
* pulLineLength = 79;
* pulLen = hb_parclen( 1 );
* pulTabSize = ISNUM( 3 + iParAdd ) ? hb_parnl( 3 + iParAdd ) : 4;
* pfWordWrap = ISLOG( 4 + iParAdd ) ? hb_parl( 4 + iParAdd ) : TRUE;
* pulTabSize = HB_ISNUM( 3 + iParAdd ) ? hb_parnl( 3 + iParAdd ) : 4;
* pfWordWrap = HB_ISLOG( 4 + iParAdd ) ? hb_parl( 4 + iParAdd ) : TRUE;
* pEOLs = hb_mlGetEOLs( 5 + iParAdd, piEOLs );
#ifdef HB_C52_STRICT
if( * pulLineLength > 254 )
@@ -381,7 +381,7 @@ HB_FUNC( MLCTOPOS )
if( pszString )
{
if( ulLineLength > 4 && ulLine && ISNUM( 4 ) )
if( ulLineLength > 4 && ulLine && HB_ISNUM( 4 ) )
{
while( --ulLine && ulOffset < ulLen )
ulOffset = hb_mlGetLine( pszString, ulLen, ulOffset,

16
harbour/source/rtl/mouse53.c
View File

@@ -79,13 +79,13 @@ HB_FUNC( MSETCURSOR )
{
hb_retl( hb_mouseGetCursor() );
if( ISLOG( 1 ) )
if( HB_ISLOG( 1 ) )
hb_mouseSetCursor( hb_parl( 1 ) );
}
HB_FUNC( MROW )
{
if( ISLOG( 1 ) && hb_parl( 1 ) )
if( HB_ISLOG( 1 ) && hb_parl( 1 ) )
{
int iRow, iCol;
@@ -98,7 +98,7 @@ HB_FUNC( MROW )
HB_FUNC( MCOL )
{
if( ISLOG( 1 ) && hb_parl( 1 ) )
if( HB_ISLOG( 1 ) && hb_parl( 1 ) )
{
int iRow, iCol;
@@ -111,7 +111,7 @@ HB_FUNC( MCOL )
HB_FUNC( MSETPOS )
{
if( ISNUM( 1 ) && ISNUM( 2 ) )
if( HB_ISNUM( 1 ) && HB_ISNUM( 2 ) )
hb_mouseSetPos( hb_parni( 1 ), hb_parni( 2 ) );
}
@@ -129,7 +129,7 @@ HB_FUNC( MDBLCLK )
{
hb_retni( hb_mouseGetDoubleClickSpeed() );
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
{
hb_mouseSetDoubleClickSpeed( hb_parni( 1 ) );
}
@@ -152,7 +152,7 @@ HB_FUNC( MSAVESTATE )
HB_FUNC( MRESTSTATE )
{
if( ISCHAR( 1 ) && hb_parclen( 1 ) == ( ULONG ) hb_mouseStorageSize() )
if( HB_ISCHAR( 1 ) && hb_parclen( 1 ) == ( ULONG ) hb_mouseStorageSize() )
{
hb_mouseRestoreState( ( BYTE * ) hb_parc( 1 ) );
}
@@ -162,8 +162,8 @@ HB_FUNC( MSETBOUNDS )
{
hb_mouseSetBounds( hb_parni( 1 ), /* Defaults to zero on bad type */
hb_parni( 2 ), /* Defaults to zero on bad type */
ISNUM( 3 ) ? hb_parni( 3 ) : hb_gtMaxRow(),
ISNUM( 4 ) ? hb_parni( 4 ) : hb_gtMaxCol() );
HB_ISNUM( 3 ) ? hb_parni( 3 ) : hb_gtMaxRow(),
HB_ISNUM( 4 ) ? hb_parni( 4 ) : hb_gtMaxCol() );
}
#endif

6
harbour/source/rtl/mousex.c
View File

@@ -69,11 +69,11 @@ HB_FUNC( SETMOUSE )
hb_retl( hb_mouseGetCursor() );
if( ISLOG( 1 ) )
if( HB_ISLOG( 1 ) )
hb_mouseSetCursor( hb_parl( 1 ) );
fRow = ISNUM( 2 );
fCol = ISNUM( 3 );
fRow = HB_ISNUM( 2 );
fCol = HB_ISNUM( 3 );
if( fRow || fCol )
{

4
harbour/source/rtl/mtran.c
View File

@@ -94,8 +94,8 @@ HB_FUNC( MEMOTRAN )
if( pString )
{
char * pszResult = ( char * ) hb_xgrab( hb_itemGetCLen( pString ) + 1 );
char cHardcr = ISCHAR( 2 ) ? *hb_parc( 2 ) : ';';
char cSoftcr = ISCHAR( 3 ) ? *hb_parc( 3 ) : ' ';
char cHardcr = HB_ISCHAR( 2 ) ? *hb_parc( 2 ) : ';';
char cSoftcr = HB_ISCHAR( 3 ) ? *hb_parc( 3 ) : ' ';
ULONG ulResultLen;
hb_strMemotran( pszResult, &ulResultLen, hb_itemGetCPtr( pString ), hb_itemGetCLen( pString ), cHardcr, cSoftcr );

2
harbour/source/rtl/natmsg.c
View File

@@ -110,7 +110,7 @@ HB_FUNC( __NATMSG )
if( hb_pcount() == 0 )
/* TODO: Replace this with Language API call. */
hb_retc( "Invalid argument" );
else if( ISNUM( 1 ) )
else if( HB_ISNUM( 1 ) )
hb_retc( hb_nationGetMsg( hb_parni( 1 ) ) );
else
hb_retc( NULL );

2
harbour/source/rtl/padc.c
View File

@@ -81,7 +81,7 @@ HB_FUNC( PADC )
char cPad;
long ulPad = ( ( ULONG ) lLen - ulSize ) >> 1;
cPad = ( ISCHAR( 3 ) ? *( hb_parc( 3 ) ) : ' ' );
cPad = ( HB_ISCHAR( 3 ) ? *( hb_parc( 3 ) ) : ' ' );
hb_xmemset( szResult, cPad, ulPad );
hb_xmemcpy( szResult + ulPad, szText, ulSize );
hb_xmemset( szResult + ulPad + ulSize, cPad,

2
harbour/source/rtl/padl.c
View File

@@ -80,7 +80,7 @@ HB_FUNC( PADL )
char * szResult = ( char * ) hb_xgrab( lLen + 1 );
char cPad;
cPad = ( ISCHAR( 3 ) ? *( hb_parc( 3 ) ) : ' ' );
cPad = ( HB_ISCHAR( 3 ) ? *( hb_parc( 3 ) ) : ' ' );
hb_xmemset( szResult, cPad, ( ULONG ) lLen - ulSize );
hb_xmemcpy( szResult + ( ULONG ) lLen - ulSize, szText, ulSize );

2
harbour/source/rtl/padr.c
View File

@@ -80,7 +80,7 @@ HB_FUNC( PADR )
char * szResult = ( char * ) hb_xgrab( lLen + 1 );
char cPad;
cPad = ( ISCHAR( 3 ) ? *( hb_parc( 3 ) ) : ' ' );
cPad = ( HB_ISCHAR( 3 ) ? *( hb_parc( 3 ) ) : ' ' );
hb_xmemcpy( szResult, szText, ulSize );
hb_xmemset( szResult + ulSize, cPad, ( ULONG ) lLen - ulSize );

48
harbour/source/rtl/philes.c
View File

@@ -61,10 +61,10 @@
HB_FUNC( FOPEN )
{
if( ISCHAR( 1 ) )
if( HB_ISCHAR( 1 ) )
{
hb_retnint( ( HB_NHANDLE ) hb_fsOpen( ( BYTE * ) hb_parc( 1 ),
ISNUM( 2 ) ? ( USHORT ) hb_parni( 2 ) : FO_READ | FO_COMPAT ) );
HB_ISNUM( 2 ) ? ( USHORT ) hb_parni( 2 ) : FO_READ | FO_COMPAT ) );
hb_fsSetFError( hb_fsError() );
}
else
@@ -77,10 +77,10 @@ HB_FUNC( FOPEN )
HB_FUNC( FCREATE )
{
if( ISCHAR( 1 ) )
if( HB_ISCHAR( 1 ) )
{
hb_retnint( ( HB_NHANDLE ) hb_fsCreate( ( BYTE * ) hb_parc( 1 ),
ISNUM( 2 ) ? hb_parni( 2 ) : FC_NORMAL ) );
HB_ISNUM( 2 ) ? hb_parni( 2 ) : FC_NORMAL ) );
hb_fsSetFError( hb_fsError() );
}
else
@@ -92,11 +92,11 @@ HB_FUNC( FCREATE )
HB_FUNC( HB_FCREATE )
{
if( ISCHAR( 1 ) )
if( HB_ISCHAR( 1 ) )
{
hb_retnint( ( HB_NHANDLE ) hb_fsCreateEx( ( BYTE * ) hb_parc( 1 ),
ISNUM( 2 ) ? hb_parni( 2 ) : FC_NORMAL,
ISNUM( 3 ) ? ( USHORT ) hb_parni( 3 ) : FO_COMPAT ) );
HB_ISNUM( 2 ) ? hb_parni( 2 ) : FC_NORMAL,
HB_ISNUM( 3 ) ? ( USHORT ) hb_parni( 3 ) : FO_COMPAT ) );
hb_fsSetFError( hb_fsError() );
}
else
@@ -112,7 +112,7 @@ HB_FUNC( FREAD )
USHORT uiError = 0;
ULONG ulRead = 0;
if( ISNUM( 1 ) && pBuffer && ISBYREF( 2 ) && ISNUM( 3 ) )
if( HB_ISNUM( 1 ) && pBuffer && HB_ISBYREF( 2 ) && HB_ISNUM( 3 ) )
{
ulRead = hb_parnl( 3 );
@@ -147,11 +147,11 @@ HB_FUNC( FWRITE )
{
USHORT uiError = 0;
if( ISNUM( 1 ) && ISCHAR( 2 ) )
if( HB_ISNUM( 1 ) && HB_ISCHAR( 2 ) )
{
ULONG nLen = hb_parclen( 2 );
if( ISNUM( 3 ) )
if( HB_ISNUM( 3 ) )
{
ULONG nWrite = ( ULONG ) hb_parnl( 3 );
if( nWrite < nLen )
@@ -176,7 +176,7 @@ HB_FUNC( FERROR )
HB_FUNC( FCLOSE )
{
USHORT uiError = 0;
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
{
hb_fsClose( hb_numToHandle( hb_parnint( 1 ) ) );
uiError = hb_fsError();
@@ -191,7 +191,7 @@ HB_FUNC( FERASE )
{
USHORT uiError = 3;
if( ISCHAR( 1 ) )
if( HB_ISCHAR( 1 ) )
{
hb_retni( hb_fsDelete( ( BYTE * ) hb_parc( 1 ) ) ? 0 : F_ERROR );
uiError = hb_fsError();
@@ -205,7 +205,7 @@ HB_FUNC( FRENAME )
{
USHORT uiError = 2;
if( ISCHAR( 1 ) && ISCHAR( 2 ) )
if( HB_ISCHAR( 1 ) && HB_ISCHAR( 2 ) )
{
hb_retni( hb_fsRename( ( BYTE * ) hb_parc( 1 ),
( BYTE * ) hb_parc( 2 ) ) ? 0 : F_ERROR );
@@ -220,11 +220,11 @@ HB_FUNC( FSEEK )
{
USHORT uiError = 0;
if( ISNUM( 1 ) && ISNUM( 2 ) )
if( HB_ISNUM( 1 ) && HB_ISNUM( 2 ) )
{
hb_retnint( hb_fsSeekLarge( hb_numToHandle( hb_parnint( 1 ) ),
hb_parnint( 2 ),
ISNUM( 3 ) ? ( USHORT ) hb_parni( 3 ) : FS_SET ) );
HB_ISNUM( 3 ) ? ( USHORT ) hb_parni( 3 ) : FS_SET ) );
uiError = hb_fsError();
}
else
@@ -237,7 +237,7 @@ HB_FUNC( FREADSTR )
{
USHORT uiError = 0;
if( ISNUM( 1 ) && ISNUM( 2 ) )
if( HB_ISNUM( 1 ) && HB_ISNUM( 2 ) )
{
ULONG ulToRead = ( ULONG ) hb_parnl( 2 );
@@ -318,7 +318,7 @@ HB_FUNC( HB_FEOF )
{
USHORT uiError = 6;
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
{
hb_retl( hb_fsEof( hb_numToHandle( hb_parnint( 1 ) ) ) );
uiError = hb_fsError();
@@ -332,7 +332,7 @@ HB_FUNC( HB_FCOMMIT )
{
USHORT uiError = 6;
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
{
hb_fsCommit( hb_numToHandle( hb_parnint( 1 ) ) );
uiError = hb_fsError();
@@ -346,7 +346,7 @@ HB_FUNC( HB_FLOCK )
USHORT uiError = 0;
BOOL fResult = FALSE;
if( ISNUM( 1 ) && ISNUM( 2 ) && ISNUM( 3 ) )
if( HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) )
{
fResult = hb_fsLockLarge( hb_numToHandle( hb_parnint( 1 ) ),
( HB_FOFFSET ) hb_parnint( 2 ),
@@ -363,7 +363,7 @@ HB_FUNC( HB_FUNLOCK )
USHORT uiError = 0;
BOOL fResult = FALSE;
if( ISNUM( 1 ) && ISNUM( 2 ) && ISNUM( 3 ) )
if( HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) )
{
fResult = hb_fsLockLarge( hb_numToHandle( hb_parnint( 1 ) ),
( HB_FOFFSET ) hb_parnint( 2 ),
@@ -393,13 +393,13 @@ HB_FUNC( HB_FSETDATETIME )
{
LONG lDate = -1, lTime = -1;
if( ISTIMESTAMP( 2 ) )
if( HB_ISTIMESTAMP( 2 ) )
hb_partdt( &lDate, &lTime, 2 );
else
{
if( ISDATE( 2 ) )
if( HB_ISDATE( 2 ) )
lDate = hb_pardl( 2 );
if( ISCHAR( 3 ) )
if( HB_ISCHAR( 3 ) )
{
int iHour, iMinutes, iSeconds, iMSec;
if( hb_timeStrGet( hb_parc( 3 ), &iHour, &iMinutes, &iSeconds, &iMSec ) )
@@ -416,7 +416,7 @@ HB_FUNC( HB_FGETDATETIME )
if( hb_fsGetFileTime( ( UCHAR * ) hb_parcx( 1 ), &lJulian, &lMillisec ) )
{
if( ISBYREF( 3 ) )
if( HB_ISBYREF( 3 ) )
{
char buf[ 13 ];
hb_timeStr( buf, lMillisec );

2
harbour/source/rtl/philes53.c
View File

@@ -60,7 +60,7 @@
HB_FUNC( FSETDEVMOD )
{
/* C53 checks only number of parameters: hb_pcount() == 2 */
if( ISNUM( 1 ) && ISNUM( 2 ) )
if( HB_ISNUM( 1 ) && HB_ISNUM( 2 ) )
{
hb_fsSetDevMode( hb_numToHandle( hb_parnint( 1 ) ), ( USHORT ) hb_parni( 2 ) );
hb_fsSetFError( hb_fsError() );

4
harbour/source/rtl/rat.c
View File

@@ -98,7 +98,7 @@ HB_FUNC( HB_RAT )
BOOL bFound = FALSE;
long lStart;
if( ISNUM( 3 ) )
if( HB_ISNUM( 3 ) )
{
lStart = hb_parnl( 3 );
if( lStart >= 1 )
@@ -109,7 +109,7 @@ HB_FUNC( HB_RAT )
else
lStart = 0;
if( ISNUM( 4 ) )
if( HB_ISNUM( 4 ) )
{
long lEnd = hb_parnl( 4 );

2
harbour/source/rtl/replic.c
View File

@@ -58,7 +58,7 @@
HB_FUNC( REPLICATE )
{
if( ISCHAR( 1 ) && ISNUM( 2 ) )
if( HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) )
{
long lTimes = hb_parnl( 2 );

2
harbour/source/rtl/right.c
View File

@@ -60,7 +60,7 @@ HB_FUNC( RIGHT )
{
PHB_ITEM pText = hb_param( 1, HB_IT_STRING );
if( pText && ISNUM( 2 ) )
if( pText && HB_ISNUM( 2 ) )
{
long lLen = hb_parnl( 2 );
if( lLen <= 0 )

2
harbour/source/rtl/round.c
View File

@@ -94,7 +94,7 @@ HB_FUNC( ROUND )
{
PHB_ITEM pNumber = hb_param( 1, HB_IT_NUMERIC );
if( pNumber && ISNUM( 2 ) )
if( pNumber && HB_ISNUM( 2 ) )
{
int iDec = hb_parni( 2 );

2
harbour/source/rtl/run.c
View File

@@ -60,7 +60,7 @@
HB_FUNC( __RUN )
{
if( ISCHAR( 1 ) && hb_gtSuspend() == 0 )
if( HB_ISCHAR( 1 ) && hb_gtSuspend() == 0 )
{
char * pszCommand = hb_itemGetC( hb_param( 1, HB_IT_STRING ) );
BOOL fFree;

6
harbour/source/rtl/saverest.c
View File

@@ -62,13 +62,13 @@ static void hb_getScreenRange( USHORT * pusMin, USHORT * pusMax,
{
iMax = hb_gtMaxRow();
iFrom = hb_parni( 1 );
iTo = ISNUM( 3 ) ? hb_parni( 3 ) : iMax;
iTo = HB_ISNUM( 3 ) ? hb_parni( 3 ) : iMax;
}
else
{
iMax = hb_gtMaxCol();
iFrom = hb_parni( 2 );
iTo = ISNUM( 4 ) ? hb_parni( 4 ) : iMax;
iTo = HB_ISNUM( 4 ) ? hb_parni( 4 ) : iMax;
}
if( iFrom < 0 )
@@ -112,7 +112,7 @@ HB_FUNC( SAVESCREEN )
HB_FUNC( RESTSCREEN )
{
if( ISCHAR( 5 ) )
if( HB_ISCHAR( 5 ) )
{
USHORT uiTop, uiLeft, uiBottom, uiRight;
BOOL fNoCheck = FALSE;

16
harbour/source/rtl/scroll.c
View File

@@ -79,7 +79,7 @@ HB_FUNC( SCROLL )
else if( iLeft > iMaxCol )
iLeft = iMaxCol;
if( ISNUM( 3 ) )
if( HB_ISNUM( 3 ) )
{
iBottom = hb_parni( 3 );
if( iBottom < 0 )
@@ -90,7 +90,7 @@ HB_FUNC( SCROLL )
else
iBottom = iMaxRow;
if( ISNUM( 4 ) )
if( HB_ISNUM( 4 ) )
{
iRight = hb_parni( 4 );
if( iRight < 0 )
@@ -135,7 +135,7 @@ HB_FUNC( HB_SCROLL )
else if( iLeft > iMaxCol )
iLeft = iMaxCol;
if( ISNUM( 3 ) )
if( HB_ISNUM( 3 ) )
{
iBottom = hb_parni( 3 );
if( iBottom < 0 )
@@ -146,7 +146,7 @@ HB_FUNC( HB_SCROLL )
else
iBottom = iMaxRow;
if( ISNUM( 4 ) )
if( HB_ISNUM( 4 ) )
{
iRight = hb_parni( 4 );
if( iRight < 0 )
@@ -157,16 +157,16 @@ HB_FUNC( HB_SCROLL )
else
iRight = iMaxCol;
if( ISNUM( 7 ) )
if( HB_ISNUM( 7 ) )
iColor = hb_parni( 7 );
else if( ISCHAR( 7 ) )
else if( HB_ISCHAR( 7 ) )
iColor = hb_gtColorToN( hb_parc( 7 ) );
else
iColor = -1;
if( ISNUM( 8 ) )
if( HB_ISNUM( 8 ) )
iChar = hb_parni( 8 );
else if( ISCHAR( 8 ) )
else if( HB_ISCHAR( 8 ) )
iChar = ( UCHAR ) hb_parc( 8 )[0];
else
iChar = -1;

8
harbour/source/rtl/setcolor.c
View File

@@ -76,7 +76,7 @@ HB_FUNC( SETCOLOR )
HB_FUNC( COLORSELECT )
{
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
hb_gtColorSelect( ( USHORT ) hb_parni( 1 ) );
}
@@ -86,7 +86,7 @@ HB_FUNC( SETBLINK )
hb_gtGetBlink( &bPreviousBlink );
if( ISLOG( 1 ) )
if( HB_ISLOG( 1 ) )
hb_gtSetBlink( hb_parl( 1 ) );
hb_retl( bPreviousBlink );
@@ -94,7 +94,7 @@ HB_FUNC( SETBLINK )
HB_FUNC( HB_COLORTON )
{
if( ISCHAR( 1 ) )
if( HB_ISCHAR( 1 ) )
hb_retni( hb_gtColorToN( hb_parc( 1 ) ) );
else
hb_retni( 0 );
@@ -102,7 +102,7 @@ HB_FUNC( HB_COLORTON )
HB_FUNC( HB_NTOCOLOR )
{
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
{
char szColorString[ 10 ];
int colors[ 1 ];

2
harbour/source/rtl/setcurs.c
View File

@@ -75,6 +75,6 @@ HB_FUNC( SETCURSOR )
hb_retni( uiCursor );
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
hb_gtSetCursor( ( USHORT ) hb_parni( 1 ) );
}

2
harbour/source/rtl/setpos.c
View File

@@ -66,7 +66,7 @@
HB_FUNC( SETPOS ) /* Sets the screen position */
{
if( ISNUM( 1 ) && ISNUM( 2 ) )
if( HB_ISNUM( 1 ) && HB_ISNUM( 2 ) )
hb_gtSetPos( ( SHORT ) hb_parni( 1 ), ( SHORT ) hb_parni( 2 ) );
}

2
harbour/source/rtl/shadow.c
View File

@@ -60,7 +60,7 @@ HB_FUNC( HB_SHADOW )
( USHORT ) hb_parni( 2 ),
( USHORT ) hb_parni( 3 ),
( USHORT ) hb_parni( 4 ),
ISNUM( 5 ) ? ( BYTE ) hb_parni( 5 ) : 7 );
HB_ISNUM( 5 ) ? ( BYTE ) hb_parni( 5 ) : 7 );
}
HB_FUNC( HB_CLRAREA )

4
harbour/source/rtl/strc.c
View File

@@ -93,7 +93,7 @@ HB_FUNC( HB_STRCDECODE )
if( pText )
{
ULONG ulLen = hb_itemGetCLen( pText );
BOOL fCont = ISLOG( 2 ) && hb_parl( 2 );
BOOL fCont = HB_ISLOG( 2 ) && hb_parl( 2 );
if( ulLen > 0 )
{
const char * pszSrc = hb_itemGetCPtr( pText );
@@ -148,7 +148,7 @@ HB_FUNC( HB_STRCDECODE )
--ulLen;
}
}
if( ulLen == 0 && ( !fCont || ISBYREF( 2 ) ) )
if( ulLen == 0 && ( !fCont || HB_ISBYREF( 2 ) ) )
{
hb_retclen_buffer( pszDst, ulDst );
hb_storl( fCont, 2 );

4
harbour/source/rtl/strmatch.c
View File

@@ -316,7 +316,7 @@ BOOL hb_strMatchFile( const char * szString, const char * szPattern )
HB_FUNC( HB_WILDMATCH )
{
hb_retl( ( ! ISCHAR( 1 ) || ! ISCHAR( 2 ) ) ? FALSE :
hb_retl( ( ! HB_ISCHAR( 1 ) || ! HB_ISCHAR( 2 ) ) ? FALSE :
hb_parl( 3 ) ? hb_strMatchWildExact( hb_parc( 2 ), hb_parc( 1 ) ) :
hb_strMatchWild( hb_parc( 2 ), hb_parc( 1 ) ) );
}
@@ -328,6 +328,6 @@ HB_FUNC( HB_WILDMATCHI )
HB_FUNC( HB_FILEMATCH )
{
hb_retl( ( ! ISCHAR( 1 ) || ! ISCHAR( 2 ) ) ? FALSE :
hb_retl( ( ! HB_ISCHAR( 1 ) || ! HB_ISCHAR( 2 ) ) ? FALSE :
hb_strMatchFile( hb_parc( 1 ), hb_parc( 2 ) ) );
}

4
harbour/source/rtl/strpeek.c
View File

@@ -60,7 +60,7 @@ HB_FUNC( STRPEEK )
{
PHB_ITEM pText = hb_param( 1, HB_IT_STRING );
if( pText && ISNUM( 2 ) )
if( pText && HB_ISNUM( 2 ) )
{
ULONG ulPos = hb_parnl( 2 );
@@ -78,7 +78,7 @@ HB_FUNC( STRPOKE )
{
PHB_ITEM pText = hb_param( 1, HB_IT_STRING );
if( pText && ISNUM( 2 ) && ISNUM( 3 ) )
if( pText && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) )
{
ULONG ulPos = hb_parnl( 2 );

2
harbour/source/rtl/strtoexp.c
View File

@@ -90,7 +90,7 @@ HB_FUNC( HB_STRTOEXP )
break;
}
}
if( iType == 7 || ( ISLOG( 2 ) && hb_parl( 2 ) ) )
if( iType == 7 || ( HB_ISLOG( 2 ) && hb_parl( 2 ) ) )
{
ulRet = ulLen + 3 + uQ;
pDst = pszResult = ( char * ) hb_xgrab( ulRet + 1 );

4
harbour/source/rtl/strtran.c
View File

@@ -77,7 +77,7 @@ HB_FUNC( STRTRAN )
const char * szReplace;
ULONG ulStart;
ulStart = ( ISNUM( 4 ) ? hb_parnl( 4 ) : 1 );
ulStart = ( HB_ISNUM( 4 ) ? hb_parnl( 4 ) : 1 );
if( !ulStart )
{
@@ -102,7 +102,7 @@ HB_FUNC( STRTRAN )
ulReplace = 0;
}
if( ISNUM( 5 ) )
if( HB_ISNUM( 5 ) )
{
ulCount = hb_parnl( 5 );
bAll = FALSE;

2
harbour/source/rtl/stuff.c
View File

@@ -55,7 +55,7 @@
/* replaces characters in a string */
HB_FUNC( STUFF )
{
if( ISCHAR( 1 ) && ISNUM( 2 ) && ISNUM( 3 ) && ISCHAR( 4 ) )
if( HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISCHAR( 4 ) )
{
char * szText = hb_parc( 1 );
ULONG ulText = hb_parclen( 1 );

4
harbour/source/rtl/substr.c
View File

@@ -60,7 +60,7 @@ HB_FUNC( SUBSTR )
{
PHB_ITEM pText = hb_param( 1, HB_IT_STRING );
if( pText && ISNUM( 2 ) )
if( pText && HB_ISNUM( 2 ) )
{
long lPos = hb_parnl( 2 );
long lSize = ( long ) hb_itemGetCLen( pText );
@@ -82,7 +82,7 @@ HB_FUNC( SUBSTR )
if( hb_pcount() >= 3 )
{
if( ISNUM( 3 ) )
if( HB_ISNUM( 3 ) )
{
lLen = hb_parnl( 3 );

4
harbour/source/rtl/tone.c
View File

@@ -55,6 +55,6 @@
HB_FUNC( TONE )
{
if( ISNUM( 1 ) )
hb_gtTone( hb_parnd( 1 ), ( ISNUM( 2 ) ? hb_parnd( 2 ) : 1.0 ) );
if( HB_ISNUM( 1 ) )
hb_gtTone( hb_parnd( 1 ), ( HB_ISNUM( 2 ) ? hb_parnd( 2 ) : 1.0 ) );
}

4
harbour/source/rtl/trace.c
View File

@@ -55,12 +55,12 @@
HB_FUNC( HB_TRACESTATE )
{
hb_retni( hb_tracestate( ISNUM( 1 ) ? hb_parni( 1 ) : -1 ) );
hb_retni( hb_tracestate( HB_ISNUM( 1 ) ? hb_parni( 1 ) : -1 ) );
}
HB_FUNC( HB_TRACELEVEL )
{
hb_retni( hb_tracelevel( ISNUM( 1 ) ? hb_parni( 1 ) : -1 ) );
hb_retni( hb_tracelevel( HB_ISNUM( 1 ) ? hb_parni( 1 ) : -1 ) );
}
HB_FUNC( HB_TRACESTRING )

2
harbour/source/rtl/transfrm.c
View File

@@ -966,7 +966,7 @@ HB_FUNC( TRANSFORM )
hb_retclen_buffer( szResult, ( ulParamS && ulResultPos > ulParamS ) ? ulParamS : ulResultPos );
}
}
else if( pPic || ISNIL( 2 ) ) /* Picture is an empty string or NIL */
else if( pPic || HB_ISNIL( 2 ) ) /* Picture is an empty string or NIL */
{
if( HB_IS_STRING( pValue ) )
{

24
harbour/source/rtl/valtype.c
View File

@@ -88,52 +88,52 @@ HB_FUNC( HB_ISBYREF )
HB_FUNC( HB_ISNIL )
{
hb_retl( ISNIL( 1 ) );
hb_retl( HB_ISNIL( 1 ) );
}
HB_FUNC( HB_ISNUMERIC )
{
hb_retl( ISNUM( 1 ) );
hb_retl( HB_ISNUM( 1 ) );
}
HB_FUNC( HB_ISLOGICAL )
{
hb_retl( ISLOG( 1 ) );
hb_retl( HB_ISLOG( 1 ) );
}
HB_FUNC( HB_ISDATE )
{
hb_retl( ISDATE( 1 ) );
hb_retl( HB_ISDATE( 1 ) );
}
HB_FUNC( HB_ISDATETIME )
{
hb_retl( ISDATETIME( 1 ) );
hb_retl( HB_ISDATETIME( 1 ) );
}
HB_FUNC( HB_ISTIMESTAMP )
{
hb_retl( ISTIMESTAMP( 1 ) );
hb_retl( HB_ISTIMESTAMP( 1 ) );
}
HB_FUNC( HB_ISBLOCK )
{
hb_retl( ISBLOCK( 1 ) );
hb_retl( HB_ISBLOCK( 1 ) );
}
HB_FUNC( HB_ISPOINTER )
{
hb_retl( ISPOINTER( 1 ) );
hb_retl( HB_ISPOINTER( 1 ) );
}
HB_FUNC( HB_ISSYMBOL )
{
hb_retl( ISSYMBOL( 1 ) );
hb_retl( HB_ISSYMBOL( 1 ) );
}
HB_FUNC( HB_ISSTRING )
{
hb_retl( ISCHAR( 1 ) );
hb_retl( HB_ISCHAR( 1 ) );
}
HB_FUNC( HB_ISCHAR )
@@ -153,12 +153,12 @@ HB_FUNC( HB_ISARRAY )
HB_FUNC( HB_ISOBJECT )
{
hb_retl( ISOBJECT( 1 ) );
hb_retl( HB_ISOBJECT( 1 ) );
}
HB_FUNC( HB_ISHASH )
{
hb_retl( ISHASH( 1 ) );
hb_retl( HB_ISHASH( 1 ) );
}
HB_FUNC( HB_ISNULL )

2
harbour/source/rtl/word.c
View File

@@ -59,7 +59,7 @@
HB_FUNC( WORD )
{
if( ISNUM( 1 ) )
if( HB_ISNUM( 1 ) )
hb_retni( hb_parni( 1 ) );
else
hb_errRT_BASE( EG_ARG, 1091, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );

38
harbour/source/vm/arrayshb.c
View File

@@ -90,7 +90,7 @@ HB_FUNC( ARRAY )
for( iParam = 1; iParam <= iPCount; iParam++ )
{
if( ! ISNUM( iParam ) )
if( ! HB_ISNUM( iParam ) )
{
bError = TRUE;
break;
@@ -137,7 +137,7 @@ HB_FUNC( ASIZE )
{
PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY );
if( pArray && ISNUM( 2 ) )
if( pArray && HB_ISNUM( 2 ) )
{
long lSize = hb_parnl( 2 );
@@ -213,7 +213,7 @@ HB_FUNC( AFILL )
LONG lStart = hb_parnl( 3 ), lCount = hb_parnl( 4 );
/* Explicy lCount of 0 - Nothing to do! */
if( ISNUM( 4 ) && lCount == 0 )
if( HB_ISNUM( 4 ) && lCount == 0 )
return;
/* Clipper aborts if negative start. */
else if( lStart < 0 )
@@ -234,8 +234,8 @@ HB_FUNC( AFILL )
ulCount = ( ULONG ) lCount;
hb_arrayFill( pArray,
pValue,
ISNUM( 3 ) ? &ulStart : NULL,
ISNUM( 4 ) ? &ulCount : NULL );
HB_ISNUM( 3 ) ? &ulStart : NULL,
HB_ISNUM( 4 ) ? &ulCount : NULL );
}
}
else
@@ -260,8 +260,8 @@ HB_FUNC( ASCAN )
ULONG ulCount = hb_parnl( 4 );
hb_retnint( hb_arrayScan( pArray, pValue,
ISNUM( 3 ) ? &ulStart : NULL,
ISNUM( 4 ) ? &ulCount : NULL,
HB_ISNUM( 3 ) ? &ulStart : NULL,
HB_ISNUM( 4 ) ? &ulCount : NULL,
FALSE ) );
}
else
@@ -280,8 +280,8 @@ HB_FUNC( HB_ASCAN )
ULONG ulCount = hb_parnl( 4 );
hb_retnint( hb_arrayScan( pArray, pValue,
ISNUM( 3 ) ? &ulStart : NULL,
ISNUM( 4 ) ? &ulCount : NULL,
HB_ISNUM( 3 ) ? &ulStart : NULL,
HB_ISNUM( 4 ) ? &ulCount : NULL,
hb_parl( 5 ) ) );
}
else
@@ -299,8 +299,8 @@ HB_FUNC( HB_RASCAN )
ULONG ulCount = hb_parnl( 4 );
hb_retnint( hb_arrayRevScan( pArray, pValue,
ISNUM( 3 ) ? &ulStart : NULL,
ISNUM( 4 ) ? &ulCount : NULL,
HB_ISNUM( 3 ) ? &ulStart : NULL,
HB_ISNUM( 4 ) ? &ulCount : NULL,
hb_parl( 5 ) ) );
}
else
@@ -318,7 +318,7 @@ HB_FUNC( HB_AINS )
if( lPos == 0 )
lPos = 1;
if( ISLOG( 4 ) && hb_parl( 4 ) )
if( HB_ISLOG( 4 ) && hb_parl( 4 ) )
{
ULONG ulLen = hb_arrayLen( pArray ) + 1;
if( lPos >= 1 && ( ULONG ) lPos <= ulLen )
@@ -327,7 +327,7 @@ HB_FUNC( HB_AINS )
if( hb_arrayIns( pArray, lPos ) )
{
if( ! ISNIL( 3 ) )
if( ! HB_ISNIL( 3 ) )
hb_arraySet( pArray, lPos, hb_param( 3, HB_IT_ANY ) );
}
@@ -348,7 +348,7 @@ HB_FUNC( HB_ADEL )
if( hb_arrayDel( pArray, lPos ) )
{
if( ISLOG( 3 ) && hb_parl( 3 ) )
if( HB_ISLOG( 3 ) && hb_parl( 3 ) )
hb_arraySize( pArray, hb_arrayLen( pArray ) - 1 );
}
@@ -371,8 +371,8 @@ HB_FUNC( AEVAL )
hb_arrayEval( pArray,
pBlock,
ISNUM( 3 ) ? &ulStart : NULL,
ISNUM( 4 ) ? &ulCount : NULL );
HB_ISNUM( 3 ) ? &ulStart : NULL,
HB_ISNUM( 4 ) ? &ulCount : NULL );
hb_itemReturn( hb_stackItemFromBase( 1 ) ); /* AEval() returns the array itself */
}
@@ -396,9 +396,9 @@ HB_FUNC( ACOPY )
hb_arrayCopy( pSrcArray,
pDstArray,
ISNUM( 3 ) ? &ulStart : NULL,
ISNUM( 4 ) ? &ulCount : NULL,
ISNUM( 5 ) ? &ulTarget : NULL );
HB_ISNUM( 3 ) ? &ulStart : NULL,
HB_ISNUM( 4 ) ? &ulCount : NULL,
HB_ISNUM( 5 ) ? &ulTarget : NULL );
}
hb_itemReturn( hb_stackItemFromBase( 2 ) ); /* ACopy() returns the target array */

4
harbour/source/vm/asort.c
View File

@@ -260,8 +260,8 @@ HB_FUNC( ASORT )
ULONG ulCount = hb_parnl( 3 );
hb_arraySort( pArray,
ISNUM( 2 ) ? &ulStart : NULL,
ISNUM( 3 ) ? &ulCount : NULL,
HB_ISNUM( 2 ) ? &ulStart : NULL,
HB_ISNUM( 3 ) ? &ulCount : NULL,
hb_param( 4, HB_IT_BLOCK ) );
hb_itemReturn( pArray ); /* ASort() returns the array itself */

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

@@ -1791,7 +1791,7 @@ PHB_SYMB hb_objGetMethod( PHB_ITEM pObject, PHB_SYMB pMessage,
if( pMsg == s___msgEnumIndex.pDynSym )
{
hb_itemPutNL( hb_stackReturnItem(), pEnum->item.asEnum.offset );
if( hb_pcount() > 0 && ISNUM( 1 ) )
if( hb_pcount() > 0 && HB_ISNUM( 1 ) )
pEnum->item.asEnum.offset = hb_itemGetNL( hb_param( 1, HB_IT_ANY ) );
return &s___msgEnumIndex;
}
@@ -4133,7 +4133,7 @@ HB_FUNC( __CLSSYNCWAIT )
}
}
if( ISNUM( 2 ) )
if( HB_ISNUM( 2 ) )
{
double dTimeOut = hb_parnd( 2 );
if( dTimeOut > 0 )
@@ -4254,7 +4254,7 @@ static HARBOUR hb___msgClassSel( void )
nParam = hb_pcount() > 0 ? ( USHORT ) hb_parni( 1 ) : HB_MSGLISTALL;
nScope = hb_pcount() > 1 ? ( USHORT ) hb_parni( 2 ) : 0;
lFull = hb_pcount() > 2 && ISLOG( 3 ) && hb_parl( 3 );
lFull = hb_pcount() > 2 && HB_ISLOG( 3 ) && hb_parl( 3 );
pReturn = hb_itemArrayNew( pClass->uiMethods );
do
@@ -4876,7 +4876,7 @@ HB_FUNC( __CLSGETPROPERTIES )
ULONG ulLimit, ulCount;
USHORT uiScope = HB_OO_CLSTP_PERSIST;
if( ISLOG( 2 ) && hb_parl( 2 ) )
if( HB_ISLOG( 2 ) && hb_parl( 2 ) )
uiScope |= HB_OO_CLSTP_EXPORTED;
ulCount = 0;
@@ -4977,7 +4977,7 @@ HB_FUNC( __CLSUNLOCKDEF )
PHB_ITEM pClsDst = hb_param( 1, HB_IT_BYREF ),
pClsSrc = hb_param( 2, HB_IT_ANY );
if( pClsDst && pClsSrc && HB_IS_NIL( pClsDst ) && !ISBYREF( 2 ) )
if( pClsDst && pClsSrc && HB_IS_NIL( pClsDst ) && ! HB_ISBYREF( 2 ) )
{
/* intentional low level hack to eliminate race condition in
* unprotected readonly access.

4
harbour/source/vm/cmdarg.c
View File

@@ -388,14 +388,14 @@ int hb_cmdargNum( const char * pszName )
HB_FUNC( HB_ARGCHECK )
{
hb_retl( ISCHAR( 1 ) ? hb_cmdargCheck( hb_parc( 1 ) ) : FALSE );
hb_retl( HB_ISCHAR( 1 ) ? hb_cmdargCheck( hb_parc( 1 ) ) : FALSE );
}
/* Returns the value of an internal switch */
HB_FUNC( HB_ARGSTRING )
{
if( ISCHAR( 1 ) )
if( HB_ISCHAR( 1 ) )
{
char * pszValue = hb_cmdargString( hb_parc( 1 ) );

2
harbour/source/vm/eval.c
View File

@@ -576,7 +576,7 @@ HB_FUNC( HB_EXECMSG )
{
int iParams = hb_pcount();
if( iParams >= 2 && ISSYMBOL( 1 ) )
if( iParams >= 2 && HB_ISSYMBOL( 1 ) )
{
PHB_ITEM pBase = hb_stackBaseItem();
pBase->item.asSymbol.paramcnt = pBase->item.asSymbol.paramdeclcnt = 0;

6
harbour/source/vm/hashfunc.c
View File

@@ -309,7 +309,7 @@ HB_FUNC( HB_HCOPY )
ulStart = hb_parnl( 3 );
if( !ulStart )
++ulStart;
ulCount = ISNUM( 4 ) ? ( ULONG ) hb_parnl( 4 ) : ulLen - ulStart + 1;
ulCount = HB_ISNUM( 4 ) ? ( ULONG ) hb_parnl( 4 ) : ulLen - ulStart + 1;
while( ulCount-- )
{
@@ -382,7 +382,7 @@ HB_FUNC( HB_HEVAL )
ulStart = hb_parnl( 3 );
if( !ulStart )
++ulStart;
ulCount = ISNUM( 4 ) ? ( ULONG ) hb_parnl( 4 ) : ulLen - ulStart + 1;
ulCount = HB_ISNUM( 4 ) ? ( ULONG ) hb_parnl( 4 ) : ulLen - ulStart + 1;
while( ulCount-- )
{
@@ -421,7 +421,7 @@ HB_FUNC( HB_HSCAN )
ulStart = hb_parnl( 3 );
if( !ulStart )
++ulStart;
ulCount = ISNUM( 4 ) ? ( ULONG ) hb_parnl( 4 ) : ulLen - ulStart + 1;
ulCount = HB_ISNUM( 4 ) ? ( ULONG ) hb_parnl( 4 ) : ulLen - ulStart + 1;
if( HB_IS_BLOCK( pValue ) )
{

6
harbour/source/vm/hvm.c
View File

@@ -11286,7 +11286,7 @@ HB_FUNC( __SETPROFILER )
hb_retl( FALSE );
#else
hb_retl( hb_bProfiler );
if( ISLOG( 1 ) )
if( HB_ISLOG( 1 ) )
hb_bProfiler = hb_parl( 1 );
#endif
}
@@ -11300,7 +11300,7 @@ HB_FUNC( __TRACEPRGCALLS )
HB_STACK_TLS_PRELOAD
#if defined( HB_PRG_TRACE )
hb_retl( hb_bTracePrgCalls );
if( ISLOG( 1 ) )
if( HB_ISLOG( 1 ) )
hb_bTracePrgCalls = hb_parl( 1 );
#else
hb_retl( FALSE );
@@ -11343,7 +11343,7 @@ HB_FUNC( ERRORLEVEL )
hb_retni( s_nErrorLevel );
/* NOTE: This should be ISNUM( 1 ), but it's sort of a Clipper bug that it
/* NOTE: This should be HB_ISNUM( 1 ), but it's sort of a Clipper bug that it
accepts other types also and considers them zero. [vszakats] */
if( hb_pcount() >= 1 )

14
harbour/source/vm/memvars.c
View File

@@ -467,7 +467,7 @@ void hb_memvarGetRefer( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb )
if( pMemvar )
{
if( HB_IS_BYREF( pMemvar ) && !HB_IS_ENUM( pMemvar ) )
if( HB_IS_BYREF( pMemvar ) && ! HB_IS_ENUM( pMemvar ) )
hb_itemCopy( pItem, pMemvar );
else
{
@@ -492,7 +492,7 @@ void hb_memvarGetRefer( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb )
pMemvar = hb_dynsymGetMemvar( pDyn );
if( pMemvar )
{
if( HB_IS_BYREF( pMemvar ) && !HB_IS_ENUM( pMemvar ) )
if( HB_IS_BYREF( pMemvar ) && ! HB_IS_ENUM( pMemvar ) )
hb_itemCopy( pItem, pMemvar );
else
{
@@ -1178,7 +1178,7 @@ HB_FUNC( __MVRELEASE )
HB_STACK_TLS_PRELOAD
int iCount = hb_pcount();
if( iCount && ISCHAR( 1 ) )
if( iCount && HB_ISCHAR( 1 ) )
{
BOOL bIncludeVar;
const char * pszMask;
@@ -1461,7 +1461,7 @@ HB_FUNC( __MVSAVE )
HB_STACK_TLS_PRELOAD
/* Clipper also checks for the number of arguments here */
if( hb_pcount() == 3 && ISCHAR( 1 ) && ISCHAR( 2 ) && ISLOG( 3 ) )
if( hb_pcount() == 3 && HB_ISCHAR( 1 ) && HB_ISCHAR( 2 ) && HB_ISLOG( 3 ) )
{
PHB_ITEM pError = NULL;
PHB_FNAME pFileName;
@@ -1534,9 +1534,9 @@ HB_FUNC( __MVRESTORE )
/* Clipper checks for the number of arguments here here, but we cannot
in Harbour since we have two optional parameters as an extension. */
#ifdef HB_C52_STRICT
if( hb_pcount() == 2 && ISCHAR( 1 ) && ISLOG( 2 ) )
if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISLOG( 2 ) )
#else
if( ISCHAR( 1 ) && ISLOG( 2 ) )
if( HB_ISCHAR( 1 ) && HB_ISLOG( 2 ) )
#endif
{
HB_STACK_TLS_PRELOAD
@@ -1593,7 +1593,7 @@ HB_FUNC( __MVRESTORE )
bIncludeMask = TRUE;
#else
pszMask = hb_memvarGetMask( 3 );
bIncludeMask = !ISLOG( 4 ) || hb_parl( 4 );
bIncludeMask = ! HB_ISLOG( 4 ) || hb_parl( 4 );
#endif
while( hb_fsRead( fhnd, buffer, HB_MEM_REC_LEN ) == HB_MEM_REC_LEN )

4
harbour/source/vm/proc.c
View File

@@ -107,11 +107,11 @@ HB_FUNC( PROCFILE )
#ifndef HB_C52_STRICT
PHB_SYMB pSym = NULL;
if( ISSYMBOL( 1 ) )
if( HB_ISSYMBOL( 1 ) )
{
pSym = hb_itemGetSymbol( hb_param( 1, HB_IT_SYMBOL ) );
}
else if( ISCHAR( 1 ) )
else if( HB_ISCHAR( 1 ) )
{
PHB_DYNS pDynSym = hb_dynsymFindName( hb_parc( 1 ) );

14
harbour/source/vm/thread.c
View File

@@ -1221,7 +1221,7 @@ HB_FUNC( HB_THREADWAIT )
int iThreads = -1;
pThreads = pAlloc;
if( ISARRAY( 1 ) )
if( HB_ISARRAY( 1 ) )
{
PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY );
int iLen = ( int ) hb_arrayLen( pArray ), i;
@@ -1252,13 +1252,13 @@ HB_FUNC( HB_THREADWAIT )
if( iThreads > 0 )
{
if( ISNUM( 2 ) )
if( HB_ISNUM( 2 ) )
{
double dTimeOut = hb_parnd( 2 );
ulMilliSec = dTimeOut > 0 ? ( ULONG ) ( dTimeOut * 1000 ) : 0;
}
if( ISLOG( 3 ) )
if( HB_ISLOG( 3 ) )
fAll = hb_parl( 3 );
hb_retni( hb_threadWait( pThreads, iThreads, fAll, ulMilliSec ) );
@@ -1303,7 +1303,7 @@ HB_FUNC( HB_THREADTERMINATEALL )
HB_FUNC( HB_THREADONCE )
{
PHB_ITEM pItem = hb_param( 1, HB_IT_ANY );
if( pItem && ISBYREF( 1 ) && ( HB_IS_NIL( pItem ) || HB_IS_LOGICAL( pItem ) ) )
if( pItem && HB_ISBYREF( 1 ) && ( HB_IS_NIL( pItem ) || HB_IS_LOGICAL( pItem ) ) )
{
HB_STACK_TLS_PRELOAD
BOOL fFirstCall = FALSE;
@@ -2216,7 +2216,7 @@ HB_FUNC( HB_MUTEXLOCK )
if( pItem )
{
HB_STACK_TLS_PRELOAD
if( ISNUM( 2 ) )
if( HB_ISNUM( 2 ) )
{
ULONG ulMilliSec = 0;
double dTimeOut = hb_parnd( 2 );
@@ -2265,7 +2265,7 @@ HB_FUNC( HB_MUTEXSUBSCRIBE )
HB_STACK_TLS_PRELOAD
PHB_ITEM pResult;
if( ISNUM( 2 ) )
if( HB_ISNUM( 2 ) )
{
ULONG ulMilliSec = 0;
double dTimeOut = hb_parnd( 2 );
@@ -2296,7 +2296,7 @@ HB_FUNC( HB_MUTEXSUBSCRIBENOW )
HB_STACK_TLS_PRELOAD
PHB_ITEM pResult;
if( ISNUM( 2 ) )
if( HB_ISNUM( 2 ) )
{
ULONG ulMilliSec = 0;
double dTimeOut = hb_parnd( 2 );