From 63a39a6a01e0ed85cb603564d545c80cece27b76 Mon Sep 17 00:00:00 2001 From: Ron Pinkas Date: Wed, 12 Jan 2000 04:23:49 +0000 Subject: [PATCH] Jan-11-2000 Ron Pinkas Ron@Profit-Master.com * Harbour.l corrected bug with syntax of return [] (RETURN followed with string delimited with "[]" ) --- harbour/source/compiler/harbour.l | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/harbour/source/compiler/harbour.l b/harbour/source/compiler/harbour.l index f01e8bec01..fbbafeea8d 100644 --- a/harbour/source/compiler/harbour.l +++ b/harbour/source/compiler/harbour.l @@ -145,9 +145,9 @@ Separator {SpaceTab} ".and."[ \t]*"[" { BEGIN STRING3; return AND; } ".or."[ \t]*"[" { BEGIN STRING3; return OR; } ("!"|".not.")[ \t]*"[" { BEGIN STRING3; return NOT; } -(","|"{"|"<"|">"|"(")[ \t]*"[" { BEGIN STRING3; hb_comp_iState = OPERATOR; yyleng = 1; yytext[1] = 0; return yytext[ 0 ]; } - -\[ BEGIN STRING3; +(","|"{"|"<"|">"|"(")[ \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; } +\[ { BEGIN STRING3; } [^'^\n]* { hb_compGenError( hb_comp_szErrors, 'E', ERR_STRING_TERMINATOR, yytext, NULL ); BEGIN 0; } [^\"^\n]* { hb_compGenError( hb_comp_szErrors, 'E', ERR_STRING_TERMINATOR, yytext, NULL ); BEGIN 0; } @@ -1003,9 +1003,9 @@ Separator {SpaceTab} /* ************************************************************************ */ %} "qself"{SpaceTab}*[(]{SpaceTab}*[)] return SELF; -"recover" hb_comp_iState =RECOVER; return RECOVER; -"retu"|"retur"|"return" hb_comp_iState =RETURN; return RETURN; -"static" hb_comp_iState =STATIC; return STATIC; +"recover" hb_comp_iState = RECOVER; return RECOVER; +"retu"|"retur"|"return" hb_comp_iState = RETURN; return RETURN; +"static" hb_comp_iState = STATIC; return STATIC; "step"/[^(] return STEP; "to" return TO; "using" return USING;