From c002ff28ee8cbabc5ce1731b98c5d61e06c1036b Mon Sep 17 00:00:00 2001 From: Ron Pinkas Date: Tue, 20 Jun 2000 15:46:11 +0000 Subject: [PATCH] 2000-06-20 08:45 UTC-0800 Ron Pinkas * source/pp/ppcore.c * Removed some /* reported as nested comments --- harbour/ChangeLog | 4 ++++ harbour/source/pp/ppcore.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fc7d223fae..baafa6fd4d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,7 @@ +2000-06-20 08:45 UTC-0800 Ron Pinkas + * source/pp/ppcore.c + * Removed some /* reported as nested comments + 2000-06-20 11:15 GMT+1 Antonio Linares * include/hbclass.ch * small fix for SETGET methods diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c index 4416e14112..15084dcc4d 100644 --- a/harbour/source/pp/ppcore.c +++ b/harbour/source/pp/ppcore.c @@ -995,7 +995,7 @@ int hb_pp_ParseExpression( char * sLine, char * sOutLine ) HB_SKIPTABSPACES( ptri ); if( ( *ptri == '\0' || ( *ptri != '=' && - (!IsInStr(*ptri,":/*+-%^") || *(ptri+1) != '=') && + (!IsInStr(*ptri,":/+*-%^") || *(ptri+1) != '=') && ( *ptri != '-' || *(ptri+1) != '>' ) ) ) && ( stcmd = ComSearch(sToken,NULL) ) != NULL ) { @@ -1854,7 +1854,7 @@ static int getExpReal( char * expreal, char ** ptri, BOOL prlist, int maxrez ) StBr2++; State = STATE_BRACKET; } - /* Ron Pinkas end 2000-06-17 */ + Ron Pinkas end 2000-06-17 */ else if( **ptri == '{' ) { StBr3++; @@ -1934,10 +1934,10 @@ static BOOL isExpres( char * stroka ) printf( "Len1: %i Len2: %i RealExp: >%s< Last: %c\n", l1, l2, stroka - l2, ( stroka - l2 )[l1-1] ); */ - /* Ron Pinkas modified 2000-06-17 Expression can't be valid if last charcter is one of these: ":/*+-%^=(<>" + /* Ron Pinkas modified 2000-06-17 Expression can't be valid if last charcter is one of these: ":/+*-%^=(<>" return ( l1 <= l2 ); */ - return ( l1 <= l2 && ! IsInStr( ( stroka - l2 )[l1-1], ":/*+-%^=(<>[{" ) ); + return ( l1 <= l2 && ! IsInStr( ( stroka - l2 )[l1-1], ":/+*-%^=(<>[{" ) ); } static BOOL TestOptional( char *ptr1, char *ptr2 )