06dad4687f
* hb_slex.vc
* Minor corrections.
* include/hbapi.h
+ extern PHB_ITEM hb_paramError( int iParam ); /* Returns either the generic parameter or a NIL item if param not provided */
+ extern PHB_ITEM hb_arrayFromStack( USHORT uiLen ); /* Creates and returns an Array of n Elements from the Eval Stack - Does NOT pop the items. */
+ extern PHB_ITEM hb_arrayFromParams( void ); /* Creates and returns an Array of current Generic Parameters. */
* include/hbapierr.h
* extern USHORT hb_errRT_BASE ( ULONG ulGenCode, ULONG ulSubCode, char * szDescription, char * szOperation, USHORT uiArgCount, ... );
* extern USHORT hb_errRT_BASE_Ext1 ( ULONG ulGenCode, ULONG ulSubCode, char * szDescription, char * szOperation, USHORT uiOsCode, USHORT uiFlags, USHORT uiArgCount, ... );
* extern PHB_ITEM hb_errRT_BASE_Subst ( ULONG ulGenCode, ULONG ulSubCode, char * szDescription, char * szOperation, USHORT uiArgCount, ... );
* extern void hb_errRT_BASE_SubstR ( ULONG ulGenCode, ULONG ulSubCode, char * szDescription, char * szOperation, USHORT uiArgCount, ... );
+ Added support for variable number of Error Arguments.
* source/rtl/errorapi.c
* hb_errRT_BASE ( ULONG ulGenCode, ULONG ulSubCode, char * szDescription, char * szOperation, USHORT uiArgCount, ... );
* hb_errRT_BASE_Ext1 ( ULONG ulGenCode, ULONG ulSubCode, char * szDescription, char * szOperation, USHORT uiOsCode, USHORT uiFlags, USHORT uiArgCount, ... );
* hb_errRT_BASE_Subst ( ULONG ulGenCode, ULONG ulSubCode, char * szDescription, char * szOperation, USHORT uiArgCount, ... );
* hb_errRT_BASE_SubstR ( ULONG ulGenCode, ULONG ulSubCode, char * szDescription, char * szOperation, USHORT uiArgCount, ... );
+ Added support for variable number of Error Arguments.
* source/vm/arrays.c
+ PHB_ITEM hb_arrayFromStack( USHORT uiLen )
+ PHB_ITEM hb_arrayFromParams( void )
* source/vm/extend.c
+ PHB_ITEM hb_paramError( int iParam )
* source/rdd/dbcmd.c
* Added the Error Arguments as parameters to hb_errRT_BASE*().
* source/rtl/abs.c
* source/rtl/at.c
* source/rtl/chrasc.c
* source/rtl/copyfile.c
* source/rtl/datec.c
* source/rtl/dateshb.c
* source/rtl/diskspac.c
* source/rtl/disksphb.c
* source/rtl/do.c
* source/rtl/left.c
* source/rtl/len.c
* source/rtl/math.c
* source/rtl/minmax.c
* source/rtl/mod.c
* source/rtl/philes.c
* source/rtl/philesx.c
* source/rtl/replic.c
* source/rtl/round.c
* source/rtl/set.c
* source/rtl/space.c
* source/rtl/str.c
* source/rtl/strcase.c
* source/rtl/strtran.c
* source/rtl/strzero.c
* source/rtl/substr.c
* source/rtl/transfrm.c
* source/rtl/trim.c
* source/rtl/type.c
* source/rtl/val.c
* source/rtl/word.c
* Added the Error Arguments as parameters to hb_errRT_BASE*().
* source/vm/arrayshb.c
* source/vm/eval.c
* source/vm/hvm.c
* source/vm/macro.c
* source/vm/memvars.c
* source/vm/runner.c
* Added the Error Arguments as parameters to hb_errRT_BASE*().
* source/vm/classes.c
+ Added 0 arguments (J.F. can you please decide what should be the arguments! )
/* HBTEST now reports 173 failures ( down from 376 ) many of the failures are justified.
I have tested this as much as I could, but since it invloved lots of "Cust & Pasets" more testing should be done.
It would be great if someone could review each of HBTEST Reported Failures on a one-by-one basis.
BTW, HBTEST reports 1 UN-RELEASED Memory Block (from before my changes)!
*/
99 lines
2.9 KiB
C
99 lines
2.9 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* DO command/function
|
|
*
|
|
* Copyright 1999 Ryszard Glab <rglab@imid.med.pl>
|
|
* 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 of the License, or
|
|
* (at your option) any later version, with one exception:
|
|
*
|
|
* The exception is that if you link the Harbour Runtime Library (HRL)
|
|
* and/or the Harbour Virtual Machine (HVM) 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 HRL
|
|
* and/or HVM code into it.
|
|
*
|
|
* 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 program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit
|
|
* their web site at http://www.gnu.org/).
|
|
*
|
|
*/
|
|
|
|
#include "hbapi.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbapierr.h"
|
|
#include "hbvm.h"
|
|
|
|
/* NOTE: DO() as a function is a Harbour extension. [vszakats] */
|
|
|
|
HB_FUNC( DO )
|
|
{
|
|
PHB_ITEM pItem = hb_param( 1, HB_IT_ANY );
|
|
|
|
if( HB_IS_STRING( pItem ) )
|
|
{
|
|
PHB_DYNS pDynSym = hb_dynsymFindName( hb_itemGetCPtr( pItem ) );
|
|
|
|
if( pDynSym )
|
|
{
|
|
USHORT uiPCount = hb_pcount();
|
|
USHORT uiParam;
|
|
|
|
hb_vmPushSymbol( pDynSym->pSymbol );
|
|
hb_vmPushNil();
|
|
for( uiParam = 2; uiParam <= uiPCount; uiParam++ )
|
|
hb_vmPush( hb_param( uiParam, HB_IT_ANY ) );
|
|
hb_vmDo( uiPCount - 1 );
|
|
}
|
|
else
|
|
{
|
|
PHB_ITEM pArgsArray = hb_arrayFromParams();
|
|
hb_errRT_BASE( EG_NOFUNC, 1001, NULL, hb_itemGetCPtr( pItem ), 1, pArgsArray );
|
|
hb_itemRelease( pArgsArray );
|
|
}
|
|
}
|
|
else if( HB_IS_BLOCK( pItem ) )
|
|
{
|
|
USHORT uiPCount = hb_pcount();
|
|
USHORT uiParam;
|
|
|
|
hb_vmPushSymbol( &hb_symEval );
|
|
hb_vmPush( pItem );
|
|
for( uiParam = 2; uiParam <= uiPCount; uiParam++ )
|
|
hb_vmPush( hb_param( uiParam, HB_IT_ANY ) );
|
|
hb_vmDo( uiPCount - 1 );
|
|
}
|
|
else if( HB_IS_SYMBOL( pItem ) )
|
|
{
|
|
USHORT uiPCount = hb_pcount();
|
|
USHORT uiParam;
|
|
|
|
hb_vmPushSymbol( pItem->item.asSymbol.value );
|
|
hb_vmPushNil();
|
|
for( uiParam = 2; uiParam <= uiPCount; uiParam++ )
|
|
hb_vmPush( hb_param( uiParam, HB_IT_ANY ) );
|
|
hb_vmDo( uiPCount - 1 );
|
|
}
|
|
else
|
|
{
|
|
PHB_ITEM pArgsArray = hb_arrayFromParams();
|
|
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, "DO", 1, pArgsArray );
|
|
hb_itemRelease( pArgsArray );
|
|
}
|
|
}
|
|
|