a70ce60954
* harbour/src/rdd/dbfnsx/dbfnsx1.c
! fixed bug reported by Jaroslav Janik (many thanks) - if index FOR
expression excluded all records from non empty table then root page
was not initialized and DBFNSX generated corruption RTE.
* harbour/utils/hbi18n/hbi18n.prg
* set default GT to CGI
* harbour/src/common/hbgete.c
! fixed memory leak in non UNICODE Windows hb_getenv_buffer()
! add C stack buffers to eliminate memory allocation in UNICODE
Windows hb_getenv_buffer() - they are used if envvar name and
passed buffer are not too large. It fixes HB_FM_STATISTICS
Windows builds.
* harbour/contrib/hbwin/wapi_winuser.c
+ added WAPI_DESTROYWINDOW function
* harbour/contrib/xhb/traceprg.prg
* harbour/contrib/xhb/hbcompat.ch
! fixed typo in TraceLog() condition - was always disabled
+ added emulation for xHarbour Set( _SET_TRACE* [, <params,...> ] )
settings
* harbour/src/vm/hvmall.c
! define _GNU_SOURCE to fix compilation with HB_FM_DL_ALLOC in Linux
builds
* harbour/include/hbdefs.h
* declare HB_FOFFSET as LONG instead of LONGLONG on platforms where
LONG is 64bit integer to be compatible with C RTL file API
* harbour/src/vm/maindllh.c
* harbour/src/vm/maindllp.c
* harbour/contrib/hbct/ctstr.c
! casting in HB_TRACE() massages
* harbour/include/hbapi.h
* harbour/include/hbapiitm.h
* harbour/src/vm/arrays.c
* harbour/src/vm/hashes.c
* harbour/src/vm/itemapi.c
+ added hb_arrayCloneTo(), hb_hashCloneTo(), hb_itemCloneTo()
* harbour/src/vm/arrayshb.c
* harbour/src/vm/classes.c
* harbour/src/vm/hashes.c
* harbour/src/vm/hashfunc.c
* harbour/src/vm/hvm.c
% use hb_*CloneTo() instead of hb_*Clone()
* harbour/include/hbapi.h
* harbour/src/vm/garbage.c
- removed hb_gcRegisterSweep() function and support for user defined
sweep mark functions in GC blocks
- removed hb_gcAlloc() function
+ added new function hb_gcAllocate() which work in similar way to removed
hb_gcAlloc() function but it accepts as second parameter HB_GC_FUNCS
structure instead of HB_GARBAGE_FUNC_PTR and returned GC blocks are
locked so programmer does not have to worry that they can be removed
by GC.
+ added new internal function hb_gcAllocRaw() which works like
hb_gcAllocate() but returned GC blocks are not locked. They can
be used only in HVM in places well known that cannot activate
automatic GC scan. It should not be used by 3-rd party code.
* harbour/include/hbapi.h
* harbour/include/hbapiitm.h
* harbour/src/vm/extend.c
* harbour/src/vm/itemapi.c
* modified hb_parptrGC(), hb_parvptrGC(), hb_arrayGetPtrGC(),
hb_itemGetPtrGC() functions to use HB_GC_FUNCS structure instead
of HB_GARBAGE_FUNC_PTR
* modified hb_itemPutPtrGC() and indirectly related functions like
hb_arraySetPtrGC() or hb_stor[v]ptrGC() to automatically unlock
passed GC block just after attaching to known HVM item.
* harbour/include/hbregex.h
* harbour/src/rtl/hbregexc.c
* declare GC block detractor as static function
+ added hb_regexIs() function
* updated to work with new GC API
* removed unnecessary in new GC API hb_gcLock() call - GC blocks
allocated by hb_gcAllocate() are already locked and they mustn't
be locked explicitly by programmer (until he does not exactly knows
what he does ;))
* harbour/src/rtl/hbregex.c
* use hb_regexIs() instead of using regex GC destructor
* removed unnecessary in new GC API hb_gcUnlock() call - GC blocks
stored in HB_IT_POINTER item are automatically unlocked
* harbour/src/rtl/hbinet.c
* harbour/contrib/hbcurl/hbcurl.c
* updated to work with new GC API
% unlock items storing callback codeblocks and use GC mark functions
to mark them as used in GC passes
* harbour/src/pp/pplib.c
* harbour/src/vm/runner.c
* harbour/src/vm/codebloc.c
* harbour/src/vm/hashes.c
* harbour/src/vm/hvm.c
* harbour/src/vm/arrays.c
* harbour/src/vm/thread.c
* harbour/src/vm/dynlibhb.c
* harbour/src/rtl/hbzlibgz.c
* harbour/src/rtl/hbregex.c
* harbour/src/rtl/hbregexc.c
* harbour/src/rtl/hbgtcore.c
* harbour/src/rtl/hbi18n1.c
* harbour/src/rdd/wacore.c
* harbour/contrib/hbsqlit3/hbsqlit3.c
* harbour/contrib/hbnetio/netiosrv.c
* harbour/contrib/hbmzip/hbmzip.c
* harbour/contrib/hbhpdf/harupdf.c
* harbour/contrib/hbwin/olecore.c
* harbour/contrib/hbwin/win_prn1.c
* harbour/contrib/hbwin/win_dll.c
* updated code which was using hb_gcAlloc() to work with new GC API.
* harbour/contrib/hbwin/axcore.c
* updated syntax description
TODO: update contrib code: hbqt, hbssl, ... to work with new GC API.
I would like to ask authors of above libraries to do it.
TODO: defined when and how we should free AX control and user callback
handler and update AX code to respect new definition
146 lines
4.6 KiB
C
146 lines
4.6 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.
|
|
*
|
|
*/
|
|
|
|
#ifndef HB_REGEX_H_
|
|
#define HB_REGEX_H_
|
|
|
|
#include "hbapi.h"
|
|
|
|
#if defined( _HB_REGEX_INTERNAL_ )
|
|
|
|
#if defined( HB_HAS_PCRE )
|
|
# include <pcre.h>
|
|
# undef HB_POSIX_REGEX
|
|
#elif defined( HB_OS_UNIX )
|
|
# include <sys/types.h>
|
|
# include <regex.h>
|
|
# define HB_POSIX_REGEX
|
|
#elif defined( __BORLANDC__ )
|
|
# include <pcreposi.h>
|
|
# define HB_POSIX_REGEX
|
|
#else
|
|
# error pcre component required, but not available
|
|
#endif
|
|
|
|
typedef struct
|
|
{
|
|
BOOL fFree;
|
|
int iFlags;
|
|
int iEFlags;
|
|
#if defined( HB_HAS_PCRE )
|
|
pcre * re_pcre;
|
|
#elif defined( HB_POSIX_REGEX )
|
|
regex_t reg;
|
|
#endif
|
|
} HB_REGEX;
|
|
typedef HB_REGEX * PHB_REGEX;
|
|
|
|
#if defined( HB_HAS_PCRE )
|
|
#define HB_REGMATCH int
|
|
#define HB_REGMATCH_SIZE( n ) ( ( n ) * 3 )
|
|
#define HB_REGMATCH_SO( p, n ) ( p )[ ( n ) * 2 ]
|
|
#define HB_REGMATCH_EO( p, n ) ( p )[ ( n ) * 2 + 1 ]
|
|
#elif defined( HB_POSIX_REGEX )
|
|
#define HB_REGMATCH regmatch_t
|
|
#define HB_REGMATCH_SIZE( n ) ( n )
|
|
#define HB_REGMATCH_SO( p, n ) ( p )[ n ].rm_so
|
|
#define HB_REGMATCH_EO( p, n ) ( p )[ n ].rm_eo
|
|
#else
|
|
#define HB_REGMATCH int
|
|
#define HB_REGMATCH_SIZE( n ) ( ( n ) * 2 )
|
|
#define HB_REGMATCH_SO( p, n ) ( p )[ ( n ) * 2 ]
|
|
#define HB_REGMATCH_EO( p, n ) ( p )[ ( n ) * 2 + 1 ]
|
|
#endif
|
|
|
|
typedef void ( * HB_REG_FREE )( PHB_REGEX );
|
|
typedef int ( * HB_REG_COMP )( PHB_REGEX, const char * );
|
|
typedef int ( * HB_REG_EXEC )( PHB_REGEX, const char *, ULONG, int, HB_REGMATCH * );
|
|
|
|
extern void hb_regexInit( HB_REG_FREE pFree, HB_REG_COMP pComp, HB_REG_EXEC pExec );
|
|
extern BOOL hb_regexIs( PHB_ITEM pItem );
|
|
|
|
#ifndef REG_EXTENDED
|
|
# define REG_EXTENDED 0x00
|
|
#endif
|
|
#ifndef REG_NOSUB
|
|
# define REG_NOSUB 0x00
|
|
#endif
|
|
|
|
#else
|
|
|
|
typedef void * PHB_REGEX;
|
|
|
|
#endif /* _HB_REGEX_INTERNAL_ */
|
|
|
|
#define HBREG_ICASE 0x01
|
|
#define HBREG_NEWLINE 0x02
|
|
#define HBREG_NOTBOL 0x04
|
|
#define HBREG_NOTEOL 0x08
|
|
#define HBREG_EXTENDED 0x10
|
|
#define HBREG_NOSUB 0x20
|
|
#define HBREG_DOTALL 0x40
|
|
|
|
#ifndef REGEX_MAX_GROUPS
|
|
# define REGEX_MAX_GROUPS 16
|
|
#endif
|
|
|
|
HB_EXTERN_BEGIN
|
|
|
|
extern HB_EXPORT PHB_REGEX hb_regexCompile( const char * szRegEx, ULONG ulLen, int iFlags );
|
|
extern HB_EXPORT PHB_REGEX hb_regexGet( PHB_ITEM pRegExItm, int iFlags );
|
|
extern HB_EXPORT void hb_regexFree( PHB_REGEX pRegEx );
|
|
extern HB_EXPORT BOOL hb_regexMatch( PHB_REGEX pRegEx, const char * szString, ULONG UlLen, BOOL fFull );
|
|
|
|
HB_EXTERN_END
|
|
|
|
#endif /* HB_REGEX_H_ */
|