From 468f30b9a010f2073278c8dbd8b64c0f645efd85 Mon Sep 17 00:00:00 2001 From: "Alexander S.Kresin" Date: Fri, 4 Apr 2003 07:18:24 +0000 Subject: [PATCH] 2003-04-04 11:20 UTC+0300 Alexander Kresin --- harbour/ChangeLog | 6 ++++++ harbour/include/hbver.h | 6 +++--- harbour/source/pp/ppcore.c | 5 +++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d1699011f6..50c9dc7cb4 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -9,6 +9,12 @@ */ +2003-04-04 11:20 UTC+0300 Alexander Kresin + * source/pp/ppcore.c + * Handling of '*' comment now is more Clipper compatible + * include/hbver.h + * changed version information + 2003-04-03 18:34 UTC+0200 Maurilio Longo * source/common/hbgete.c ! fixed warning on OS/2 GCC diff --git a/harbour/include/hbver.h b/harbour/include/hbver.h index 8891369b4c..7794faa678 100644 --- a/harbour/include/hbver.h +++ b/harbour/include/hbver.h @@ -59,14 +59,14 @@ #define HB_VER_LEX "Flex" #endif #define HB_VER_MAJOR 0 /* Major version number */ -#define HB_VER_MINOR 41 /* Minor version number */ +#define HB_VER_MINOR 42 /* Minor version number */ #define HB_VER_REVISION 0 /* Revision number */ /* TOFIX: Ideally these should be generated dynamically, until then, they should be updated by the builder. [vszakats] */ -#define HB_VER_LENTRY "2002-12-31 11:45 UTC-0500 David G. Holm " -#define HB_VER_CHLCVS "ChangeLog,v 1.4289 2002/12/31 16:47:43 dholm" +#define HB_VER_LENTRY "2003-04-04 11:20 UTC+0300 Alexander Kresin " +#define HB_VER_CHLCVS "ChangeLog,v 1.4336 2003/04/03 16:36:07 mauriliolongo" #define HB_VER_C_USR "" #define HB_VER_L_USR "" #define HB_VER_PRG_USR "" diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c index b935284f44..0513ef8662 100644 --- a/harbour/source/pp/ppcore.c +++ b/harbour/source/pp/ppcore.c @@ -2961,7 +2961,7 @@ static void pp_rQuotes( char * expreal, char * sQuotes ) } } -int hb_pp_RdStr( FILE * handl_i, char * buffer, int maxlen, BOOL lDropSpaces, char * sBuffer, int * lenBuffer, int * iBuffer ) +int hb_pp_RdStr( FILE * handl_i, char * buffer, int maxlen, BOOL lContinue, char * sBuffer, int * lenBuffer, int * iBuffer ) { #ifndef __WATCOMC__ extern BOOL hb_pp_bInline; @@ -2969,6 +2969,7 @@ int hb_pp_RdStr( FILE * handl_i, char * buffer, int maxlen, BOOL lDropSpaces, ch int readed = 0; int State = 0; char cha, cLast = '\0', symbLast = '\0'; + BOOL lDropSpaces = lContinue; HB_TRACE(HB_TR_DEBUG, ("hb_pp_RdStr(%p, %s, %d, %d, %s, %p, %p)", handl_i, buffer, maxlen, lDropSpaces, sBuffer, lenBuffer, iBuffer)); @@ -3096,7 +3097,7 @@ int hb_pp_RdStr( FILE * handl_i, char * buffer, int maxlen, BOOL lDropSpaces, ch s_ParseState = STATE_COMMENT; readed--; } - else if( !State ) + else if( !State && !lContinue ) { maxlen = readed = 0; }