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

upgrading preprocessor files

Browse Source
This commit is contained in:
Alexander S.Kresin
1999-12-15 11:51:22 +00:00
parent f0a01dfd66
commit c8bff58ef8
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
harbour/ChangeLog
View File

@@ -1,3 +1,7 @@
19991215-13:35 GMT+3 Alexander Kresin
* source/pp/hbpp.c
* Bug fixed, reported by Victor Szel
19991215-09:34 GMT+1 Antonio Linares <alinares@fivetech.com>
* include/hbclass.ch
* ERROR HANDLER and ON ERROR METHODs defined (they are equivalent)

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

@@ -947,7 +947,8 @@ static int CommandStuff( char * ptrmp, char * inputLine, char * ptro, int * lenr
HB_SKIPTABSPACES( ptrmp );
if( *ptrmp == '[' && !s_numBrackets && !strtopti )
strtopti = ptrmp;
if( !s_numBrackets && strtopti && strtptri != ptri && ISNAME( *ptri ) )
if( !s_numBrackets && strtopti && strtptri != ptri &&
( ISNAME( *ptri ) || *ptri=='&' ) )
{
strtptri = ptri;
ptrmp = strtopti;
@@ -1281,7 +1282,7 @@ static int WorkMarkers( char ** ptrmp, char ** ptri, char * ptro, int * lenres,
static int getExpReal( char * expreal, char ** ptri, BOOL prlist, int maxrez )
{
int lens = 0;
char * sZnaki = "+-=><*/$.&:#%!^";
char * sZnaki = "+-=><*/$.:#%!^";
int State;
int StBr1 = 0, StBr2 = 0, StBr3 = 0;
BOOL rez = FALSE;
@@ -1316,7 +1317,7 @@ static int getExpReal( char * expreal, char ** ptri, BOOL prlist, int maxrez )
break;
case STATE_ID:
case STATE_ID_END:
if( ( (ISNAME(**ptri) || **ptri=='\\') && State == STATE_ID_END ) ||
if( ( (ISNAME(**ptri) || **ptri=='\\' || **ptri=='&') && State == STATE_ID_END ) ||
**ptri==',' || **ptri=='\'' || **ptri=='\"' || **ptri==')' )
{
if( **ptri == ',' )