diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fac280d0e0..933c90ad51 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,10 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-03-01 05:22 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/source/pp/ppcore.c + ! fixed comments like /*/*/ + 2007-03-01 01:55 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbclass.ch * cleaned scope error message diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c index ddf95b9b5b..dc90cbc7da 100644 --- a/harbour/source/pp/ppcore.c +++ b/harbour/source/pp/ppcore.c @@ -847,7 +847,10 @@ static void hb_pp_getLine( PHB_PP_STATE pState ) case HB_PP_INLINE_COMMENT: if( ulLen > 1 && ch == '*' && pBuffer[ 1 ] == '/' ) + { pState->iInLineState = HB_PP_INLINE_OFF; + ++ul; + } break; default: @@ -865,7 +868,10 @@ static void hb_pp_getLine( PHB_PP_STATE pState ) else if( ulLen > 1 ) { if( ch == '/' && pBuffer[ 1 ] == '*' ) + { pState->iInLineState = HB_PP_INLINE_COMMENT; + ++ul; + } else if( ch == '/' && pBuffer[ 1 ] == '/' ) ulLen = ul = 0; } @@ -1028,6 +1034,7 @@ static void hb_pp_getLine( PHB_PP_STATE pState ) hb_pp_tokenAddCmdSep( pState ); #endif pState->iStreamDump = HB_PP_STREAM_COMMENT; + ul += 2; } else if( ch == ' ' || ch == '\t' ) {