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

Updating preprocessor files

Browse Source
This commit is contained in:
Alexander S.Kresin
1999-07-28 11:06:17 +00:00
parent 3a392718fe
commit 8f30efeed5
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
harbour/ChangeLog
View File

@@ -1,3 +1,7 @@
19990728-14:44 Alexander Kresin
* source\hbpp\hbpp.c
* Bug, appeared after last change, fixed
19990728-12:30 CET Eddie Runia <eddie@runia.com>
* source/runner/runner.c
Symbols with both INIT and EXIT raised are not EXIT symbols.

22
harbour/source/hbpp/hbpp.c
View File

@@ -582,13 +582,13 @@ int ParseExpression( char* sLine, char* sOutLine )
if ( ipos > 0 )
{
*(ptri+lens) = ';';
lens += strolen( ptri+ipos );
lens += strolen( ptri+ipos ) + 1;
}
pp_Stuff ( sOutLine, ptri, ptro - sOutLine + 1, (ipos)? ipos-1:lens, lens );
if ( ipos > 0 )
pp_Stuff ( sOutLine, ptri, ptro - sOutLine, (ipos)? ipos-1:lens, lens );
if ( ipos > 0 )
{
ipos = strolen( ptri );
*(ptri+ipos) = '\0';
ipos = ptro - sOutLine + 1;
*(ptri + ipos - 1) = '\0';
}
}
else
@@ -795,9 +795,9 @@ int WorkTranslate ( char* sToken, char* ptri, char* ptro, int ndef, int *lens )
groupchar = '@';
rez = CommandStuff ( ptrmp, ptri, ptro, &lenres, FALSE );
if ( rez < 0 ) ndef = TraSearch(sToken,ndef-1);
if ( rez < 0 && ndef > 0 ) ndef = TraSearch(sToken,ndef-1);
}
while ( rez < 0 && ndef >= 0 );
while ( rez < 0 && ndef > 0 );
*(ptro+lenres) = '\0';
if ( rez >= 0 )
@@ -1479,11 +1479,11 @@ int md_strAt(char *szSub, int lSubLen, char *szText, int checkPrth)
kolPrth++;
else if ( *(szText+lPos) == ')' )
kolPrth--;
if( checkPrth && ( (kolPrth > 0) || (kolPrth == 0 && *(szText+lPos) == ')') ) )
if( !lSubPos && checkPrth && ( (kolPrth > 1) ||
(kolPrth == 1 && *(szText+lPos) != '(') || (kolPrth == 0 && *(szText+lPos) == ')')) )
{
lPos++;
lSubPos = 0;
continue;
lPos++;
continue;
}
if( toupper(*(szText + lPos)) == toupper(*(szSub + lSubPos)) )