8a6466e7fd
* Makefile
- source/hbpcre
- source/hbzlib
* external/Makefile
+ external/pcre
+ external/zlib
* external/pcre/Makefile
* external/zlib/Makefile
* external/libhpdf/Makefile
* external/libpng/Makefile
* include/hbsetup.h
* include/hbzlib.h
* include/hbregex.h
* source/rtl/hbzlibgz.c
* source/rtl/Makefile
* source/rtl/hbregexc.c
* source/rtl/hbregex.c
* source/rtl/hbzlib.c
* source/Makefile
* contrib/xhb/Makefile
* contrib/hbmzip/Makefile
* utils/hbmk2/hbmk2.prg
* config/global.mk
* config/lib.mk
* config/bin.mk
* config/detect.mk
* config/darwin/libs.mk
* config/linux/libs.mk
* config/wce/mingwarm.mk
* config/wce/poccarm.mk
* config/wce/msvcarm.mk
* config/win/xcc.mk
* config/win/mingw.mk
* config/win/pocc.mk
* config/win/bcc.mk
* config/win/watcom.mk
* config/win/icc.mk
* config/win/cygwin.mk
* config/win/msvc.mk
* config/dyn.mk
* config/os2/watcom.mk
* config/os2/gcc.mk
* config/bsd/libs.mk
* config/hpux/libs.mk
* config/sunos/libs.mk
* Changed the way embedded zlib and pcre are handled:
- They now reside in /external dir.
- They are now excluded from Harbour dynlib. This means they
will now be linked statically on non-*nix systems and
dynamically on *nix systems. On *nix it's probably easy to
switch to link statically. On non-*nix this is quite
complicated to do.
- If these libs are provided by the system, those will be used.
- On non-*nix systems the locally hosted versions will be used,
unless user overrides them using HB_INC_PCRE or HB_INC_ZLIB.
- There is currently no officially supported way to force usage
of locally hosted libs.
- If PCRE lib is forcibly disabled or not found, build system
will fall back to POSIX regex on *nix systems and Borland regex
with bcc compiler. Otherwise it will stop the build with an error.
- If zlib is forcibly disabled or not found, an error will be
generated at build-time (in hbrtl). hbmzip is simply skipped
in this case.
- hbmk2 will use local builds of these libs if they are present
in lib dir.
; TOFIX: hbmk script.
; TOFIX: dos builds. cmdline lenghts are most probably too big for them.
; NOTE: Bumps are expected.
; NOTE: I've yet to test/verify it.
- external/libhpdf/ori_src
- external/libhpdf/ori_dst
- Deleted. (added in prev commit by oversight)
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 HB_GARBAGE_FUNC( hb_regexRelease );
|
|
|
|
#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_ */
|