* 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)
422 lines
11 KiB
C
422 lines
11 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* The Array API (Harbour level)
|
|
*
|
|
* Copyright 1999 Antonio Linares <alinares@fivetech.com>
|
|
* www - http://www.harbour-project.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this software; see the file COPYING. If not, write to
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
|
*
|
|
* As a special exception, the Harbour Project gives permission for
|
|
* additional uses of the text contained in its release of Harbour.
|
|
*
|
|
* The exception is that, if you link the Harbour libraries with other
|
|
* files to produce an executable, this does not by itself cause the
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
* Your use of that executable is in no way restricted on account of
|
|
* linking the Harbour library code into it.
|
|
*
|
|
* This exception does not however invalidate any other reasons why
|
|
* the executable file might be covered by the GNU General Public License.
|
|
*
|
|
* This exception applies only to the code released by the Harbour
|
|
* Project under the name Harbour. If you copy code from other
|
|
* Harbour Project or Free Software Foundation releases into a copy of
|
|
* Harbour, as the General Public License permits, the exception does
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
* anyone as to the status of such modified files, you must delete
|
|
* this exception notice from them.
|
|
*
|
|
* If you write modifications of your own for Harbour, it is your choice
|
|
* whether to permit this exception to apply to your modifications.
|
|
* If you do not wish that, delete this exception notice.
|
|
*
|
|
*/
|
|
|
|
#include "hbapi.h"
|
|
#include "hbstack.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbapierr.h"
|
|
#include "hbapilng.h"
|
|
|
|
/* This function creates an array item using 'iDimension' as an index
|
|
* to retrieve the number of elements from the parameter list.
|
|
*/
|
|
static void hb_arrayNewRagged( PHB_ITEM pArray, int iDimension )
|
|
{
|
|
ULONG ulElements;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_arrayNewRagged(%p, %d)", pArray, iDimension));
|
|
|
|
ulElements = ( ULONG ) hb_parnl( iDimension );
|
|
|
|
/* create an array */
|
|
hb_arrayNew( pArray, ulElements );
|
|
|
|
if( ++iDimension <= hb_pcount() )
|
|
{
|
|
/* call self recursively to create next dimensions
|
|
*/
|
|
while( ulElements )
|
|
hb_arrayNewRagged( hb_arrayGetItemPtr( pArray, ulElements-- ), iDimension );
|
|
}
|
|
}
|
|
|
|
HB_FUNC( ARRAY )
|
|
{
|
|
int iPCount = hb_pcount();
|
|
|
|
if( iPCount > 0 )
|
|
{
|
|
BOOL bError = FALSE;
|
|
int iParam;
|
|
|
|
for( iParam = 1; iParam <= iPCount; iParam++ )
|
|
{
|
|
if( ! HB_ISNUM( iParam ) )
|
|
{
|
|
bError = TRUE;
|
|
break;
|
|
}
|
|
|
|
if( hb_parnl( iParam ) < 0 ) /* || hb_parnl( iParam ) <= 4096 */
|
|
{
|
|
#ifdef HB_C52_STRICT
|
|
hb_errRT_BASE( EG_BOUND, 1131, NULL, hb_langDGetErrorDesc( EG_ARRDIMENSION ), 0 );
|
|
#else
|
|
hb_errRT_BASE( EG_BOUND, 1131, NULL, hb_langDGetErrorDesc( EG_ARRDIMENSION ), HB_ERR_ARGS_BASEPARAMS );
|
|
#endif
|
|
bError = TRUE;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if( ! bError )
|
|
hb_arrayNewRagged( hb_stackReturnItem(), 1 );
|
|
}
|
|
}
|
|
|
|
HB_FUNC( AADD )
|
|
{
|
|
PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY );
|
|
|
|
if( pArray )
|
|
{
|
|
PHB_ITEM pValue = hb_param( 2, HB_IT_ANY );
|
|
|
|
if( pValue && hb_arrayAdd( pArray, pValue ) )
|
|
hb_itemReturn( pValue );
|
|
else
|
|
hb_errRT_BASE( EG_BOUND, 1187, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 1123, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
/* NOTE: CA-Cl*pper 5.3 and older will return NIL on bad parameter, 5.3a,b
|
|
will throw a runtime error. [vszakats] */
|
|
|
|
HB_FUNC( ASIZE )
|
|
{
|
|
PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY );
|
|
|
|
if( pArray && HB_ISNUM( 2 ) )
|
|
{
|
|
long lSize = hb_parnl( 2 );
|
|
|
|
hb_arraySize( pArray, HB_MAX( lSize, 0 ) );
|
|
|
|
hb_itemReturn( pArray ); /* ASize() returns the array itself */
|
|
}
|
|
#ifdef HB_COMPAT_C53 /* From CA-Cl*pper 5.3a */
|
|
else
|
|
#ifdef HB_C52_STRICT
|
|
hb_errRT_BASE( EG_ARG, 2023, NULL, HB_ERR_FUNCNAME, 0 );
|
|
#else
|
|
hb_errRT_BASE( EG_ARG, 2023, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
#endif
|
|
#endif
|
|
}
|
|
|
|
HB_FUNC( ATAIL )
|
|
{
|
|
PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY );
|
|
|
|
if( pArray )
|
|
hb_arrayLast( pArray, hb_stackReturnItem() );
|
|
}
|
|
|
|
HB_FUNC( AINS )
|
|
{
|
|
PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY );
|
|
|
|
if( pArray )
|
|
{
|
|
long lPos = hb_parnl( 2 );
|
|
|
|
if( lPos == 0 )
|
|
lPos = 1;
|
|
|
|
hb_arrayIns( pArray, lPos );
|
|
|
|
hb_itemReturn( pArray ); /* AIns() returns the array itself */
|
|
}
|
|
}
|
|
|
|
HB_FUNC( ADEL )
|
|
{
|
|
PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY );
|
|
|
|
if( pArray )
|
|
{
|
|
long lPos = hb_parnl( 2 );
|
|
|
|
if( lPos == 0 )
|
|
lPos = 1;
|
|
|
|
hb_arrayDel( pArray, lPos );
|
|
|
|
hb_itemReturn( pArray ); /* ADel() returns the array itself */
|
|
}
|
|
}
|
|
|
|
HB_FUNC( AFILL )
|
|
{
|
|
PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY );
|
|
|
|
if( pArray )
|
|
{
|
|
PHB_ITEM pValue = hb_param( 2, HB_IT_ANY );
|
|
|
|
hb_itemReturn( pArray ); /* AFill() returns the array itself */
|
|
|
|
if( pValue )
|
|
{
|
|
ULONG ulStart, ulCount;
|
|
LONG lStart = hb_parnl( 3 ), lCount = hb_parnl( 4 );
|
|
|
|
/* Explicy lCount of 0 - Nothing to do! */
|
|
if( HB_ISNUM( 4 ) && lCount == 0 )
|
|
return;
|
|
/* Clipper aborts if negative start. */
|
|
else if( lStart < 0 )
|
|
return;
|
|
/* Clipper allows Start to be of wrong type, or 0, and corrects it to 1. */
|
|
else if( lStart == 0 )
|
|
lStart = 1;
|
|
if( lCount < 0 )
|
|
{
|
|
/* Clipper allows the Count to be negative, if start is 1, and corrects it to maximum elements. */
|
|
if( lStart == 1 )
|
|
ulCount = 0;
|
|
/* Clipper aborts if negative count and start is not at 1. */
|
|
else
|
|
return;
|
|
}
|
|
ulStart = ( ULONG ) lStart;
|
|
ulCount = ( ULONG ) lCount;
|
|
hb_arrayFill( pArray,
|
|
pValue,
|
|
HB_ISNUM( 3 ) ? &ulStart : NULL,
|
|
HB_ISNUM( 4 ) ? &ulCount : NULL );
|
|
}
|
|
}
|
|
else
|
|
#ifdef HB_C52_STRICT
|
|
/* NOTE: In CA-Cl*pper AFILL() is written in a manner that it will
|
|
call AEVAL() to do the job, so the error (if any) will also be
|
|
thrown by AEVAL(). [vszakats] */
|
|
hb_errRT_BASE( EG_ARG, 2017, NULL, "AEVAL", 0 );
|
|
#else
|
|
hb_errRT_BASE( EG_ARG, 6004, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
#endif
|
|
}
|
|
|
|
HB_FUNC( ASCAN )
|
|
{
|
|
PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY );
|
|
PHB_ITEM pValue = hb_param( 2, HB_IT_ANY );
|
|
|
|
if( pArray && pValue )
|
|
{
|
|
ULONG ulStart = hb_parnl( 3 );
|
|
ULONG ulCount = hb_parnl( 4 );
|
|
|
|
hb_retnint( hb_arrayScan( pArray, pValue,
|
|
HB_ISNUM( 3 ) ? &ulStart : NULL,
|
|
HB_ISNUM( 4 ) ? &ulCount : NULL,
|
|
FALSE ) );
|
|
}
|
|
else
|
|
hb_retni( 0 );
|
|
}
|
|
|
|
/* Same as ASCAN() but has an additional parameter to force exact comparison. */
|
|
HB_FUNC( HB_ASCAN )
|
|
{
|
|
PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY );
|
|
PHB_ITEM pValue = hb_param( 2, HB_IT_ANY );
|
|
|
|
if( pArray && pValue )
|
|
{
|
|
ULONG ulStart = hb_parnl( 3 );
|
|
ULONG ulCount = hb_parnl( 4 );
|
|
|
|
hb_retnint( hb_arrayScan( pArray, pValue,
|
|
HB_ISNUM( 3 ) ? &ulStart : NULL,
|
|
HB_ISNUM( 4 ) ? &ulCount : NULL,
|
|
hb_parl( 5 ) ) );
|
|
}
|
|
else
|
|
hb_retni( 0 );
|
|
}
|
|
|
|
HB_FUNC( HB_RASCAN )
|
|
{
|
|
PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY );
|
|
PHB_ITEM pValue = hb_param( 2, HB_IT_ANY );
|
|
|
|
if( pArray && pValue )
|
|
{
|
|
ULONG ulStart = hb_parnl( 3 );
|
|
ULONG ulCount = hb_parnl( 4 );
|
|
|
|
hb_retnint( hb_arrayRevScan( pArray, pValue,
|
|
HB_ISNUM( 3 ) ? &ulStart : NULL,
|
|
HB_ISNUM( 4 ) ? &ulCount : NULL,
|
|
hb_parl( 5 ) ) );
|
|
}
|
|
else
|
|
hb_retni( 0 );
|
|
}
|
|
|
|
HB_FUNC( HB_AINS )
|
|
{
|
|
PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY );
|
|
|
|
if( pArray )
|
|
{
|
|
long lPos = hb_parnl( 2 );
|
|
|
|
if( lPos == 0 )
|
|
lPos = 1;
|
|
|
|
if( HB_ISLOG( 4 ) && hb_parl( 4 ) )
|
|
{
|
|
ULONG ulLen = hb_arrayLen( pArray ) + 1;
|
|
if( lPos >= 1 && ( ULONG ) lPos <= ulLen )
|
|
hb_arraySize( pArray, ulLen );
|
|
}
|
|
|
|
if( hb_arrayIns( pArray, lPos ) )
|
|
{
|
|
if( ! HB_ISNIL( 3 ) )
|
|
hb_arraySet( pArray, lPos, hb_param( 3, HB_IT_ANY ) );
|
|
}
|
|
|
|
hb_itemReturn( pArray ); /* AIns() returns the array itself */
|
|
}
|
|
}
|
|
|
|
HB_FUNC( HB_ADEL )
|
|
{
|
|
PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY );
|
|
|
|
if( pArray )
|
|
{
|
|
long lPos = hb_parnl( 2 );
|
|
|
|
if( lPos == 0 )
|
|
lPos = 1;
|
|
|
|
if( hb_arrayDel( pArray, lPos ) )
|
|
{
|
|
if( HB_ISLOG( 3 ) && hb_parl( 3 ) )
|
|
hb_arraySize( pArray, hb_arrayLen( pArray ) - 1 );
|
|
}
|
|
|
|
hb_itemReturn( pArray ); /* ADel() returns the array itself */
|
|
}
|
|
}
|
|
|
|
/* TODO: In Xbase++ fifth parameter determines whether array elements
|
|
are passed by reference to the code block. [vszakats] */
|
|
|
|
HB_FUNC( AEVAL )
|
|
{
|
|
PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY );
|
|
PHB_ITEM pBlock = hb_param( 2, HB_IT_BLOCK );
|
|
|
|
if( pArray && pBlock )
|
|
{
|
|
ULONG ulStart = hb_parnl( 3 );
|
|
ULONG ulCount = hb_parnl( 4 );
|
|
|
|
hb_arrayEval( pArray,
|
|
pBlock,
|
|
HB_ISNUM( 3 ) ? &ulStart : NULL,
|
|
HB_ISNUM( 4 ) ? &ulCount : NULL );
|
|
|
|
hb_itemReturn( hb_stackItemFromBase( 1 ) ); /* AEval() returns the array itself */
|
|
}
|
|
else
|
|
hb_errRT_BASE( EG_ARG, 2017, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( ACOPY )
|
|
{
|
|
PHB_ITEM pSrcArray = hb_param( 1, HB_IT_ARRAY );
|
|
PHB_ITEM pDstArray = hb_param( 2, HB_IT_ARRAY );
|
|
|
|
if( pSrcArray && pDstArray )
|
|
{
|
|
/* CA-Cl*pper works this way. */
|
|
if( ! hb_arrayIsObject( pSrcArray ) && ! hb_arrayIsObject( pDstArray ) )
|
|
{
|
|
ULONG ulStart = hb_parnl( 3 );
|
|
ULONG ulCount = hb_parnl( 4 );
|
|
ULONG ulTarget = hb_parnl( 5 );
|
|
|
|
hb_arrayCopy( pSrcArray,
|
|
pDstArray,
|
|
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 */
|
|
}
|
|
}
|
|
|
|
/* NOTE: Clipper will return NIL if the parameter is not an array. [vszakats] */
|
|
|
|
HB_FUNC( ACLONE )
|
|
{
|
|
PHB_ITEM pSrcArray = hb_param( 1, HB_IT_ARRAY );
|
|
|
|
if( pSrcArray && ! hb_arrayIsObject( pSrcArray ) )
|
|
hb_itemReturnRelease( hb_arrayClone( pSrcArray ) ); /* AClone() returns the new array */
|
|
}
|
|
|
|
HB_FUNC( HB_APARAMS )
|
|
{
|
|
hb_itemReturnRelease( hb_arrayFromParams( hb_parni( 1 ) + 1 ) );
|
|
}
|