From 9d5d6b713dd534ad8882bfc829710a46f3581daa Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Mon, 18 Nov 2013 12:53:55 +0100 Subject: [PATCH] Revert "macroprocessor: substitute dates, don't substitute dates preceded by $ or dates('" This reverts commit 9be1d084fd2b510e7d229c7b0e02bde500e34ce1. --- macro/MacroFlex.ll | 8 -------- 1 file changed, 8 deletions(-) diff --git a/macro/MacroFlex.ll b/macro/MacroFlex.ll index 792efce7..05a60329 100644 --- a/macro/MacroFlex.ll +++ b/macro/MacroFlex.ll @@ -51,7 +51,6 @@ typedef Macro::parser::token token; %x FOR_BODY %x THEN_BODY %x ELSE_BODY -%x END_DATE %{ // Increments location counter for every token read @@ -61,7 +60,6 @@ typedef Macro::parser::token token; SPC [ \t]+ EOL (\r)?\n CONT \\\\ -DATE -?[0-9]+([YyAa]|[Mm]([1-9]|1[0-2])|[Qq][1-4]|[Ww]([1-9]{1}|[1-4][0-9]|5[0-2])) %% /* Code put at the beginning of yylex() */ @@ -89,12 +87,6 @@ DATE -?[0-9]+([YyAa]|[Mm]([1-9]|1[0-2])|[Qq][1-4]|[Ww]([1-9]{1}|[1-4][0-9]|5[0-2 ^{SPC}*@# { yylloc->step(); BEGIN(STMT); } @\{ { yylloc->step(); BEGIN(EXPR); } -{DATE} { yylloc->step(); *yyout << "dates('" << yytext << "')"; } -${DATE} { yylloc->step(); *yyout << yytext + 1; } - -dates{SPC}*\({SPC}*\'{DATE} { yylloc->step(); *yyout << yytext; BEGIN(END_DATE); } -{SPC}*\'{SPC}*\) { yylloc->step(); *yyout << yytext; BEGIN(INITIAL); } - \} { BEGIN(INITIAL); return token::EOL; } {CONT}{SPC}*{EOL} { yylloc->lines(1); yylloc->step(); }