4.0 preprocessor: merged r2396 changeset from trunk (allow one line comments behind @#else)

git-svn-id: https://www.dynare.org/svn/dynare/branches/4.0@2397 ac1d8469-bf42-47a9-8791-bf33cf982152

preprocessor/macro/MacroFlex.ll

@@ -220,7 +220,7 @@ CONT \\\\
                             }
 <THEN_BODY>.                { then_body_tmp.append(yytext); yylloc->step(); }
 <THEN_BODY><<EOF>>          { driver.error(if_stmt_loc_tmp, "@#if not matched by an @#endif (unexpected end of file)"); }
-<THEN_BODY>^{SPC}*@#{SPC}*else{SPC}*{EOL} {
+<THEN_BODY>^{SPC}*@#{SPC}*else{SPC}*(\/\/.*)?{EOL} {
                               yylloc->lines(1);
                               yylloc->step();
                               if (nested_if_nb)