diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c45ae02428..f437548c4e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,7 @@ +2000-06-21 21:35 UTC-0800 Ron Pinkas + * source/pp/ppcore.c + ! getExpReal() Fixed silly typo introduced this morning in previous fix, that broke the PP. + 2000-06-22 03:23 UTC+0100 Victor Szakats * source/rtl/filesys.c diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c index 36920d2543..9c9c8d6cbb 100644 --- a/harbour/source/pp/ppcore.c +++ b/harbour/source/pp/ppcore.c @@ -1909,13 +1909,14 @@ static int getExpReal( char * expreal, char ** ptri, BOOL prlist, int maxrez ) *expreal = '\0'; - /* - printf( "\nLen=%i \'%s\'\n", lens, expreal-lens ); - */ + #if 0 + printf( "\nLen=%i >%s<\n", lens, expreal-lens ); + #endif } /* Ron Pinkas added 2000-06-21 */ - if( STATE_QUOTE1 || STATE_QUOTE2 || STATE_QUOTE3 || StBr1 || StBr2 || StBr3 ) + if( State == STATE_QUOTE1 || State == STATE_QUOTE2 || State == STATE_QUOTE3 || + State == STATE_BRACKET || StBr1 || StBr2 || StBr3 ) { /* Alexander should we include this??? expreal = NULL; @@ -1933,25 +1934,21 @@ static BOOL isExpres( char * stroka ) HB_TRACE(HB_TR_DEBUG, ("isExpres(%s)", stroka)); - /* - printf( "Exp: >%s<\n", stroka ); - */ + #if 0 + printf( "Exp: >%s<\n", stroka ); + #endif l1 = strlen( stroka ); l2 = getExpReal( NULL, &stroka, FALSE, HB_PP_STR_SIZE ); - /* - printf( "Len1: %i Len2: %i RealExp: >%s< Last: %c\n", l1, l2, stroka - l2, ( stroka - l2 )[l1-1] ); - */ + #if 0 + printf( "Len1: %i Len2: %i RealExp: >%s< Last: %c\n", l1, l2, stroka - l2, ( stroka - l2 )[l1-1] ); + #endif /* Ron Pinkas modified 2000-06-17 Expression can't be valid if last charcter is one of these: ":/+*-%^=(<>" return ( l1 <= l2 ); */ - /* - printf( "l1: %i l2: %i\n", l1, l2 ); - */ - return ( l1 <= l2 && ! IsInStr( ( stroka - l2 )[l1-1], ":/+*-%^=(<>[{" ) ); }