diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f95ccf598e..14ae306e86 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,9 @@ +2000-06-04 11:16 UTC-0800 Ron Pinkas + + * source/pp/ppcomp.c + * source/pp/ppcore.c + ! Corrected compiler warnings + 2000-06-04 18:51 UTC+0100 Victor Szakats * utils/hbdoc/Makefile @@ -6,7 +12,7 @@ 2000-06-04 09:40 UTC-0800 Ron Pinkas * source/pp/ppcore.c - * Changed case of '@' in hb_pp_RdStr() to only add missing space when in the begining of a new line. + * Changed case of '@' in hb_pp_RdStr() to only add missing space when in the beginning of a new line. 2000-06-04 09:20 GMT -3 Luiz Rafael Culik *utils/hbdoc/hbdoc.prg diff --git a/harbour/source/pp/ppcomp.c b/harbour/source/pp/ppcomp.c index 250c58f92b..199a1dceef 100644 --- a/harbour/source/pp/ppcomp.c +++ b/harbour/source/pp/ppcomp.c @@ -185,7 +185,7 @@ int hb_pp_ReadRules( void ) char * ptr; int lContinue; int lens, rdlen; - int lLine = 0, i; + int lLine = 0; HB_TRACE(HB_TR_DEBUG, ("hb_pp_ReadRules()")); diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c index c7c382671d..ab5b7a3b28 100644 --- a/harbour/source/pp/ppcore.c +++ b/harbour/source/pp/ppcore.c @@ -124,7 +124,10 @@ static int StringToInt( char *, int ); static BOOL IsOnOffSwitch( char *, BOOL ); static void DebugPragma( char *, int, BOOL ); +/* Ron Pinkas Added */ void hb_pp_Table( void ); +int hb_pp_ReadRules( void ); +/* Ron Pinkas End */ static BOOL s_bTracePragma = FALSE; @@ -195,7 +198,9 @@ char * hb_pp_szWarnings[] = void hb_pp_SetRules( BOOL (*hb_compInclude)(char *, PATHNAMES * ) ) { + /* COMMANDS * stcmd; + */ if( hb_pp_STD_CH ) { @@ -220,9 +225,8 @@ void hb_pp_SetRules( BOOL (*hb_compInclude)(char *, PATHNAMES * ) ) hb_pp_ReadRules(); - stcmd = hb_pp_topCommand; - /* + stcmd = hb_pp_topCommand; while ( stcmd ) { printf( "Command: %s Pattern: %s\n", stcmd->name, stcmd->mpatt ); @@ -1157,12 +1161,16 @@ static int CommandStuff( char * ptrmp, char * inputLine, char * ptro, int * lenr char * ptrTemp; ptrTemp = ++ptrmp; + printf( "\n1 Skipping: %s\n", ptrmp ); SkipOptional( &ptrmp ); + printf( "\n1 After Skipping: %s\n", ptrmp ); while( *(ptrmp + 2) == '[' && ptrmp != ptrTemp ) { ptrmp += 3; + printf( "\n2 Skipping: %s\n", ptrmp ); SkipOptional( &ptrmp ); + printf( "\n2 After Skipping: %s\n", ptrmp ); } } } @@ -1180,12 +1188,16 @@ static int CommandStuff( char * ptrmp, char * inputLine, char * ptro, int * lenr char * ptrTemp; ptrTemp = ++ptrmp; + printf( "\n3 Skipping: %s\n", ptrmp ); SkipOptional( &ptrmp ); + printf( "\n3 After Skipping: %s\n", ptrmp ); while( *(ptrmp + 2) == '[' && ptrmp != ptrTemp ) { ptrmp += 3; + printf( "\n4 Skipping: %s\n", ptrmp ); SkipOptional( &ptrmp ); + printf( "\n4 After Skipping: %s\n", ptrmp ); } } } @@ -2120,7 +2132,7 @@ int hb_pp_RdStr( FILE * handl_i, char * buffer, int maxlen, BOOL lDropSpaces, ch char cha, cLast = '\0', symbLast = '\0'; /* Ron Pinkas Begin 2000-06-04 */ - BOOL bNewLine = TRUE; + static BOOL bNewLine = TRUE; /* Ron Pinkas End */ HB_TRACE(HB_TR_DEBUG, ("hb_pp_RdStr(%p, %s, %d, %d, %s, %p, %p)", handl_i, buffer, maxlen, lDropSpaces, sBuffer, lenBuffer, iBuffer));