* harbour/common.mak
* updated for new files - please check
* harbour/harbour.spec
* added compiler library
* harbour/bin/pack_src.sh
* harbour/bin/hb-func.sh
* updated for new files and libraries
* harbour/config/w32/mingw32.cf
* harbour/config/w32/watcom.cf
* harbour/config/w32/xcc.cf
* added winsock libraries
* harbour/include/hbapicdp.h
* harbour/source/rtl/cdpapi.c
+ added hb_cdpicmp() - not case sensitive version of hb_cdpcmp()
* harbour/include/hbapiitm.h
* harbour/source/vm/itemapi.c
+ hb_itemStrICmp(), hb_itemCopyFromRef(), hb_itemMoveFromRef()
* harbour/include/hbapi.h
* harbour/include/hbcomp.h
* harbour/include/hbcompdf.h
* harbour/include/hbexpra.c
* harbour/include/hbexprb.c
* harbour/include/hbexprop.h
* harbour/include/hbmacro.h
* harbour/include/hbpcode.h
* harbour/include/hbvmpub.h
* harbour/include/hbxvm.h
* harbour/source/common/expropt1.c
* harbour/source/compiler/complex.c
* harbour/source/compiler/genc.c
* harbour/source/compiler/gencc.c
* harbour/source/compiler/gencli.c
* harbour/source/compiler/genhrb.c
* harbour/source/compiler/genobj32.c
* harbour/source/compiler/harbour.y
* harbour/source/compiler/harbour.yyc
* harbour/source/compiler/harbour.yyh
* harbour/source/compiler/hbdead.c
* harbour/source/compiler/hbfix.c
* harbour/source/compiler/hblbl.c
* harbour/source/compiler/hbmain.c
* harbour/source/compiler/hbopt.c
* harbour/source/compiler/hbpcode.c
* harbour/source/compiler/hbstripl.c
* harbour/source/macro/macro.y
* harbour/source/macro/macro.yyc
* harbour/source/macro/macro.yyh
* harbour/source/macro/macrolex.c
* harbour/source/vm/Makefile
* harbour/source/vm/arrays.c
* harbour/source/vm/asort.c
* harbour/source/vm/classes.c
* harbour/source/vm/eval.c
* harbour/source/vm/garbage.c
* harbour/source/vm/hvm.c
* harbour/source/vm/itemapi.c
* harbour/source/vm/macro.c
+ harbour/source/vm/hashes.c
+ harbour/source/vm/hashfunc.c
+ added hash items, f.e.:
local h1 := {=>}, h2 := { "a"=>1.234, "b"=>2.345 }
? h2[ "a" ], h2[ "b ]
+ added support for DYNAMIC function declaration - it allow to define
functions which are lately bound at runtime, f.e.:
/*** t01.prg ***/
dynamic func1
proc main()
local h:=__hrbload("t02.hrb")
? func1()
return
/*** t02.prg ***/
func func1
return "Hello!!!"
% use new FUNCALL structure to hold EXTERNAL and DYNAMIC functions,
it reduce memory usage, FUNCALL is much smaller then FUNCTION
% use symbol scope bits when possible instead of making some linear scan
+ added new enumarator message: __ENUMKEY - it allow to access
key value when hash item is base enumerator value, f.e.:
proc main()
local v, h:={"a"=>1.000,"b"=>2.000,"c"=>3.000}
heval( h, { |k,v,i| qout( k, v, i ) } ); ?
for each v in h
? v, "=>", v:__enumKey(), v:__enumValue(), v:__enumIndex(), ;
valtype(v:__enumBase())
v += 0.123
next
? ;heval( h, { |k,v,i| qout( k, v, i ) } )
return
+ added C level hb_hash*() functions
+ added support for full HASH item cloning and updated array cloning
to also clone nested hashes - please note that xHarbour does not do
that, in xHarbour ACLONE() clones _ONLY_ nested arrays and HCLONE()
_DOES_NOT_ clone _ANY_ nested items.
* harbour/include/hbextern.ch
+ added hash functions HB_H*()
* changed INET*() functions to HB_INET*()
+ added hash functions H*() and socket functions INET*() when
HB_COMPAT_XHB is set
* harbour/include/hbtypes.h
+ added missing HB_EXTERN_BEGIN / HB_EXTERN_END
* harbour/include/hbpp.h
* harbour/source/pp/ppcore.c
! added protection against automatic word concatenation in some cases
! fixed preprocessing expressions when match marker matches ';' token
* harbour/source/rtl/Makefile
+ harbour/source/rtl/itemseri.c
+ added functions for item serialization: HB_SERIALIZE() and
HB_DESERIALIZE() - these function are not binary compatible
with xHarbour functions with the same names but make very
similar job with the exception to serialization of codeblock
and object variables - Harbour does not allow to serialize
codeblocks and serialize objects as arrays.
In most cases these functions can replace the xHarbour ones
+ added HB_DESERIALBEGIN() and HB_DESERIALIZE() functions covered
by HB_COMPAT_XHB macro - this functions are only for compatibility
with existing xHarbour code, In Harbour HB_DESERIALBEGIN() is
dummy function which returns first parameter and HB_DESERIALNEXT()
is a simple wrapper to HB_DESERIALIZE() so it's not necessary to
use them.
* harbour/source/rtl/hbinet.c
* changed INET*() functions to HB_INET*() and enable them for default
build
+ added INET*() functions wrappers covered by HB_COMPAT_XHB macro
* harbour/source/rtl/hbrandom.c
+ added HB_RANDOMINT() - xHarbour compatible
* harbour/source/rtl/len.c
+ added support for HASHes
* harbour/source/rtl/valtype.c
+ added support for HASHes
+ added set of HB_IS*() functions - they are a little bit faster then
calling VALTYPE( v ) == <cVal>
- removed HB_ISBYREF() - this function cannot longer work, it was using
a Clipper incompatible anomalies in passing variables by reference I
fixed so it has to stop to work. If it will be realy necessary to
implement HB_ISBYREF() function then please inform me - it will have
to be done at compiler level or with some much deeper HVM stack
checking.
* harbour/source/vm/extend.c
! fixed hb_extIsArray() and hb_extIsObject() to work well with
parameters passed by reference.
Please note that now hb_extIsArray() return TRUE only for pure arrays
not object values.
* harbour/contrib/Makefile
+ harbour/contrib/tip/Changelog
+ harbour/contrib/tip/Makefile
+ harbour/contrib/tip/atokens.c
+ harbour/contrib/tip/base64x.c
+ harbour/contrib/tip/cgi.prg
+ harbour/contrib/tip/client.prg
+ harbour/contrib/tip/credent.prg
+ harbour/contrib/tip/cstr.prg
+ harbour/contrib/tip/encb64.prg
+ harbour/contrib/tip/encmthd.c
+ harbour/contrib/tip/encoder.prg
+ harbour/contrib/tip/encqp.prg
+ harbour/contrib/tip/encurl.prg
+ harbour/contrib/tip/ftpcln.prg
+ harbour/contrib/tip/hbhex2n.c
+ harbour/contrib/tip/httpcln.prg
+ harbour/contrib/tip/mail.prg
+ harbour/contrib/tip/popcln.prg
+ harbour/contrib/tip/smtpcln.prg
+ harbour/contrib/tip/tip.ch
+ harbour/contrib/tip/url.prg
+ harbour/contrib/tip/utils.c
+ added TIP library - code borrowed from xHarbour
Please test - a lot of above code is not well tested, also some peaces
were written over year ago for different things (f.e. serialization for
NETRDD) and now I collected them and committed.
The TIP library was not tested at all. It can be compiled but I cannot
say if it works - I hope that people familiar with it can make necessary
test and fixes.
It's also not the final version of low level HASH item code. I'm working
on more efficient structure which uses binary tries but I cannot say when
I'll finish it (maybe in this weekend or maybe in next year) so I committed
working version now even if I'm not happy with overall performance (BTW
not worser then in xHarbour)
562 lines
15 KiB
C
562 lines
15 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* The Eval API
|
|
*
|
|
* Copyright 1999 Antonio Linares <alinares@fivetech.com>
|
|
* www - http://www.harbour-project.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this software; see the file COPYING. If not, write to
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
|
*
|
|
* As a special exception, the Harbour Project gives permission for
|
|
* additional uses of the text contained in its release of Harbour.
|
|
*
|
|
* The exception is that, if you link the Harbour libraries with other
|
|
* files to produce an executable, this does not by itself cause the
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
* Your use of that executable is in no way restricted on account of
|
|
* linking the Harbour library code into it.
|
|
*
|
|
* This exception does not however invalidate any other reasons why
|
|
* the executable file might be covered by the GNU General Public License.
|
|
*
|
|
* This exception applies only to the code released by the Harbour
|
|
* Project under the name Harbour. If you copy code from other
|
|
* Harbour Project or Free Software Foundation releases into a copy of
|
|
* Harbour, as the General Public License permits, the exception does
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
* anyone as to the status of such modified files, you must delete
|
|
* this exception notice from them.
|
|
*
|
|
* If you write modifications of your own for Harbour, it is your choice
|
|
* whether to permit this exception to apply to your modifications.
|
|
* If you do not wish that, delete this exception notice.
|
|
*
|
|
*/
|
|
|
|
/*
|
|
* The following parts are Copyright of the individual authors.
|
|
* www - http://www.harbour-project.org
|
|
*
|
|
* Copyright 1999-2001 Viktor Szakats <viktor.szakats@syenar.hu>
|
|
* hb_itemDo() ( based on HB_DO() by Ryszard Glab )
|
|
* hb_itemDoC() ( based on HB_DO() by Ryszard Glab )
|
|
*
|
|
* See doc/license.txt for licensing terms.
|
|
*
|
|
*/
|
|
|
|
#include "hbvmopt.h"
|
|
#include "hbapi.h"
|
|
#include "hbstack.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbapierr.h"
|
|
#include "hbvm.h"
|
|
|
|
BOOL hb_evalNew( PEVALINFO pEvalInfo, PHB_ITEM pItem )
|
|
{
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_evalNew(%p, %p)", pEvalInfo, pItem));
|
|
|
|
if( pEvalInfo )
|
|
{
|
|
memset( pEvalInfo, 0, sizeof( EVALINFO ) );
|
|
pEvalInfo->pItems[ 0 ] = pItem;
|
|
pEvalInfo->paramCount = 0;
|
|
|
|
return TRUE;
|
|
}
|
|
else
|
|
return FALSE;
|
|
}
|
|
|
|
/* NOTE: CA-Cl*pper is buggy and will not check if more parameters are
|
|
added than the maximum (9). [vszakats] */
|
|
|
|
/* NOTE: CA-Cl*pper NG suggest that the Items passed as parameters should/may
|
|
be released by the programmer explicitly. But in fact hb_evalRelease()
|
|
will automatically release all of them. The sample programs in the
|
|
NG are doing it that way. Releasing the parameters explicitly in
|
|
Harbour will cause an internal error, while it will be silently
|
|
ignored (?) in CA-Cl*pper. This is due to the different internal
|
|
handling of the Items, but IIRC it causes leak in CA-Clipper. All in
|
|
all, don't release the eval parameter Items explicitly to make both
|
|
Harbour and CA-Clipper happy. [vszakats] */
|
|
|
|
BOOL hb_evalPutParam( PEVALINFO pEvalInfo, PHB_ITEM pItem )
|
|
{
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_evalPutParam(%p, %p)", pEvalInfo, pItem));
|
|
|
|
if( pEvalInfo && pItem && pEvalInfo->paramCount < HB_EVAL_PARAM_MAX_ )
|
|
{
|
|
pEvalInfo->pItems[ ++pEvalInfo->paramCount ] = pItem;
|
|
|
|
return TRUE;
|
|
}
|
|
else
|
|
return FALSE;
|
|
}
|
|
|
|
PHB_ITEM hb_evalLaunch( PEVALINFO pEvalInfo )
|
|
{
|
|
PHB_ITEM pResult;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_evalLaunch(%p)", pEvalInfo));
|
|
|
|
if( pEvalInfo )
|
|
{
|
|
USHORT uiParam = 1;
|
|
|
|
if( HB_IS_STRING( pEvalInfo->pItems[ 0 ] ) )
|
|
{
|
|
hb_vmPushSymbol( hb_dynsymFindName( hb_itemGetCPtr( pEvalInfo->pItems[ 0 ] ) )->pSymbol );
|
|
hb_vmPushNil();
|
|
while( uiParam <= pEvalInfo->paramCount )
|
|
hb_vmPush( pEvalInfo->pItems[ uiParam++ ] );
|
|
hb_vmDo( pEvalInfo->paramCount );
|
|
|
|
pResult = hb_itemNew( NULL );
|
|
hb_itemCopy( pResult, hb_stackReturnItem() );
|
|
}
|
|
else if( HB_IS_BLOCK( pEvalInfo->pItems[ 0 ] ) )
|
|
{
|
|
hb_vmPushSymbol( &hb_symEval );
|
|
hb_vmPush( pEvalInfo->pItems[ 0 ] );
|
|
while( uiParam <= pEvalInfo->paramCount )
|
|
hb_vmPush( pEvalInfo->pItems[ uiParam++ ] );
|
|
hb_vmDo( pEvalInfo->paramCount );
|
|
|
|
pResult = hb_itemNew( NULL );
|
|
hb_itemCopy( pResult, hb_stackReturnItem() );
|
|
}
|
|
else
|
|
pResult = NULL;
|
|
}
|
|
else
|
|
pResult = NULL;
|
|
|
|
return pResult;
|
|
}
|
|
|
|
/* NOTE: CA-Clipper NG states that hb_evalLaunch() must be called at least
|
|
once and only once before calling hb_evalRelease(). Harbour doesn't
|
|
have these requirements. [vszakats] */
|
|
|
|
BOOL hb_evalRelease( PEVALINFO pEvalInfo )
|
|
{
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_evalRelease(%p)", pEvalInfo));
|
|
|
|
if( pEvalInfo )
|
|
{
|
|
USHORT uiParam;
|
|
|
|
for( uiParam = 0; uiParam <= pEvalInfo->paramCount; uiParam++ )
|
|
{
|
|
hb_itemRelease( pEvalInfo->pItems[ uiParam ] );
|
|
pEvalInfo->pItems[ uiParam ] = NULL;
|
|
}
|
|
|
|
pEvalInfo->paramCount = 0;
|
|
|
|
return TRUE;
|
|
}
|
|
else
|
|
return FALSE;
|
|
}
|
|
|
|
/* NOTE: Same purpose as hb_evalLaunch(), but simpler, faster and more flexible.
|
|
It can be used to call symbols, functions names, or blocks, the items
|
|
don't need to be duplicated when passed as argument, one line is
|
|
enough to initiate a call, the number of parameters is not limited.
|
|
[vszakats]
|
|
|
|
NOTE: When calling hb_itemDo() with no arguments for the Harbour item being
|
|
evaluated, you must use '(PHB_ITEM *) 0' as the third parameter.
|
|
*/
|
|
|
|
PHB_ITEM hb_itemDo( PHB_ITEM pItem, ULONG ulPCount, ... )
|
|
{
|
|
PHB_ITEM pResult = NULL;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_itemDo(%p, %hu, ...)", pItem, ulPCount));
|
|
|
|
if( pItem )
|
|
{
|
|
PHB_SYMB pSymbol = NULL;
|
|
|
|
if( HB_IS_STRING( pItem ) )
|
|
{
|
|
PHB_DYNS pDynSym = hb_dynsymFindName( pItem->item.asString.value );
|
|
|
|
if( pDynSym )
|
|
{
|
|
pSymbol = pDynSym->pSymbol;
|
|
pItem = NULL;
|
|
}
|
|
}
|
|
else if( HB_IS_SYMBOL( pItem ) )
|
|
{
|
|
pSymbol = pItem->item.asSymbol.value;
|
|
pItem = NULL;
|
|
}
|
|
else if( HB_IS_BLOCK( pItem ) )
|
|
{
|
|
pSymbol = &hb_symEval;
|
|
}
|
|
|
|
if( pSymbol )
|
|
{
|
|
ULONG ulParam;
|
|
|
|
hb_vmPushState();
|
|
|
|
hb_vmPushSymbol( pSymbol );
|
|
if( pItem )
|
|
hb_vmPush( pItem );
|
|
else
|
|
hb_vmPushNil();
|
|
|
|
if( ulPCount )
|
|
{
|
|
va_list va;
|
|
|
|
va_start( va, ulPCount );
|
|
for( ulParam = 1; ulParam <= ulPCount; ulParam++ )
|
|
{
|
|
hb_vmPush( va_arg( va, PHB_ITEM ) );
|
|
}
|
|
va_end( va );
|
|
}
|
|
|
|
if( pItem )
|
|
hb_vmSend( ( USHORT ) ulPCount );
|
|
else
|
|
hb_vmDo( ( USHORT ) ulPCount );
|
|
|
|
pResult = hb_itemNew( hb_stackReturnItem() );
|
|
hb_vmPopState();
|
|
}
|
|
}
|
|
|
|
return pResult;
|
|
}
|
|
|
|
/* NOTE: Same as hb_itemDo(), but even simpler, since the function name can be
|
|
directly passed as a zero terminated string. [vszakats]
|
|
|
|
NOTE: When calling hb_itemDoC() with no arguments for the Harbour function
|
|
being called, you must use '(PHB_ITEM *) 0' as the third parameter.
|
|
*/
|
|
|
|
PHB_ITEM hb_itemDoC( char * szFunc, ULONG ulPCount, ... )
|
|
{
|
|
PHB_ITEM pResult = NULL;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_itemDoC(%s, %hu, ...)", szFunc, ulPCount));
|
|
|
|
if( szFunc )
|
|
{
|
|
PHB_DYNS pDynSym = hb_dynsymFindName( szFunc );
|
|
|
|
if( pDynSym )
|
|
{
|
|
ULONG ulParam;
|
|
|
|
hb_vmPushState();
|
|
hb_vmPushSymbol( pDynSym->pSymbol );
|
|
hb_vmPushNil();
|
|
if( ulPCount )
|
|
{
|
|
va_list va;
|
|
va_start( va, ulPCount );
|
|
for( ulParam = 1; ulParam <= ulPCount; ulParam++ )
|
|
hb_vmPush( va_arg( va, PHB_ITEM ) );
|
|
va_end( va );
|
|
}
|
|
hb_vmDo( ( unsigned short ) ulPCount );
|
|
pResult = hb_itemNew( hb_stackReturnItem() );
|
|
hb_vmPopState();
|
|
}
|
|
}
|
|
|
|
return pResult;
|
|
}
|
|
|
|
/*
|
|
* Notice that these two functions place the result at hb_stackReturnItem(),
|
|
* that you may access its value using a _par...( -1 ).
|
|
*/
|
|
|
|
/* undocumented Clipper _cEval0() */
|
|
void hb_evalBlock0( PHB_ITEM pCodeBlock )
|
|
{
|
|
hb_vmPushSymbol( &hb_symEval );
|
|
hb_vmPush( pCodeBlock );
|
|
hb_vmFunction( 0 );
|
|
}
|
|
|
|
/* undocumented Clipper _cEval1() */
|
|
void hb_evalBlock1( PHB_ITEM pCodeBlock, PHB_ITEM pParam )
|
|
{
|
|
hb_vmPushSymbol( &hb_symEval );
|
|
hb_vmPush( pCodeBlock );
|
|
hb_vmPush( pParam );
|
|
hb_vmFunction( 1 );
|
|
}
|
|
|
|
/* same functionality but with a NULL terminated list of parameters */
|
|
void hb_evalBlock( PHB_ITEM pCodeBlock, ... )
|
|
{
|
|
va_list args;
|
|
unsigned int uiParams = 0;
|
|
PHB_ITEM pParam;
|
|
|
|
hb_vmPushSymbol( &hb_symEval );
|
|
hb_vmPush( pCodeBlock );
|
|
|
|
va_start( args, pCodeBlock );
|
|
while( ( pParam = va_arg( args, PHB_ITEM ) ) != NULL )
|
|
{
|
|
hb_vmPush( pParam );
|
|
uiParams++;
|
|
}
|
|
va_end( args );
|
|
|
|
hb_vmFunction( uiParams );
|
|
}
|
|
|
|
HB_FUNC( HB_FORNEXT ) /* nStart, nEnd | bEnd, bCode, nStep */
|
|
{
|
|
LONG lStart = hb_parnl( 1 ), lEnd;
|
|
PHB_ITEM pEndBlock = hb_param( 2, HB_IT_BLOCK );
|
|
PHB_ITEM pCodeBlock = hb_param( 3, HB_IT_BLOCK );
|
|
LONG lStep = ( hb_pcount() > 3 ) ? hb_parnl( 4 ) : 1;
|
|
|
|
if( pCodeBlock )
|
|
{
|
|
if( pEndBlock )
|
|
{
|
|
hb_evalBlock0( pEndBlock );
|
|
lEnd = hb_parnl( -1 );
|
|
|
|
while( lStart <= lEnd )
|
|
{
|
|
hb_vmPushSymbol( &hb_symEval );
|
|
hb_vmPush( pCodeBlock );
|
|
hb_vmPushLong( lStart );
|
|
hb_vmFunction( 1 );
|
|
|
|
lStart += lStep;
|
|
|
|
hb_evalBlock0( pEndBlock );
|
|
lEnd = hb_parnl( -1 );
|
|
}
|
|
}
|
|
else
|
|
{
|
|
lEnd = hb_parnl( 2 );
|
|
while( lStart <= lEnd )
|
|
{
|
|
hb_vmPushSymbol( &hb_symEval );
|
|
hb_vmPush( pCodeBlock );
|
|
hb_vmPushLong( lStart );
|
|
hb_vmFunction( 1 );
|
|
|
|
lStart += lStep;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
* based on xHrbour's HB_ExecFromArray() by Giancarlo Niccolai
|
|
* This version supports the same syntax though it's independent
|
|
* implementation [druzus]
|
|
*
|
|
* The following syntax is supported:
|
|
* hb_execFromArray( <cFuncName> [, <aParams> ] )
|
|
* hb_execFromArray( @<funcName>() [, <aParams> ] )
|
|
* hb_execFromArray( <bCodeBlock> [, <aParams> ] )
|
|
* hb_execFromArray( <oObject> , <cMethodName> [, <aParams> ] )
|
|
* hb_execFromArray( <oObject> , @<msgName>() [, <aParams> ] )
|
|
* or:
|
|
* hb_execFromArray( <aExecArray> )
|
|
* where <aExecArray> is in one of the following format:
|
|
* { <cFuncName> [, <params,...>] }
|
|
* { @<funcName>() [, <params,...>] }
|
|
* { <bCodeBlock> [, <params,...>] }
|
|
* { <oObject> , <cMethodName> [, <params,...>] }
|
|
* { <oObject> , @<msgName>() [, <params,...>] }
|
|
*/
|
|
HB_FUNC( HB_EXECFROMARRAY )
|
|
{
|
|
PHB_SYMB pExecSym = NULL;
|
|
PHB_ITEM pFunc = NULL;
|
|
PHB_ITEM pSelf = NULL;
|
|
PHB_ITEM pArray = NULL;
|
|
PHB_ITEM pItem;
|
|
ULONG ulParamOffset = 0;
|
|
USHORT usPCount = hb_pcount();
|
|
|
|
/* decode parameters */
|
|
if( usPCount )
|
|
{
|
|
PHB_ITEM pParam = hb_param( 1, HB_IT_ANY );
|
|
|
|
if( usPCount == 1 )
|
|
{
|
|
if( HB_IS_ARRAY( pParam ) && !HB_IS_OBJECT( pParam ) )
|
|
{
|
|
pArray = pParam;
|
|
pItem = hb_arrayGetItemPtr( pArray, 1 );
|
|
if( HB_IS_OBJECT( pItem ) )
|
|
{
|
|
pSelf = pItem;
|
|
pFunc = hb_arrayGetItemPtr( pArray, 2 );
|
|
ulParamOffset = 2;
|
|
}
|
|
else
|
|
{
|
|
pFunc = pItem;
|
|
ulParamOffset = 1;
|
|
}
|
|
}
|
|
else
|
|
pFunc = pParam;
|
|
}
|
|
else if( HB_IS_OBJECT( pParam ) && usPCount <= 3 )
|
|
{
|
|
pSelf = pParam;
|
|
pFunc = hb_param( 2, HB_IT_ANY );
|
|
pArray = hb_param( 3, HB_IT_ANY );
|
|
}
|
|
else if( usPCount == 2 )
|
|
{
|
|
pFunc = pParam;
|
|
pArray = hb_param( 2, HB_IT_ANY );
|
|
}
|
|
}
|
|
|
|
if( pFunc && ( !pArray || HB_IS_ARRAY( pArray ) ) )
|
|
{
|
|
if( HB_IS_SYMBOL( pFunc ) )
|
|
pExecSym = hb_itemGetSymbol( pFunc );
|
|
else if( HB_IS_STRING( pFunc ) )
|
|
pExecSym = hb_dynsymGet( hb_itemGetCPtr( pFunc ) )->pSymbol;
|
|
else if( HB_IS_BLOCK( pFunc ) && !pSelf )
|
|
{
|
|
pSelf = pFunc;
|
|
pExecSym = &hb_symEval;
|
|
}
|
|
}
|
|
|
|
if( pExecSym )
|
|
{
|
|
usPCount = 0;
|
|
hb_vmPushSymbol( pExecSym );
|
|
if( pSelf )
|
|
hb_vmPush( pSelf );
|
|
else
|
|
hb_vmPushNil();
|
|
|
|
if( pArray )
|
|
{
|
|
pItem = hb_arrayGetItemPtr( pArray, ++ulParamOffset );
|
|
while( pItem && usPCount < 255 )
|
|
{
|
|
hb_vmPush( pItem );
|
|
++usPCount;
|
|
pItem = hb_arrayGetItemPtr( pArray, ++ulParamOffset );
|
|
}
|
|
}
|
|
|
|
if( pSelf )
|
|
hb_vmSend( usPCount );
|
|
else
|
|
hb_vmDo( usPCount );
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, "HB_EXECFROMARRAY", HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
BOOL hb_execFromArray( PHB_ITEM pParam )
|
|
{
|
|
PHB_SYMB pExecSym = NULL;
|
|
PHB_ITEM pArray = NULL;
|
|
PHB_ITEM pSelf = NULL;
|
|
ULONG ulParamOffset = 0;
|
|
USHORT usPCount = 0;
|
|
|
|
if( pParam && HB_IS_ARRAY( pParam ) && !HB_IS_OBJECT( pParam ) )
|
|
{
|
|
pArray = pParam;
|
|
pParam = hb_arrayGetItemPtr( pArray, 1 );
|
|
if( HB_IS_OBJECT( pParam ) )
|
|
{
|
|
pSelf = pParam;
|
|
pParam = hb_arrayGetItemPtr( pArray, 2 );
|
|
ulParamOffset = 2;
|
|
}
|
|
else
|
|
ulParamOffset = 1;
|
|
}
|
|
|
|
if( pParam )
|
|
{
|
|
if( HB_IS_SYMBOL( pParam ) )
|
|
pExecSym = hb_itemGetSymbol( pParam );
|
|
else if( HB_IS_STRING( pParam ) )
|
|
pExecSym = hb_dynsymGet( hb_itemGetCPtr( pParam ) )->pSymbol;
|
|
else if( HB_IS_BLOCK( pParam ) && !pSelf )
|
|
{
|
|
pSelf = pParam;
|
|
pExecSym = &hb_symEval;
|
|
}
|
|
|
|
if( pExecSym )
|
|
{
|
|
hb_vmPushSymbol( pExecSym );
|
|
if( pSelf )
|
|
hb_vmPush( pSelf );
|
|
else
|
|
hb_vmPushNil();
|
|
|
|
if( pArray )
|
|
{
|
|
pParam = hb_arrayGetItemPtr( pArray, ++ulParamOffset );
|
|
while( pParam && usPCount < 255 )
|
|
{
|
|
hb_vmPush( pParam );
|
|
++usPCount;
|
|
pParam = hb_arrayGetItemPtr( pArray, ++ulParamOffset );
|
|
}
|
|
}
|
|
|
|
if( pSelf )
|
|
hb_vmSend( usPCount );
|
|
else
|
|
hb_vmDo( usPCount );
|
|
|
|
return TRUE;
|
|
}
|
|
}
|
|
|
|
hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, "HB_EXECFROMARRAY", HB_ERR_ARGS_BASEPARAMS );
|
|
return FALSE;
|
|
}
|