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)!
*/
142 lines
3.7 KiB
C
142 lines
3.7 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* *TRIM() functions
|
|
*
|
|
* 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 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"
|
|
|
|
/* trims from the left, and returns a new pointer to szText */
|
|
/* also returns the new length in lLen */
|
|
char * hb_strLTrim( const char * szText, ULONG * ulLen )
|
|
{
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_strLTrim(%s, %p)", szText, ulLen));
|
|
|
|
while( *ulLen && HB_ISSPACE( *szText ) )
|
|
{
|
|
szText++;
|
|
( *ulLen )--;
|
|
}
|
|
|
|
return ( char * ) szText;
|
|
}
|
|
|
|
/* return length of szText ignoring trailing white space (or true spaces) */
|
|
ULONG hb_strRTrimLen( const char * szText, ULONG ulLen, BOOL bAnySpace )
|
|
{
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_strRTrimLen(%s, %lu. %d)", szText, ulLen, (int) bAnySpace));
|
|
|
|
if( bAnySpace )
|
|
{
|
|
while( ulLen && HB_ISSPACE( szText[ ulLen - 1 ] ) )
|
|
ulLen--;
|
|
}
|
|
else
|
|
{
|
|
while( ulLen && szText[ ulLen - 1 ] == ' ' )
|
|
ulLen--;
|
|
}
|
|
|
|
return ulLen;
|
|
}
|
|
|
|
/* trims leading spaces from a string */
|
|
|
|
HB_FUNC( LTRIM )
|
|
{
|
|
PHB_ITEM pText = hb_param( 1, HB_IT_STRING );
|
|
|
|
if( pText )
|
|
{
|
|
ULONG ulLen = hb_itemGetCLen( pText );
|
|
char * szText = hb_strLTrim( hb_itemGetCPtr( pText ), &ulLen );
|
|
|
|
hb_retclen( szText, ulLen );
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 1101, NULL, "LTRIM", 1, hb_paramError( 1 ) );
|
|
}
|
|
|
|
/* trims trailing spaces from a string */
|
|
|
|
/* NOTE: The second parameter is a Harbour extension. */
|
|
|
|
HB_FUNC( RTRIM )
|
|
{
|
|
PHB_ITEM pText = hb_param( 1, HB_IT_STRING );
|
|
|
|
if( pText )
|
|
{
|
|
char * pszText = hb_itemGetCPtr( pText );
|
|
|
|
hb_retclen( pszText, hb_strRTrimLen( pszText, hb_itemGetCLen( pText ),
|
|
ISLOG( 2 ) ? hb_parl( 2 ) : FALSE ) );
|
|
}
|
|
else
|
|
/* NOTE: "TRIM" is right here [vszakats] */
|
|
hb_errRT_BASE_SubstR( EG_ARG, 1100, NULL, "TRIM", 1, hb_paramError( 1 ) );
|
|
}
|
|
|
|
/* synonymn for RTRIM */
|
|
HB_FUNC( TRIM )
|
|
{
|
|
HB_FUNCNAME( RTRIM )();
|
|
}
|
|
|
|
/* trims leading and trailing spaces from a string */
|
|
|
|
/* NOTE: The second parameter is a Harbour extension. */
|
|
|
|
HB_FUNC( ALLTRIM )
|
|
{
|
|
PHB_ITEM pText = hb_param( 1, HB_IT_STRING );
|
|
|
|
if( pText )
|
|
{
|
|
char * pszText = hb_itemGetCPtr( pText );
|
|
ULONG ulLen = hb_strRTrimLen( pszText, hb_itemGetCLen( pText ),
|
|
ISLOG( 2 ) ? hb_parl( 2 ) : FALSE );
|
|
|
|
pszText = hb_strLTrim( pszText, &ulLen );
|
|
hb_retclen( pszText, ulLen );
|
|
}
|
|
else
|
|
#ifdef HB_COMPAT_C53
|
|
hb_errRT_BASE_SubstR( EG_ARG, 2022, NULL, "ALLTRIM", 1, hb_paramError( 1 ) ); /* NOTE: This appeared in CA-Cl*pper 5.3 [vszakats] */
|
|
#else
|
|
hb_retc( "" );
|
|
#endif
|
|
}
|
|
|