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

2000-06-19 13:38 UTC-0800 Ron Pinkas <Ron@Profit-Master.com>

Browse Source 
* source/compiler/hbgenerr.c
   * source/pp/ppcomp.c
     ! Fixed reporting of line numbers on erros.

   * source/pp/ppcore.c
     * More support for [] as string delimiters.

   * source/compiler/harbour.l
     + Added support for:
        ELSIF [ some string ] ...
        DO WHILE [ some string ] ...
        WHILE [ some string ] ...
        CASE [ some string ] ...

     /* Strangly, Clipper chockes on elseif [...] */
This commit is contained in:
Ron Pinkas
2000-06-20 04:31:43 +00:00
parent 4aed821f77
commit 6e356923ef
5 changed files with 385 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
harbour/ChangeLog
View File

@@ -1,8 +1,26 @@
2000-06-19 13:38 UTC-0800 Ron Pinkas <Ron@Profit-Master.com>
* source/compiler/hbgenerr.c
* source/pp/ppcomp.c
! Fixed reporting of line numbers on erros.
* source/pp/ppcore.c
* More support for [] as string delimiters.
* source/compiler/harbour.l
+ Added support for:
ELSIF [ some string ] ...
DO WHILE [ some string ] ...
WHILE [ some string ] ...
CASE [ some string ] ...
/* Strangly, Clipper chockes on elseif [...] */
2000-06-19 23:05 GMT-3 Luiz Rafael Culik <culik@sl.conex.net>
* utils/hbdoc/genhtm.prg
utils/hbdoc/genchm.prg
utils/hbdoc/html.pg
utils/hbdoc/genng.prg
utils/hbdoc/genng.prg
* utils/hbdoc/genos2.prg
utils/hbdoc/os2.prg
* Small Fixes

8
harbour/source/compiler/harbour.l
View File

@@ -150,7 +150,11 @@ Separator {SpaceTab}
("!"|".not.")[ \t]*"[" { BEGIN STRING3; return NOT; }
(","|"{"|"<"|">"|"(")[ \t]*"[" { BEGIN STRING3; hb_comp_iState = OPERATOR; yyleng = 1; yytext[1] = 0; return yytext[ 0 ]; }
("retu"|"retur"|"return")[ \t]*"[" { BEGIN STRING3; hb_comp_iState = RETURN; return RETURN; }
"if"[ \t]*"[" { BEGIN STRING3; return IF; }
^[ \t]*"if"[ \t]*"[" { BEGIN STRING3; return IF; }
^[ \t]*"elseif"[ \t]*"[" { BEGIN STRING3; return ELSEIF; }
^[ \t]*"case"[ \t]*"[" { BEGIN STRING3; return CASE; }
^[ \t]*"while"[ \t]*"[" { BEGIN STRING3; return WHILE; }
^[ \t]*"do"[ \t]*"while"[ \t]*"[" { BEGIN STRING3; return WHILE; }
<INITIAL>\[ { BEGIN STRING3; }
<STRING1>[^'^\n]* { hb_compGenError( hb_comp_szErrors, 'E', HB_COMP_ERR_STRING_TERMINATOR, yytext, NULL ); BEGIN 0; }
@@ -833,7 +837,7 @@ Separator {SpaceTab}
hb_comp_iState =IIF;
return hb_comp_iState;
}
<IF_>{Separator}*[\)\]\/\^\*\%\=\$\@] {
<IF_>{Separator}*[\)\[\]\/\^\*\%\=\$\@] {
hb_compGenError( hb_comp_szErrors, 'E', HB_COMP_ERR_SYNTAX2, yytext, "IF" );
}
<IF_>{Separator}*"->" {

17
harbour/source/compiler/hbgenerr.c
View File

@@ -35,6 +35,8 @@
#include "hbcomp.h"
extern char *yytext;
/* Table with parse errors */
char * hb_comp_szErrors[] =
{
@@ -122,8 +124,13 @@ char * hb_comp_szWarnings[] =
void hb_compGenError( char * szErrors[], char cPrefix, int iError, char * szError1, char * szError2 )
{
int iOffset = 0;
if( yytext[0] == '\n' )
iOffset = hb_pp_nEmptyStrings + 1;
if( hb_comp_files.pLast != NULL && hb_comp_files.pLast->szFileName != NULL )
printf( "\r%s(%i) ", hb_comp_files.pLast->szFileName, hb_comp_files.pLast->iLine - 1 );
printf( "\r%s(%i) ", hb_comp_files.pLast->szFileName, hb_comp_files.pLast->iLine - 1 - iOffset );
printf( "Error %c%04i ", cPrefix, iError );
printf( szErrors[ iError - 1 ], szError1, szError2 );
@@ -140,10 +147,16 @@ void hb_compGenWarning( char * szWarnings[], char cPrefix, int iWarning, char *
{
char * szText = szWarnings[ iWarning - 1 ];
int iOffset = 0;
if( yytext[0] == '\n' )
iOffset = hb_pp_nEmptyStrings + 1;
if( ( szText[ 0 ] - '0' ) <= hb_comp_iWarnings )
{
if( hb_comp_files.pLast != NULL && hb_comp_files.pLast->szFileName != NULL )
printf( "\r%s(%i) ", hb_comp_files.pLast->szFileName, hb_comp_files.pLast->iLine - 1 );
printf( "\r%s(%i) ", hb_comp_files.pLast->szFileName, hb_comp_files.pLast->iLine - 1 - iOffset );
printf( "Warning %c%04i ", cPrefix, iWarning );
printf( szText + 1, szWarning1, szWarning2 );
printf( "\n" );

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

@@ -52,6 +52,10 @@
static char s_szLine[ HB_PP_STR_SIZE ];
static char s_szOutLine[ HB_PP_STR_SIZE ];
/*
BOOL bDebug = FALSE;
*/
int hb_pp_Internal( FILE * handl_o, char * sOut )
{
PFILE pFile;
@@ -63,6 +67,7 @@ int hb_pp_Internal( FILE * handl_o, char * sOut )
HB_TRACE(HB_TR_DEBUG, ("hb_pp_Internal(%p, %s)", handl_o, sOut));
hb_pp_nEmptyStrings = 0;
while( TRUE )
{
pFile = hb_comp_files.pLast;
@@ -145,6 +150,7 @@ int hb_pp_Internal( FILE * handl_o, char * sOut )
}
else
{
if( hb_pp_nCondCompile == 0 || hb_pp_aCondCompile[ hb_pp_nCondCompile - 1 ] )
{
hb_pp_ParseExpression( ptr, s_szOutLine );
@@ -223,7 +229,7 @@ int hb_pp_Internal( FILE * handl_o, char * sOut )
*( sOut + lens ) = '\0';
hb_comp_files.pLast->iLine += hb_pp_nEmptyStrings;
hb_pp_nEmptyStrings = 0;
//hb_pp_nEmptyStrings = 0;
if( handl_o )
hb_pp_WrStr( handl_o, sOut );

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

@@ -199,8 +199,14 @@ char * hb_pp_szWarnings[] =
"1No directives in command definitions file"
};
/*
extern BOOL bDebug;
*/
void hb_pp_SetRules( BOOL (*hb_compInclude)(char *, PATHNAMES * ), BOOL hb_comp_bQuiet )
{
HB_TRACE(HB_TR_DEBUG, ("hb_pp_SetRules()"));
if( hb_pp_STD_CH )
{
if( *hb_pp_STD_CH > ' ' )
@@ -892,6 +898,7 @@ int hb_pp_ParseExpression( char * sLine, char * sOutLine )
ptro = sOutLine;
ptri = sLine + isdvig;
ipos = md_strAt( ";", 1, ptri, TRUE, FALSE );
if( ipos > 0 ) *(ptri+ipos-1) = '\0';
HB_SKIPTABSPACES( ptri );
if( *ptri == '#' )
@@ -909,21 +916,26 @@ int hb_pp_ParseExpression( char * sLine, char * sOutLine )
if( (stdef=DefSearch(sToken,NULL)) != NULL )
{
ptrb = ptri - lenToken;
if( ( i = WorkDefine( &ptri, ptro, stdef ) ) >= 0 )
{
rezDef++;
lens = strlen( ptrb );
if( ipos > 0 )
{
*(ptrb+lens) = ';';
lens += strlen( ptrb+lens+1 );
}
hb_pp_Stuff( ptro, ptrb, i, ptri-ptrb, lens+1 );
if( ipos > 0 )
{
ipos += i - (ptri-ptrb);
*(sLine + isdvig + ipos - 1) = '\0';
}
ptri += i - (ptri-ptrb);
}
}
@@ -1032,7 +1044,9 @@ static int WorkDefine( char ** ptri, char * ptro, DEFINES * stdef )
HB_TRACE(HB_TR_DEBUG, ("WorkDefine(%p, %s, %p)", ptri, ptro, stdef));
if( stdef->npars < 0 )
lens = hb_pp_strocpy( ptro,stdef->value );
{
lens = hb_pp_strocpy( ptro,stdef->value );
}
else
{
HB_SKIPTABSPACES( *ptri );
@@ -1173,6 +1187,10 @@ static int CommandStuff( char * ptrmp, char * inputLine, char * ptro, int * lenr
char * lastopti[ 3 ], * strtopti = NULL, * strtptri = NULL;
char * ptri = inputLine, * ptr, tmpname[ MAX_NAME ];
/*
printf( "MP: >%s<\nIn: >%s<\n", ptrmp, ptri );
*/
HB_TRACE(HB_TR_DEBUG, ("CommandStuff(%s, %s, %s, %p, %d, %d)", ptrmp, inputLine, ptro, lenres, com_or_tra, com_or_xcom));
s_numBrackets = 0;
@@ -1364,10 +1382,15 @@ static int CommandStuff( char * ptrmp, char * inputLine, char * ptro, int * lenr
}
while( *ptrmp != '\0' );
}
SearnRep( "\1","",0,ptro,lenres);
//printf( "Line: >%s<\nOut: >%s<\nLen: %i Last: %c\n", inputLine, ptro, *lenres, ptro[(*lenres)-1] );
SearnRep( "\1","",0,ptro,lenres);
*(ptro + *lenres) = '\0';
*lenres = RemoveSlash( ptro ); /* Removing '\' from result string */
//printf( "*Line: >%s<\n*Out: >%s<\n*Len: %i Last: %c\n", inputLine, ptro, *lenres, ptro[(*lenres)-1] );
if( com_or_tra ) return 1; else return (ptri-inputLine);
}
@@ -1582,143 +1605,316 @@ 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 = "+-=><*/$.:#%!^";
int State;
int StBr1 = 0, StBr2 = 0, StBr3 = 0;
BOOL rez = FALSE;
int lens = 0;
char * sZnaki = "+-=><*/$.:#%!^";
int State;
int StBr1 = 0, StBr2 = 0, StBr3 = 0;
BOOL rez = FALSE;
/* Ron Pinkas Begin 2000-06-02 */
BOOL bMacro = FALSE;
/* Ron Pinkas End */
/* Ron Pinkas Begin 2000-06-02 */
BOOL bMacro = FALSE;
/* Ron Pinkas End */
HB_TRACE(HB_TR_DEBUG, ("getExpReal(%s, %p, %d, %d)", expreal, ptri, prlist, maxrez));
/* Ron Pinkas Begin 2000-06-17 */
char cLastChar = '\0';
/* Ron Pinkas End */
HB_SKIPTABSPACES( *ptri );
State = (**ptri=='\'' || **ptri=='\"')? STATE_EXPRES:STATE_ID;
while( **ptri != '\0' && !rez && lens < maxrez )
{
switch( State ) {
case STATE_QUOTE1:
if(**ptri=='\'')
State = (StBr1==0 && StBr2==0 && StBr3==0)? STATE_ID_END:STATE_BRACKET;
break;
case STATE_QUOTE2:
if(**ptri=='\"')
State = (StBr1==0 && StBr2==0 && StBr3==0)? STATE_ID_END:STATE_BRACKET;
break;
case STATE_BRACKET:
if( **ptri == '\'' ) State = STATE_QUOTE1;
else if( **ptri == '\"' ) State = STATE_QUOTE2;
else if( **ptri == '(' ) StBr1++;
else if( **ptri == '[' ) StBr2++;
else if( **ptri == '{' ) StBr3++;
else if( **ptri == ')' )
{ StBr1--; if (StBr1==0 && StBr2==0 && StBr3==0) State = STATE_ID_END; }
else if( **ptri == ']' )
{ StBr2--; if (StBr1==0 && StBr2==0 && StBr3==0) State = STATE_ID_END; }
else if( **ptri == '}' )
{ StBr3--; if (StBr1==0 && StBr2==0 && StBr3==0) State = STATE_ID_END; }
break;
case STATE_ID:
case STATE_ID_END:
if( ( (ISNAME(**ptri) || **ptri=='\\' || **ptri=='&') && State == STATE_ID_END ) ||
**ptri==',' || **ptri=='\'' || **ptri=='\"' || **ptri==')' )
{
if( **ptri == ',' )
{
if( !prlist ) rez = TRUE;
State = STATE_EXPRES;
}
else rez = TRUE;
}
else if( IsInStr( **ptri, sZnaki ) )
{
HB_TRACE(HB_TR_DEBUG, ("getExpReal(%s, %p, %d, %d)", expreal, ptri, prlist, maxrez));
HB_SKIPTABSPACES( *ptri );
State = ( **ptri=='\'' || **ptri=='\"' || **ptri=='[' ) ? STATE_EXPRES: STATE_ID;
while( **ptri != '\0' && !rez && lens < maxrez )
{
switch( State )
{
case STATE_QUOTE1:
{
if( **ptri == '\'' )
State = ( StBr1==0 && StBr2==0 && StBr3==0 )? STATE_ID_END: STATE_BRACKET;
break;
}
case STATE_QUOTE2:
{
if( **ptri == '\"' )
State = ( StBr1==0 && StBr2==0 && StBr3==0 )? STATE_ID_END: STATE_BRACKET;
break;
}
case STATE_QUOTE3:
{
if( **ptri == ']' )
State = ( StBr1==0 && StBr2==0 && StBr3==0 )? STATE_ID_END: STATE_BRACKET;
break;
}
case STATE_BRACKET:
{
if( **ptri == '\'' )
{
State = STATE_QUOTE1;
}
else if( **ptri == '\"' )
{
State = STATE_QUOTE2;
}
else if( **ptri == '(' )
{
StBr1++;
}
else if( **ptri == '[' )
{
/* Ron Pinkas added 2000-06-17 */
if( ISNAME( cLastChar ) || cLastChar == ')' || cLastChar == ']' || cLastChar == '}' )
{
StBr2++;
}
else
{
State = STATE_QUOTE3;
}
/* Ron Pinkas added 2000-06-17 */
/* Ron Pinkas commented 2000-06-17
StBr2++;
*/
}
else if( **ptri == '{' )
{
StBr3++;
}
else if( **ptri == ')' )
{
StBr1--;
if( StBr1==0 && StBr2==0 && StBr3==0 )
{
State = STATE_ID_END;
}
}
else if( **ptri == ']' )
{
StBr2--;
if( StBr1==0 && StBr2==0 && StBr3==0 )
{
State = STATE_ID_END;
}
}
else if( **ptri == '}' )
{
StBr3--;
if( StBr1==0 && StBr2==0 && StBr3==0 )
{
State = STATE_ID_END;
}
}
break;
}
case STATE_ID:
case STATE_ID_END:
{
if( ( (ISNAME(**ptri) || **ptri=='\\' || **ptri=='&') && State == STATE_ID_END ) ||
**ptri==',' || **ptri=='\'' || **ptri=='\"' || **ptri==')' )
{
if( **ptri == ',' )
{
if( ! prlist )
{
rez = TRUE;
}
State = STATE_EXPRES;
}
else
{
rez = TRUE;
}
}
else if( IsInStr( **ptri, sZnaki ) )
{
/* Ron Pinkas Begin 2000-06-02 */
if( **ptri=='.' && bMacro )
{
/* Macro terminator '.' */
if( *(*ptri+1)==' ' )
State = STATE_ID_END;
bMacro = FALSE;
}
else
/* Ron Pinkas End */
State = STATE_EXPRES;
}
else if( **ptri == '(' )
{
State = STATE_BRACKET;
StBr1 = 1;
}
else if( **ptri == '[' )
{
/* Ron Pinkas added 2000-06-17 */
if( ISNAME( cLastChar ) || cLastChar == ')' || cLastChar == ']' || cLastChar == '}' )
{
StBr2++;
State = STATE_BRACKET;
}
else
{
State = STATE_QUOTE3;
}
/* Ron Pinkas end 2000-06-17 */
/* Ron Pinkas commented 2000-06-17
StBr2++;
State = STATE_BRACKET;
*/
}
else if( **ptri == '{' )
{
State = STATE_BRACKET;
StBr3 = 1;
}
/* Ron Pinkas Begin 2000-06-02 */
if( **ptri=='.' && bMacro )
{
/* Macro terminator '.' */
if( *(*ptri+1)==' ' ) State = STATE_ID_END;
bMacro = FALSE;
}
else
else if( **ptri == '&' )
{
bMacro = TRUE;
}
/* Ron Pinkas End */
else if( **ptri == ' ' )
{
State = STATE_ID_END;
/* Ron Pinkas Begin 2000-06-02 */
bMacro = FALSE;
/* Ron Pinkas End */
}
break;
}
case STATE_EXPRES:
case STATE_EXPRES_ID:
{
if( **ptri == '\'' )
{
State = STATE_QUOTE1;
}
else if( **ptri == '\"' )
{
State = STATE_QUOTE2;
}
else if( **ptri == '[' )
{
/* Ron Pinkas added 2000-06-17 */
if( ISNAME( cLastChar ) || cLastChar == ')' || cLastChar == ']' || cLastChar == '}' )
{
StBr2++;
State = STATE_BRACKET;
}
else
{
State = STATE_QUOTE3;
}
/* Ron Pinkas end 2000-06-17 */
}
else if( ISNAME(**ptri) )
{
State = STATE_EXPRES_ID;
}
else if( **ptri == ' ' )
{
if( State == STATE_EXPRES_ID )
{
State = STATE_ID_END;
}
else if( lens > 2 && ( ( *(*ptri-2)=='+' && *(*ptri-1)=='+' ) ||
( *(*ptri-2)=='-' && *(*ptri-1)=='-' ) ) )
{
State = STATE_ID_END;
}
}
/* Ron Pinkas added 2000-06-14 */
else if( **ptri == ')' && StBr1 == 0 )
{
rez = TRUE;
}
/* Ron Pinkas End */
else if( **ptri == '(' )
{
StBr1++;
State = STATE_BRACKET;
}
/* Ron Pinkas commented (see few else if above... ) 2000-06-17
else if( **ptri == '[' )
{
StBr2++;
State = STATE_BRACKET;
}
/* Ron Pinkas end 2000-06-17 */
else if( **ptri == '{' )
{
StBr3++;
State = STATE_BRACKET;
}
else if( **ptri == ',' )
{
if( !prlist )
{
rez = TRUE; State = STATE_EXPRES;
}
}
else if( **ptri == '.' && *(*ptri-2) == '.' &&
( *(*ptri-1) == 'T' || *(*ptri-1) == 'F' ||
*(*ptri-1) == 't' || *(*ptri-1) == 'f' ) )
{
State = STATE_ID_END;
}
else
{
State = STATE_EXPRES;
}
else if( **ptri == '(' )
{
State = STATE_BRACKET;
StBr1 = 1;
}
else if( **ptri == '[' )
{
State = STATE_BRACKET;
StBr2 = 1;
}
else if( **ptri == '{' )
{
State = STATE_BRACKET;
StBr3 = 1;
}
/* Ron Pinkas Begin 2000-06-02 */
else if( **ptri == '&' )
{
bMacro = TRUE;
}
/* Ron Pinkas End */
else if( **ptri == ' ' )
{
State = STATE_ID_END;
/* Ron Pinkas Begin 2000-06-02 */
bMacro = FALSE;
/* Ron Pinkas End */
}
break;
case STATE_EXPRES:
case STATE_EXPRES_ID:
if( **ptri == '\'' ) State = STATE_QUOTE1;
else if( **ptri == '\"' ) State = STATE_QUOTE2;
else if( ISNAME(**ptri) ) State = STATE_EXPRES_ID;
else if( **ptri == ' ' )
{
if( State == STATE_EXPRES_ID ) State = STATE_ID_END;
else if( lens > 2 && ( ( *(*ptri-2)=='+' && *(*ptri-1)=='+' ) ||
( *(*ptri-2)=='-' && *(*ptri-1)=='-' ) ) )
State = STATE_ID_END;
}
/* Ron Pinkas added 2000-06-14 */
else if( **ptri == ')' && StBr1 == 0 ) rez = TRUE;
/* Ron Pinkas End */
else if( **ptri == '(' ) { StBr1++; State = STATE_BRACKET; }
else if( **ptri == '[' ) { StBr2++; State = STATE_BRACKET; }
else if( **ptri == '{' ) { StBr3++; State = STATE_BRACKET; }
else if( **ptri == ',' ) { if ( !prlist ) rez = TRUE; State = STATE_EXPRES; }
else if( **ptri == '.' && *(*ptri-2) == '.' &&
( *(*ptri-1) == 'T' || *(*ptri-1) == 'F' ||
*(*ptri-1) == 't' || *(*ptri-1) == 'f' ) )
State = STATE_ID_END;
else State = STATE_EXPRES;
break;
}
break;
}
}
if( !rez )
{
if( expreal != NULL ) *expreal++ = **ptri;
(*ptri)++;
lens++;
}
}
if( expreal != NULL )
{
if( *(expreal-1) == ' ' ) { expreal--; lens--; };
{
/* Ron Pinkas added 2000-06-17 */
if( **ptri != ' ' && **ptri != '\t' )
{
cLastChar = **ptri;
}
/* Ron Pinkas end 2000-06-17 */
if( expreal != NULL )
*expreal++ = **ptri;
(*ptri)++;
lens++;
}
}
if( expreal != NULL )
{
if( *(expreal-1) == ' ' )
{
expreal--;
lens--;
}
*expreal = '\0';
/*
printf( "\nLen=%i \'%s\'\n", lens, expreal-lens);
printf( "\nLen=%i \'%s\'\n", lens, expreal-lens );
*/
}
return lens;
}
return lens;
}
static BOOL isExpres( char * stroka )
@@ -1738,10 +1934,10 @@ static BOOL isExpres( char * stroka )
printf( "Len1: %i Len2: %i RealExp: >%s< Last: %c\n", l1, l2, stroka - l2, ( stroka - l2 )[l1-1] );
*/
/* Ron Pinkas modified 2000-06-17 Expression can't be valid if last charcter is one of these: ":*+/-%^=(<>"
/* Ron Pinkas modified 2000-06-17 Expression can't be valid if last charcter is one of these: ":/*+-%^=(<>"
return ( l1 <= l2 );
*/
return ( l1 <= l2 && ! IsInStr( ( stroka - l2 )[l1-1], ":*+/-%^=(<>" ) );
return ( l1 <= l2 && ! IsInStr( ( stroka - l2 )[l1-1], ":/*+-%^=(<>[{" ) );
}
static BOOL TestOptional( char *ptr1, char *ptr2 )
@@ -1929,6 +2125,10 @@ static void SearnRep( char * exppatt, char * expreal, int lenreal, char * ptro,
if( *(exppatt+1) == '\0' ) *( ptro + *lenres ) = '\0';
while( (ifou = md_strAt( exppatt, (*(exppatt+1))? 2:1, ptrOut, FALSE, FALSE )) > 0 )
{
/*
printf( "Found: >%s< At: %i In: >%s<\n", exppatt, ifou, ptrOut );
*/
rezs = FALSE;
ptr = ptrOut + ifou - 2;
kolmarkers = 0;
@@ -2012,6 +2212,9 @@ static void SearnRep( char * exppatt, char * expreal, int lenreal, char * ptro,
else if( !s_bReplacePat ) isdvig += ifou;
ptrOut = ptro + isdvig;
}
/*
printf( "No: >%s< In: >%s<\n", exppatt, ptrOut );
*/
}
static int ReplacePattern( char patttype, char * expreal, int lenreal, char * ptro, int lenres )
@@ -2176,6 +2379,10 @@ static void pp_rQuotes( char * expreal, char * sQuotes )
HB_TRACE(HB_TR_DEBUG, ("pp_rQuotes(%s, %s)", expreal, sQuotes));
/*
printf( "String: >%s< Delim: %s\n", expreal, sQuotes );
*/
while( *expreal != '\0' )
{
if( *expreal == '\"' ) lQuote2 = TRUE;
@@ -2249,7 +2456,10 @@ int hb_pp_RdStr( FILE * handl_i, char * buffer, int maxlen, BOOL lDropSpaces, ch
default:
switch( cha ) {
case '[':
/* Ron Pinkas modified 2000-06-17
if( ISNAME(s_prevchar) || s_prevchar == ']' )
*/
if( ISNAME(s_prevchar) || s_prevchar == ']' || s_prevchar == ')' )
s_ParseState = STATE_BRACKET;
else s_ParseState = STATE_QUOTE3;
break;