* harbour/source/vm/estack.c
* added missing static to s_initSymbol declaration
* harbour/include/hbgtinfo.ch
* harbour/source/rtl/scroll.c
* formatting
* harbour/common.mak
* added empty line necessary for some make systems (f.e. wmake)
* harbour/bin/hb-func.sh
* changed system libs order to avoid problems on some platforms
* harbour/bin/pack_src.sh
* collect information about repository files using 'svn status -v'
command instead of scanning .svn/entries files to avoid problems
with different formats used by SVN
* harbour/include/hbchksum.h
* harbour/include/hbset.h
! added missing extern in few function prototypes
* harbour/include/hbclass.ch
* use HB_CLS_PARAM_LIST macro instead of ... for strict C52 mode
* harbour/source/common/hbfsapi.c
+ added missing const to one declaration
* harbour/source/common/hbstr.c
* minor cleanup in hb_stricmp()
* harbour/source/rtl/inkey.c
! casting to avoid negative values during char to int translation
* harbour/source/rtl/mouse53.c
* added one internal definition
* harbour/source/rtl/philes.c
* removed unnecessary #include(s)
* added missing const to one declaration
* harbour/source/rtl/valtype.c
* harbour/source/vm/hashfunc.c
* cleanup RT error call to eliminate hb_paramError() function
* harbour/source/pp/pplib.c
* harbour/source/vm/runner.c
* harbour/source/vm/debug.c
* harbour/source/vm/arrayshb.c
* harbour/source/vm/classes.c
* harbour/source/vm/hvm.c
* harbour/source/rtl/hbgtcore.c
* harbour/source/rtl/gtfunc.c
* harbour/source/rtl/hbinet.c
* harbour/source/rtl/hbregex.c
* harbour/source/rtl/idle.c
* harbour/source/rtl/errorapi.c
* harbour/source/rtl/hbtoken.c
* harbour/source/rtl/direct.c
* harbour/source/rdd/dbcmd.c
* harbour/source/rdd/dbcmd53.c
* harbour/source/rdd/fieldhb.c
* harbour/source/rdd/hbsix/sxcompr.c
* harbour/source/rdd/hbsix/sxcrypt.c
* harbour/source/compiler/hbcmplib.c
* harbour/contrib/hbrddads/adsfunc.c
* harbour/contrib/hbrddads/adsmgmnt.c
- removed unnecessary calls to hb_ret()
% replaced hb_itemRelease( hb_itemReturn( pItem ) ) with
hb_itemReturnRelease( pItem )
% replaced hb_itemPut*( hb_arrayGetItemPtr( pArray, ... ), ... ) with
hb_arraySetNI( pArray, ... )
* harbour/source/macro/macro.y
* harbour/source/macro/macro.yyc
* harbour/contrib/xhb/cstructc.c
* harbour/contrib/hbw32/w32_ole.c
* harbour/contrib/hbgtwvg/wvtcore.c
* cleaned typos with double ;;
* harbour/source/vm/extend.c
* harbour/source/rtl/math.c
* cleaned HB_EXPORT usage
* harbour/source/pp/ppcore.c
! fixed Harbour extension which allows to use match marker
at the beginning of rule definition
* harbour/source/main/harbour.c
! fixed hex conversion in FM log module - fix done by Phil Krylov
in xHarbour
* harbour/source/rdd/nulsys/nulsys.c
+ added dummy version of DBEVAL() and DBFILTER() - these functions
are used in RTL
* harbour/contrib/hbct/bitnum.c
+ added INTNEG(), INTPOS()
+ harbour/contrib/hbct/ctrand.prg
+ added RANDOM(), RAND() - borrowd from xHarbour by Pavel Tsarenko
+ harbour/contrib/hbct/setrc.c
+ added SETRC()
* harbour/contrib/hbct/getinput.prg
% minor optimization
* harbour/contrib/hbct/Makefile
* harbour/contrib/hbct/common.mak
* updated for new files
* harbour/contrib/hbnf/tempfile.prg
* use HB_FTempCreate() - modification borrowed from xHarbour
TOFIX this function uses hb_isbyref() which does not exist
in Harbour
* harbour/config/w32/msvc.cf
+ added -nologo flag for cl.exe (Phil Krylov's modification borrowed
from xHarbour
* harbour/config/w32/mingw32.cf
- removed repeated definitions
* harbour/config/w32/install.cf
! added alternative install rule for command.com with max line size limit
310 lines
8.7 KiB
C
310 lines
8.7 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
*
|
|
*
|
|
* Copyright 2007 Przemyslaw Czerpak <druzus / at / priv.onet.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, 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 "hbapiitm.h"
|
|
#include "hbapierr.h"
|
|
|
|
static ULONG hb_tokenCount( char * szLine, ULONG ulLen,
|
|
char * szDelim, ULONG ulDelim,
|
|
BOOL fSkipStrings, BOOL fDoubleQuoteOnly )
|
|
{
|
|
ULONG ul = 0, ulTokens = 1;
|
|
char cQuote = 0;
|
|
|
|
while( ul < ulLen )
|
|
{
|
|
if( cQuote )
|
|
{
|
|
if( szLine[ ul ] == cQuote )
|
|
cQuote = 0;
|
|
}
|
|
else if( fSkipStrings && ( szLine[ ul ] == '"' ||
|
|
( !fDoubleQuoteOnly && szLine[ ul ] == '\'' ) ) )
|
|
cQuote = szLine[ ul ];
|
|
else if( szLine[ ul ] == szDelim[ 0 ] &&
|
|
( ulDelim == 1 || !memcmp( szLine + ul, szDelim, ulDelim ) ) )
|
|
{
|
|
++ulTokens;
|
|
if( ulDelim == 1 && *szDelim == ' ' )
|
|
{
|
|
while( ul + 1 < ulLen && szLine[ ul + 1 ] == ' ' )
|
|
++ul;
|
|
}
|
|
ul += ulDelim - 1;
|
|
}
|
|
++ul;
|
|
}
|
|
|
|
return ulTokens;
|
|
}
|
|
|
|
static char * hb_tokenGet( char * szLine, ULONG ulLen,
|
|
char * szDelim, ULONG ulDelim,
|
|
BOOL fSkipStrings, BOOL fDoubleQuoteOnly,
|
|
ULONG ulToken, ULONG * pulLen )
|
|
{
|
|
ULONG ul, ulStart;
|
|
char cQuote = 0;
|
|
|
|
for( ul = ulStart = 0; ul < ulLen; ++ul )
|
|
{
|
|
if( cQuote )
|
|
{
|
|
if( szLine[ ul ] == cQuote )
|
|
cQuote = 0;
|
|
}
|
|
else if( fSkipStrings && ( szLine[ ul ] == '"' ||
|
|
( !fDoubleQuoteOnly && szLine[ ul ] == '\'' ) ) )
|
|
cQuote = szLine[ ul ];
|
|
else if( szLine[ ul ] == szDelim[ 0 ] &&
|
|
( ulDelim == 1 || !memcmp( szLine + ul, szDelim, ulDelim ) ) )
|
|
{
|
|
if( --ulToken == 0 )
|
|
{
|
|
* pulLen = ul - ulStart;
|
|
return szLine + ulStart;
|
|
}
|
|
if( ulDelim == 1 && *szDelim == ' ' )
|
|
{
|
|
while( ul + 1 < ulLen && szLine[ ul + 1 ] == ' ' )
|
|
++ul;
|
|
}
|
|
ulStart = ul + ulDelim;
|
|
}
|
|
}
|
|
if( --ulToken == 0 )
|
|
{
|
|
* pulLen = ul - ulStart;
|
|
return szLine + ulStart;
|
|
}
|
|
* pulLen = 0;
|
|
return NULL;
|
|
}
|
|
|
|
static PHB_ITEM hb_tokenArray( char * szLine, ULONG ulLen,
|
|
char * szDelim, ULONG ulDelim,
|
|
BOOL fSkipStrings, BOOL fDoubleQuoteOnly )
|
|
{
|
|
ULONG ulTokens = hb_tokenCount( szLine, ulLen, szDelim, ulDelim,
|
|
fSkipStrings, fDoubleQuoteOnly );
|
|
PHB_ITEM pArray = hb_itemArrayNew( ulTokens );
|
|
|
|
if( ulTokens )
|
|
{
|
|
ULONG ul, ulStart, ulToken;
|
|
char cQuote = 0;
|
|
|
|
for( ul = ulStart = ulToken = 0; ul < ulLen; ++ul )
|
|
{
|
|
if( cQuote )
|
|
{
|
|
if( szLine[ ul ] == cQuote )
|
|
cQuote = 0;
|
|
}
|
|
else if( fSkipStrings && ( szLine[ ul ] == '"' ||
|
|
( !fDoubleQuoteOnly && szLine[ ul ] == '\'' ) ) )
|
|
cQuote = szLine[ ul ];
|
|
else if( szLine[ ul ] == szDelim[ 0 ] &&
|
|
( ulDelim == 1 || !memcmp( szLine + ul, szDelim, ulDelim ) ) )
|
|
{
|
|
hb_arraySetCL( pArray, ++ulToken, szLine + ulStart, ul - ulStart );
|
|
if( ulDelim == 1 && *szDelim == ' ' )
|
|
{
|
|
while( ul + 1 < ulLen && szLine[ ul + 1 ] == ' ' )
|
|
++ul;
|
|
}
|
|
ulStart = ul + ulDelim;
|
|
}
|
|
}
|
|
hb_arraySetCL( pArray, ++ulToken, szLine + ulStart, ul - ulStart );
|
|
}
|
|
|
|
return pArray;
|
|
}
|
|
|
|
static void hb_tokenParam( int iDelim, ULONG ulSkip,
|
|
char ** pszLine, ULONG * pulLen,
|
|
char ** pszDelim, ULONG * pulDelim )
|
|
{
|
|
char * szLine = hb_parc( 1 ), * szDelim = NULL;
|
|
ULONG ulLen = hb_parclen( 1 ), ulDelim = 0;
|
|
|
|
if( ulLen )
|
|
{
|
|
if( ulSkip )
|
|
{
|
|
szLine += ulSkip;
|
|
if( ulLen <= ulSkip )
|
|
ulLen = 0;
|
|
else
|
|
ulLen -= ulSkip;
|
|
}
|
|
|
|
ulDelim = hb_parclen( iDelim );
|
|
if( ulDelim )
|
|
szDelim = hb_parc( iDelim );
|
|
else
|
|
{
|
|
szDelim = " ";
|
|
ulDelim = 1;
|
|
}
|
|
|
|
if( ulDelim == 1 && *szDelim == ' ' )
|
|
{
|
|
while( ulLen && * szLine == ' ' )
|
|
{
|
|
++szLine;
|
|
--ulLen;
|
|
}
|
|
while( ulLen && szLine[ ulLen - 1 ] == ' ' )
|
|
--ulLen;
|
|
}
|
|
}
|
|
|
|
*pulLen = ulLen;
|
|
*pulDelim = ulDelim;
|
|
*pszLine = szLine;
|
|
*pszDelim = szDelim;
|
|
}
|
|
|
|
HB_FUNC( HB_TOKENCOUNT )
|
|
{
|
|
char * szLine, * szDelim;
|
|
ULONG ulLen, ulDelim;
|
|
|
|
hb_tokenParam( 2, 0, &szLine, &ulLen, &szDelim, &ulDelim );
|
|
|
|
if( szLine )
|
|
hb_retnint( hb_tokenCount( szLine, ulLen, szDelim, ulDelim,
|
|
hb_parl( 3 ), hb_parl( 4 ) ) );
|
|
else
|
|
hb_retni( 0 );
|
|
}
|
|
|
|
HB_FUNC( HB_TOKENGET )
|
|
{
|
|
char * szLine, * szDelim;
|
|
ULONG ulLen, ulDelim;
|
|
|
|
hb_tokenParam( 3, 0, &szLine, &ulLen, &szDelim, &ulDelim );
|
|
|
|
if( szLine )
|
|
{
|
|
szLine = hb_tokenGet( szLine, ulLen, szDelim, ulDelim,
|
|
hb_parl( 4 ), hb_parl( 5 ),
|
|
hb_parnl( 2 ), &ulLen );
|
|
hb_retclen( szLine, ulLen );
|
|
}
|
|
else
|
|
hb_retc( NULL );
|
|
}
|
|
|
|
/* like HB_TOKENGET() but returns next token starting from passed position
|
|
* (0 based) inside string, f.e.:
|
|
* HB_TOKENPTR( cString, @nTokPos, Chr( 9 ) ) -> cToken
|
|
*/
|
|
HB_FUNC( HB_TOKENPTR )
|
|
{
|
|
char * szLine, * szDelim, * szToken;
|
|
ULONG ulLen, ulDelim, ulSkip, ulToken;
|
|
|
|
hb_tokenParam( 3, hb_parnl( 2 ), &szLine, &ulLen, &szDelim, &ulDelim );
|
|
|
|
if( szLine )
|
|
{
|
|
szToken = hb_tokenGet( szLine, ulLen, szDelim, ulDelim,
|
|
hb_parl( 4 ), hb_parl( 5 ),
|
|
1, &ulToken );
|
|
if( szToken && ulLen > ulToken )
|
|
ulSkip = szToken - hb_parc( 1 ) + ulToken + ulDelim;
|
|
else
|
|
ulSkip = hb_parclen( 1 ) + 1;
|
|
|
|
/* return position to start next search from */
|
|
hb_stornl( ulSkip, 2 );
|
|
/* return token */
|
|
hb_retclen( szToken, ulToken );
|
|
}
|
|
else
|
|
hb_retc( NULL );
|
|
}
|
|
|
|
HB_FUNC( HB_ATOKENS )
|
|
{
|
|
char * szLine, * szDelim;
|
|
ULONG ulLen, ulDelim;
|
|
|
|
hb_tokenParam( 2, 0, &szLine, &ulLen, &szDelim, &ulDelim );
|
|
|
|
if( szLine )
|
|
hb_itemReturnRelease( hb_tokenArray( szLine, ulLen, szDelim, ulDelim,
|
|
hb_parl( 3 ), hb_parl( 4 ) ) );
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 1123, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( __STRTOKEN )
|
|
{
|
|
HB_FUNC_EXEC( HB_TOKENGET );
|
|
}
|
|
|
|
HB_FUNC( __STRTKPTR )
|
|
{
|
|
HB_FUNC_EXEC( HB_TOKENPTR );
|
|
}
|
|
|
|
HB_FUNC( __STRTOKENCOUNT )
|
|
{
|
|
HB_FUNC_EXEC( HB_TOKENCOUNT );
|
|
}
|