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

20000405-14:28 GMT+3

Browse Source
This commit is contained in:
Alexander S.Kresin
2000-04-05 10:31:29 +00:00
parent dd8bb0b2d9
commit 7fcd9edf80
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
harbour/ChangeLog
View File

@@ -1,3 +1,7 @@
20000405-14:28 GMT+3 Alexander Kresin
* source/pp/ppcore.c
* bugs fixed, reported by Guy Roussin and Chen Kedem
20000405-10:00 GMT+3 Alexander Kresin
* contrib/rdd_ads/ads1.c
* added adsFlush() function

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

@@ -584,7 +584,7 @@ static void ParseCommand( char * sLine, BOOL com_or_xcom, BOOL com_or_tra )
HB_SKIPTABSPACES( sLine );
ipos = 0;
while( *sLine != '\0' && *sLine != ' ' && *sLine != '\t' && *sLine != '<')
while( *sLine != '\0' && *sLine != ' ' && *sLine != '\t' && *sLine != '<' && (*sLine !='(' || ipos==0) )
{
*(cmdname+ipos++) = *sLine++;
}
@@ -1844,7 +1844,7 @@ static int ReplacePattern( char patttype, char * expreal, int lenreal, char * pt
lenitem = (ifou)? ifou-1:lenreal;
if( *expreal != '\0' )
{
if( !lenitem || *expreal == '(' || *expreal == '&' ||
if( !lenitem || *expreal == '(' || (*expreal=='&' && lenreal>1) ||
( *expreal=='\"' && *(expreal+lenitem-1)=='\"' ) ||
( *expreal == '\'' && *(expreal+lenitem-1)=='\'' ) )
{
@@ -1870,7 +1870,7 @@ static int ReplacePattern( char patttype, char * expreal, int lenreal, char * pt
}
while( ifou > 0 );
}
else if( !lenreal || *expreal == '(' || *expreal == '&' ||
else if( !lenreal || *expreal == '(' || (*expreal=='&' && lenreal>1) ||
( *expreal == '\"' && *( expreal + lenreal - 1 ) == '\"' ) ||
( *expreal == '\'' && *( expreal + lenreal - 1 ) == '\'' ) )
{
@@ -2582,7 +2582,7 @@ static void ParsePragma( char * sLine )
else if( memcmp( sLine, "EXITSEVERITY", PRAGMAS_LEN ) == 0 )
{
hb_comp_iExitLevel = StringToInt( sLine, hb_comp_iExitLevel );
if( hb_comp_iExitLevel != HB_EXITLEVEL_DEFAULT &&
if( hb_comp_iExitLevel != HB_EXITLEVEL_DEFAULT &&
hb_comp_iExitLevel != HB_EXITLEVEL_SETEXIT &&
hb_comp_iExitLevel != HB_EXITLEVEL_DELTARGET )
hb_compGenError( hb_pp_szErrors, 'F', HB_PP_ERR_PRAGMA_BAD_VALUE, NULL, NULL );