fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2001-06-21 18:20 UTC-0800 Ron Pinkas <ron@profit-master.com>

Browse Source 
* source/pp/ppcore.c
     * Reinstated test for continuation token at the end of an Expression in isExpress()
       /* Clipper does not validate extracted expression like that, but Harbour PP has internal dependancy due to matching logic.
          Alexander, Clipper stops an expression when encountering the Anchor of the next NON optional Match Marker.
          Clipper accepts that expression even if it ends with continuation token (like '*').
       */
This commit is contained in:
Ron Pinkas
2001-06-22 01:25:02 +00:00
parent c09e2a2779
commit e025c159ab
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -1,3 +1,11 @@
2001-06-21 18:20 UTC-0800 Ron Pinkas <ron@profit-master.com>
* source/pp/ppcore.c
* Reinstated test for continuation token at the end of an Expression in isExpress()
/* Clipper does not validate extracted expression like that, but Harbour PP has internal dependancy due to matching logic.
Alexander, Clipper stops an expression when encountering the Anchor of the next NON optional Match Marker.
Clipper accepts that expression even if it ends with continuation token (like '*').
*/
2001-06-21 14:55 UTC-0800 Ron Pinkas <ron@profit-master.com>
* source/pp/ppcore.c
* Commented out test for continuation token at the end of an Expression in isExpress()

7
harbour/source/pp/ppcore.c
View File

@@ -1761,6 +1761,11 @@ static int WorkMarkers( char ** ptrmp, char ** ptri, char * ptro, int * lenres,
else
{
lenreal = stroncpy( expreal, *ptri, ipos-1 );
#if 0
printf( "\nExpr: '%s' ptrtemp: '%s' exppat: '%s'\n", expreal, ptrtemp, exppatt );
#endif
if( ipos > 1 && isExpres( expreal ) )
{
/*
@@ -2318,7 +2323,7 @@ static BOOL isExpres( char * stroka )
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 )