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

2001-03-02 09:10 UTC-0800 Ron Pinkas <ron@profit-master.com>

Browse Source 
* source/pp/ppcore.c
     ! Fixed handling of [Smart] Stringify of a period terminated macro.
This commit is contained in:
Ron Pinkas
2001-03-02 17:16:23 +00:00
parent 5f748b1566
commit e8ddd4fcb6
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
harbour/ChangeLog
View File

@@ -1,3 +1,7 @@
2001-03-02 09:10 UTC-0800 Ron Pinkas <ron@profit-master.com>
* source/pp/ppcore.c
! Fixed handling of [Smart] Stringify of a period terminated macro.
2001-03-01 GMT+1 Antonio Linares <alinares@fivetech.com>
* harbour/include/hbapi.h
+ New function ISOBJECT() added.

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

@@ -2585,6 +2585,10 @@ static int ReplacePattern( char patttype, char * expreal, int lenreal, char * pt
if( ! ifou )
{
lenitem--;
if( expreal[lenitem - 1] == '.' )
{
lenitem--;
}
}
hb_pp_Stuff( expreal + 1, ptro, lenitem, 0, lenres );
}
@@ -2609,6 +2613,11 @@ static int ReplacePattern( char patttype, char * expreal, int lenreal, char * pt
if( *expreal == '&' )
{
rmlen--;
if( expreal[lenreal - 1] == '.' )
{
rmlen--;
lenreal--;
}
hb_pp_Stuff( expreal + 1, ptro, lenreal - 1, 4, lenres );
}
else /* END Ron Pinkas 2000-01-21 */
@@ -2637,7 +2646,14 @@ static int ReplacePattern( char patttype, char * expreal, int lenreal, char * pt
( *expreal == '\'' && *(expreal+lenitem-1)=='\'' ) )
{
if( ifou ) lenitem++;
if( *expreal == '&' ) lenitem--;
if( *expreal == '&' )
{
lenitem--;
if( expreal[lenitem - 1] == '.' )
{
lenitem--;
}
}
hb_pp_Stuff( ( *expreal=='&' ) ? expreal + 1 : expreal, ptro,
lenitem, 0, lenres );
}
@@ -2662,7 +2678,15 @@ static int ReplacePattern( char patttype, char * expreal, int lenreal, char * pt
( *expreal == '\"' && *( expreal + lenreal - 1 ) == '\"' ) ||
( *expreal == '\'' && *( expreal + lenreal - 1 ) == '\'' ) )
{
if( *expreal == '&' ) rmlen--;
if( *expreal == '&' )
{
rmlen--;
if( expreal[lenreal - 1] == '.' )
{
rmlen--;
lenreal--;
}
}
hb_pp_Stuff( ( *expreal == '&' ) ? expreal + 1 : expreal, ptro,
( *expreal == '&' ) ? lenreal - 1 : lenreal, 4, lenres );
}