From eca82834a1b69a083b52d0928fe8e9ab652ff30c Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan@dynare.org>
Date: Thu, 15 Nov 2018 12:33:59 +0100
Subject: [PATCH] Revert "Fix parsing of empty strings in macro-processor"
This reverts commit 158f027db299b7c4cdd84543fbda51a1152514f2.
---
src/DynareFlex.ll | 4 ++--
src/macro/MacroFlex.ll | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/DynareFlex.ll b/src/DynareFlex.ll
index c0a10f37..7c2bce41 100644
--- a/src/DynareFlex.ll
+++ b/src/DynareFlex.ll
@@ -97,8 +97,8 @@ DATE -?[0-9]+([YyAa]|[Mm]([1-9]|1[0-2])|[Qq][1-4]|[Ww]([1-9]{1}|[1-4][0-9]|5[0-2
<INITIAL,DYNARE_STATEMENT,DYNARE_BLOCK,COMMENT,DATES_STATEMENT,LINE1,LINE2,LINE3>[\n]+ { yylloc->step(); }
/* Comments */
-<INITIAL,DYNARE_STATEMENT,DYNARE_BLOCK,DATES_STATEMENT>%.*
-<INITIAL,DYNARE_STATEMENT,DYNARE_BLOCK,DATES_STATEMENT>\/{2}.*
+<INITIAL,DYNARE_STATEMENT,DYNARE_BLOCK,DATES_STATEMENT>["%"].*
+<INITIAL,DYNARE_STATEMENT,DYNARE_BLOCK,DATES_STATEMENT>["/"]["/"].*
<INITIAL,DYNARE_STATEMENT,DYNARE_BLOCK,DATES_STATEMENT>"/*" {comment_caller = YY_START; BEGIN COMMENT;}
<COMMENT>"*/" {BEGIN comment_caller;}
diff --git a/src/macro/MacroFlex.ll b/src/macro/MacroFlex.ll
index 92af81ba..e2330afa 100644
--- a/src/macro/MacroFlex.ll
+++ b/src/macro/MacroFlex.ll
@@ -73,8 +73,7 @@ CONT \\\\
yylloc->step();
%}
- // Ignore inline comments
-<STMT,EXPR,FOR_BODY,THEN_BODY,ELSE_BODY>\/{2}.*
+<STMT,EXPR,FOR_BODY,THEN_BODY,ELSE_BODY>["/"]["/"].*
<INITIAL>^{SPC}*@#{SPC}*includepath{SPC}+\"([^\"\r\n:;|<>]*){1}(:[^\"\r\n:;|<>]*)*\"{SPC}*{EOL} {
yylloc->lines(1);
--
GitLab