diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6de69e951c..35014dca59 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,20 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-05-30 18:10 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * include/hbsetup.h + * include/hbinit.h + * source/compiler/harbour.yyc + * source/compiler/harbour.y + * HARBOUR_YYDEBUG -> HB_YYDEBUG + (do we need this? it's a synomym for YYDEBUG) + * HARBOUR_STRICT_ANSI_C -> HB_STRICT_ANSI_C + (do we need this?) + + HB_PCRE_REGEX added. + + HB_PCRE_REGEX_BCC added. + + HB_POSIX_REGEX added. + - HB_MACRO_STATEMENTS + 2008-05-30 17:36 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * source/common/hbverdsp.c * Some cleanups on appearance. diff --git a/harbour/include/hbinit.h b/harbour/include/hbinit.h index ef897cbc8b..cd3a396d62 100644 --- a/harbour/include/hbinit.h +++ b/harbour/include/hbinit.h @@ -62,7 +62,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbolsEx( PHB_SYMB pSymbols, USHORT uiSym #if defined(_MSC_VER) && !defined(_WIN64) && \ !defined(__LCC__) && !defined(__POCC__) && !defined(__XCC__) && \ - !defined(HARBOUR_STRICT_ANSI_C) && !defined(HB_STATIC_STARTUP) && \ + !defined(HB_STRICT_ANSI_C) && !defined(HB_STATIC_STARTUP) && \ !defined(HB_PRAGMA_STARTUP) && !defined(HB_MSC_STARTUP) /* In order to maintain compatibility with other products, MSVC should @@ -86,7 +86,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbolsEx( PHB_SYMB pSymbols, USHORT uiSym #define HB_INIT_SYMBOLS_END( func ) HB_INIT_SYMBOLS_EX_END( func, __FILE__, 0L, 0x0000 ) -#if defined(HARBOUR_STRICT_ANSI_C) +#if defined(HB_STRICT_ANSI_C) #define HB_INIT_SYMBOLS_BEGIN( func ) \ static HB_SYMB symbols_table[] = { diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h index f287996379..a8681391e2 100644 --- a/harbour/include/hbsetup.h +++ b/harbour/include/hbsetup.h @@ -77,35 +77,6 @@ #define HB_LANG_DEFAULT EN #endif -/* *********************************************************************** - * This symbol defines if Harbour is compiled using C compiler - * that support strict ANSI C only - * - * The only non ANSI C feature that we are using is an ability - * to call functions before the 'main' module is called. - * This trick is used to automatically join all symbol tables defined - * in run-time support modules and in user defined modules. - * If strict ANSI C compability is required then all symbol tables - * have to be joined manually by calling special function named - * hb_vm_SymbolInit_ - * (for example for myfirst.prg it will be: 'hb_vm_SymbolInit_MYFIRST' - * The generation of this function is performed by the macro called - * HB_CALL_ON_STARTUP that is defined in 'hbinit.h' - * - * By default we are using extensions to ANSI C (symbol is not defined) - */ -/* #define HARBOUR_STRICT_ANSI_C */ - -/* *********************************************************************** - * Define this option if you want the /y YACC trace option to be available - * in the Harbour compiler. - * - * Note that if you turn this on, the compiler will slighly grow in size. - * - * By default this is turned off. - */ -/* #define HARBOUR_YYDEBUG */ - /* *********************************************************************** * If you turn this on, the memory subsystem will collect trace information * and several statistical data about memory management, it will show @@ -131,6 +102,55 @@ #define HB_NO_PROFILER #endif +/* *********************************************************************** + * Use system PCRE library instead of build in. I'm setting it sometimes + * when I want to use exactly the same PCRE version as installed in + * a system. + */ +/* #define HB_PCRE_REGEX */ + +/* *********************************************************************** + * Use old PCRE library which is part of BCC CRTL used to emulate + * POSIX regex. + */ +/* #define HB_PCRE_REGEX_BCC */ + +/* *********************************************************************** + * Use POSIX regex library which should be part of each POSIX compatible + * system / C compiler I also use this when I want to support exactly + * the same regular expressions as other tools installed in the system + */ +/* #define HB_POSIX_REGEX */ + +/* *********************************************************************** + * This symbol defines if Harbour is compiled using C compiler + * that support strict ANSI C only + * + * The only non ANSI C feature that we are using is an ability + * to call functions before the 'main' module is called. + * This trick is used to automatically join all symbol tables defined + * in run-time support modules and in user defined modules. + * If strict ANSI C compability is required then all symbol tables + * have to be joined manually by calling special function named + * hb_vm_SymbolInit_ + * (for example for myfirst.prg it will be: 'hb_vm_SymbolInit_MYFIRST' + * The generation of this function is performed by the macro called + * HB_CALL_ON_STARTUP that is defined in 'hbinit.h' + * + * By default we are using extensions to ANSI C (symbol is not defined) + */ +/* #define HB_STRICT_ANSI_C */ + +/* *********************************************************************** + * Define this option if you want the /y YACC trace option to be available + * in the Harbour compiler. + * + * Note that if you turn this on, the compiler will slighly grow in size. + * + * By default this is turned off. + */ +/* #define HB_YYDEBUG */ + /* *********************************************************************** * Use native Windows memory allocation functions (HB_OS_WIN_32) * This option can disable compiler memory allocation optimization @@ -173,16 +193,6 @@ */ /* #define HB_PP_MULTILINE_STRING */ -/* *********************************************************************** - * You can select here, if the preprocessor should be linked - * for commands preprocessing passed to the macro compiler. - * (Note, that if it is linked then commands preprocessing can be - * disabled/enabled at runtime using HB_SETMACRO() function - * - * By default we do not support commands in the macro compiler. - */ -/* #define HB_MACRO_STATEMENTS */ - /* *********************************************************************** * Detect GCC/OS2 */ diff --git a/harbour/source/compiler/harbour.y b/harbour/source/compiler/harbour.y index 4eb8a325a1..1417919191 100644 --- a/harbour/source/compiler/harbour.y +++ b/harbour/source/compiler/harbour.y @@ -92,7 +92,7 @@ static void hb_compSwitchEnd( HB_COMP_DECL ); static HB_EXPR_PTR hb_compCheckPassByRef( HB_COMP_DECL, HB_EXPR_PTR pExpr ); -#ifdef HARBOUR_YYDEBUG +#ifdef HB_YYDEBUG #define YYDEBUG 1 /* Parser debug information support */ #endif diff --git a/harbour/source/compiler/harbour.yyc b/harbour/source/compiler/harbour.yyc index 7c3c3ea3fa..c8b73153b9 100644 --- a/harbour/source/compiler/harbour.yyc +++ b/harbour/source/compiler/harbour.yyc @@ -387,7 +387,7 @@ static void hb_compSwitchEnd( HB_COMP_DECL ); static HB_EXPR_PTR hb_compCheckPassByRef( HB_COMP_DECL, HB_EXPR_PTR pExpr ); -#ifdef HARBOUR_YYDEBUG +#ifdef HB_YYDEBUG #define YYDEBUG 1 /* Parser debug information support */ #endif