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

May 31, 1999 Ron Pinkas

Browse Source 
Harbour.l added support for "[String]" inside ARRAY INDEX expressions
        Added "Sysntax error :" message for the macro operator (&)
        when followed by a string delimiter.
This commit is contained in:
Ron Pinkas
1999-06-01 03:09:08 +00:00
parent 9e8e6d82d5
commit 1ea510929f
3 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -1541,6 +1541,11 @@ May 31, 1999 Ron Pinkas
a := aFunc()
QOut( a[1] )
May 31, 1999 Ron Pinkas
Harbour.l added support for "[String]" inside ARRAY INDEX expressions.
Added "Sysntax error :" message for the macro operator (&)
when followed by a string delimiter.

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

@@ -111,8 +111,35 @@ Separator {SpaceTab}|{Comment}|{LineCont}
^{SpaceTab}*(\*|"NOTE").* ;
\n{SpaceTab}*(\*|"NOTE").* ++iLine; if( ! _iQuiet ) printf( "\rline: %i", iLine );
"&"("'"|\"|\[) { printf( "\nSyntax error : '%s'\n", yytext ); exit(1); }
' BEGIN STRING1;
\" BEGIN STRING2;
"="[ \t]*"[" { BEGIN STRING3; _iState =OPERATOR; return '='; }
"+"[ \t]*"[" { BEGIN STRING3; _iState =OPERATOR; return '+'; }
"-"[ \t]*"[" { BEGIN STRING3; _iState =OPERATOR; return '-'; }
"*"[ \t]*"[" { BEGIN STRING3; _iState =OPERATOR; return '*'; }
"/"[ \t]*"[" { BEGIN STRING3; _iState =OPERATOR; return '/'; }
"%"[ \t]*"[" { BEGIN STRING3; _iState =OPERATOR; return '%'; }
"$"[ \t]*"[" { BEGIN STRING3; _iState =OPERATOR; return '$'; }
("<>"|"!=")[ \t]*"[" { BEGIN STRING3; _iState =NE2; return NE2; }
":="[ \t]*"[" { BEGIN STRING3; _iState =INASSIGN; return INASSIGN; }
"=="[ \t]*"[" { BEGIN STRING3; _iState =EQ; return EQ; }
"<="[ \t]*"[" { BEGIN STRING3; _iState =LE; return LE; }
">="[ \t]*"[" { BEGIN STRING3; _iState =GE; return GE; }
"+="[ \t]*"[" { BEGIN STRING3; _iState =PLUSEQ; return PLUSEQ; }
"-="[ \t]*"[" { BEGIN STRING3; _iState =MINUSEQ; return MINUSEQ; }
"*="[ \t]*"[" { BEGIN STRING3; _iState =MULTEQ; return MULTEQ; }
"/="[ \t]*"[" { BEGIN STRING3; _iState =DIVEQ; return DIVEQ; }
"^="[ \t]*"[" { BEGIN STRING3; _iState =EXPEQ; return EXPEQ; }
"%="[ \t]*"[" { BEGIN STRING3; _iState =MODEQ; return MODEQ; }
("**"|"^")[ \t]*"[" { BEGIN STRING3; _iState =POWER; return POWER; }
".and."[ \t]*"[" { BEGIN STRING3; return AND; }
".or."[ \t]*"[" { BEGIN STRING3; return OR; }
("!"|".not.")[ \t]*"[" { BEGIN STRING3; return NOT; }
(","|"{"|"<"|">"|"(")[ \t]*"[" { BEGIN STRING3; _iState = OPERATOR; yyleng = 1; yytext[1] = 0; return yytext[ 0 ]; }
<INITIAL>\[ BEGIN STRING3;
<STRING1>[^'^\n]* { GenError( ERR_STRING_TERMINATOR, yytext, NULL ); BEGIN 0; }
@@ -124,8 +151,11 @@ Separator {SpaceTab}|{Comment}|{LineCont}
else
BEGIN 0;
yyleng--;
yytext[yyleng] = 0;
yylval.string = strdup( yytext );
yylval.string[ yyleng - 1 ] = 0; return LITERAL;
/*printf( "\nLITERAL = %s\n", yylval.string );*/
return LITERAL;
}
<STRING2>[^\"]*\" { if( i_INDEX_STATE )
@@ -133,8 +163,10 @@ Separator {SpaceTab}|{Comment}|{LineCont}
else
BEGIN 0;
yyleng--;
yytext[yyleng] = 0;
yylval.string = strdup( yytext );
yylval.string[ yyleng - 1 ] = 0;
/*printf( "\nLITERAL = %s\n", yylval.string );*/
return LITERAL;
}
@@ -143,8 +175,11 @@ Separator {SpaceTab}|{Comment}|{LineCont}
else
BEGIN 0;
yyleng--;
yytext[yyleng] = 0;
yylval.string = strdup( yytext );
yylval.string[ yyleng - 1 ] = 0; return LITERAL;
/*printf( "\nLITERAL = %s\n", yylval.string );*/
return LITERAL;
}
<INDEX>\n { yyerror( "Unterminated Array Index" ); exit(1); }
@@ -924,7 +959,7 @@ Separator {SpaceTab}|{Comment}|{LineCont}
yyleng = 10;
}
yylval.string = strupr( strdup( yytext ) );
printf( "\nIdentifier = '%s'\n", strupr( strdup( yytext ) ) );
/*printf( "\nIdentifier = '%s'\n", strupr( strdup( yytext ) ) );*/
_iState = IDENTIFIER;
return IDENTIFIER;
}

2
harbour/tests/working/arrindex.prg
View File

@@ -8,7 +8,7 @@ Function Main
c := { 1 }
b := a [ c [ 1 ] ] [ 2 ]
b := a [ c [1] ] [ val( [2] ) ]
QOut( b )