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

2000-06-02 14:45 UTC-0800 Ron Pinkas <Ron@Profit-Master.com>

Browse Source 
* source/pp/ppcore.c
     ! Added logic to CommandStuff() to fix problem with Keyword or Match Marker are matched after non provided multiple optional patterns.
This commit is contained in:
Ron Pinkas
2000-06-02 21:57:13 +00:00
parent 7b24fd3601
commit dc5211fc52
2 changed files with 54 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
harbour/ChangeLog
View File

@@ -1,16 +1,21 @@
2000-06-02 14:45 UTC-0800 Ron Pinkas <Ron@Profit-Master.com>
* source/pp/ppcore.c
! Added logic to CommandStuff() to fix problem with Keyword or Match Marker are matched after non provided multiple optional patterns.
2000-06-02 19:56 UTC+0100 Victor Szakats <info@szelvesz.hu>
* utils/hbtest/hbtest.prg
* utils/hbtest/make_xpp.bat
* utils/hbtest/make_xpp.cmd
* utils/hbtest/hbtest.prg
* utils/hbtest/make_xpp.bat
* utils/hbtest/make_xpp.cmd
! HBTEST was broken for Xbase++. Fixed.
* source/rtl/minmax.c
* source/rtl/mlpos.c
* source/rtl/mod.c
* source/rtl/mouseapi.c
* source/rtl/strmatch.c
* source/rtl/strtran.c
* source/rtl/minmax.c
* source/rtl/mlpos.c
* source/rtl/mod.c
* source/rtl/mouseapi.c
* source/rtl/strmatch.c
* source/rtl/strtran.c
* Minor typos, formattings, optimizations.
2000-06-02 15:39 UTC+0100 Victor Szakats <info@szelvesz.hu>

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

@@ -1074,7 +1074,47 @@ static int CommandStuff( char * ptrmp, char * inputLine, char * ptro, int * lenr
ptr = PrevSquare( ptr, strtopti, NULL );
if( ptr )
ptrmp = ptr;
/* Ron Pinkas added 2000-06-02 14:45 UTC-0800 */
else if( *ptrmp == '[' )
{
ptr = strtopti+ipos;
while ( ptr > strtopti && *(--ptr) != ']' ) ;
{
char * ptrTemp;
ptrTemp = ++ptrmp;
SkipOptional( &ptrmp );
while( *(ptrmp + 2) == '[' && ptrmp != ptrTemp )
{
ptrmp += 3;
SkipOptional( &ptrmp );
}
}
}
/* Ron Pinkas End */
}
/* Ron Pinkas added 2000-06-02 14:45 UTC-0800 */
else if( ipos && *ptrmp == '[' )
{
ptr = strtopti+ipos;
while ( ptr > strtopti && *(--ptr) != ']' ) ;
{
char * ptrTemp;
ptrTemp = ++ptrmp;
SkipOptional( &ptrmp );
while( *(ptrmp + 2) == '[' && ptrmp != ptrTemp )
{
ptrmp += 3;
SkipOptional( &ptrmp );
}
}
}
/* Ron Pinkas End */
}
switch( *ptrmp ) {
case '[':