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

Updating hbpp.c

Browse Source
This commit is contained in:
Alexander S.Kresin
2000-01-19 18:24:23 +00:00
parent 4262bd7cd9
commit c665d0e398
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -1,3 +1,7 @@
20000119-21:21 GMT+3 Alexander Kresin
* source/pp/hbpp.c
* Few bugs fixed, reported by Matteo Baccan and Dave Pearson
20000119-13:05 GMT+1 Ryszard Glab <rglab@imid.med.pl>
*source/macro/macro.y
@@ -28,9 +32,9 @@
*include/ctoharb.h
*source/vm/hvm.c
* added HB_ENDPROC_REQUEST and hb_vmRequestEndProc() which are used
to request immediately return from currently evaluated pcode buffer.
This is used to stop processing of macro compiled code.
* added HB_ENDPROC_REQUEST and hb_vmRequestEndProc() which are used
to request immediately return from currently evaluated pcode buffer.
This is used to stop processing of macro compiled code.
*source/rtl/itemapi.c
* if parameter passed to hb_itemNew is not NULL then it is used to
@@ -43,7 +47,7 @@
was used.
*doc/funclist.txt
* marked TYPE() as Ready :)
* marked TYPE() as Ready :)
2000-01-19 08:28 GMT+1 Antonio Linares <alinares@fivetech.com>
* source/debug/debugger.prg

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

@@ -121,11 +121,12 @@ static BOOL s_bTracePragma = FALSE;
#define STATE_COMMENT 2
#define STATE_QUOTE1 3
#define STATE_QUOTE2 4
#define STATE_ID_END 5
#define STATE_ID 6
#define STATE_EXPRES 7
#define STATE_EXPRES_ID 8
#define STATE_BRACKET 9
#define STATE_QUOTE3 5
#define STATE_ID_END 6
#define STATE_ID 7
#define STATE_EXPRES 8
#define STATE_EXPRES_ID 9
#define STATE_BRACKET 10
#define IT_EXPR 1
#define IT_ID 2
@@ -140,6 +141,7 @@ static int s_Repeate;
static BOOL s_bReplacePat = TRUE;
static int s_numBrackets;
static char s_groupchar;
static char s_prevchar = 'A';
int hb_pp_lInclude = 0;
int * hb_pp_aCondCompile;
@@ -1799,7 +1801,7 @@ static int ReplacePattern( char patttype, char * expreal, int lenreal, char * pt
else if( lenreal && *expreal == '{' )
{
hb_pp_Stuff( expreal, ptro, lenreal, 4, lenres );
}
}
else
{
hb_pp_Stuff( "{||}", ptro, 4, 4, lenres );
@@ -1886,10 +1888,15 @@ int hb_pp_RdStr( FILE * handl_i, char * buffer, int maxlen, BOOL lDropSpaces, ch
break;
case STATE_QUOTE1: if(cha=='\'') s_ParseState = STATE_NORMAL; break;
case STATE_QUOTE2: if(cha=='\"') s_ParseState = STATE_NORMAL; break;
case STATE_BRACKET: if(cha==']') s_ParseState = STATE_NORMAL; break;
case STATE_QUOTE3: if(cha==']') s_ParseState = STATE_NORMAL; break;
default:
switch( cha ) {
case '[': s_ParseState = STATE_BRACKET; break;
case '[':
if( ISNAME(s_prevchar) || s_prevchar == ']' )
s_ParseState = STATE_BRACKET;
else s_ParseState = STATE_QUOTE3;
break;
case ']': s_ParseState = STATE_NORMAL; break;
case '\"':
if( s_ParseState != STATE_BRACKET ) s_ParseState = STATE_QUOTE2;
break;
@@ -1911,6 +1918,7 @@ int hb_pp_RdStr( FILE * handl_i, char * buffer, int maxlen, BOOL lDropSpaces, ch
else if( !State ) maxlen = readed = 0;
break;
}
if( cha != ' ' && cha != ';' ) s_prevchar = cha;
}
if( cha != ' ' && cha != '\t' ) State = 1;
if( lDropSpaces && State ) lDropSpaces = 0;