From 0dd2bc56b7860c465fba115029d2801ed654be75 Mon Sep 17 00:00:00 2001 From: Ryszard Glab Date: Mon, 3 Jan 2005 13:09:47 +0000 Subject: [PATCH] 2005-01-03 14:15 UTC+0100 Ryszard Glab * include/hbexprb.c * source/compiler/exproptb.c * source/macro/macrob.c * fixed to compile with SIMPLEX defined Notice: Simplex version is not updated for a long time and it doesn't support all fixes from FLEX version --- harbour/ChangeLog | 9 +++++++++ harbour/include/hbexprb.c | 6 +++++- harbour/source/compiler/exproptb.c | 2 +- harbour/source/macro/macrob.c | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d1022cd20d..333cfa0a85 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,15 @@ 2002-12-01 23:12 UTC+0100 Foo Bar */ +2005-01-03 14:15 UTC+0100 Ryszard Glab + * include/hbexprb.c + * source/compiler/exproptb.c + * source/macro/macrob.c + * fixed to compile with SIMPLEX defined + Notice: Simplex version is not updated for a long time and + it doesn't support all fixes from FLEX version + + 2005-01-03 10:30 UTC+0100 Ryszard Glab * include/hbcomp.h * include/hbexprb.c diff --git a/harbour/include/hbexprb.c b/harbour/include/hbexprb.c index ca80985a3b..c8bc62292f 100644 --- a/harbour/include/hbexprb.c +++ b/harbour/include/hbexprb.c @@ -419,9 +419,12 @@ static HB_EXPR_FUNC( hb_compExprUseCodeblock ) break; case HB_EA_PUSH_PCODE: { -#if defined(SIMPLEX) || defined(HB_MACRO_SUPPORT) +#if defined(HB_MACRO_SUPPORT) HB_EXPR_PCODE1( hb_compExprCodeblockPush, pSelf ); #else +# if defined(SIMPLEX) + HB_EXPR_PCODE2( hb_compExprCodeblockPush, pSelf, TRUE ); +# else if( !pSelf->value.asCodeblock.isMacro || pSelf->value.asCodeblock.lateEval ) hb_compExprCodeblockPush( pSelf, TRUE ); else @@ -429,6 +432,7 @@ static HB_EXPR_FUNC( hb_compExprUseCodeblock ) /* early evaluation of a macro */ hb_compExprCodeblockEarly( pSelf ); } +# endif #endif } break; diff --git a/harbour/source/compiler/exproptb.c b/harbour/source/compiler/exproptb.c index eb92d8dcad..ed85d26f97 100644 --- a/harbour/source/compiler/exproptb.c +++ b/harbour/source/compiler/exproptb.c @@ -5,6 +5,6 @@ /* hbexprb.c is also included from ../macro/macro.c * However it produces a slighty different code if used in * macro compiler (there is an additional parameter passed to some functions) - * 1.12 - ignore this magic number - this is used to force compilation + * 1.13 - ignore this magic number - this is used to force compilation */ #include "hbexprb.c" diff --git a/harbour/source/macro/macrob.c b/harbour/source/macro/macrob.c index a89a0a9f3f..8f5bd1b8fe 100644 --- a/harbour/source/macro/macrob.c +++ b/harbour/source/macro/macrob.c @@ -5,7 +5,7 @@ /* hbexprb.c is also included from ../compiler/exproptb.c * However it produces a slighty different code if used in * macro compiler (there is an additional parameter passed to some functions) - * 1.11 - ignore this magic number - this is used to force compilation + * 1.12 - ignore this magic number - this is used to force compilation */ #define HB_MACRO_SUPPORT