From 28bfc72a5c8a7ade1696d4a7a34385d43e1c75f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=B3ra=20Kocsis?= <dora@dynare.org>
Date: Tue, 26 Nov 2019 16:44:17 +0100
Subject: [PATCH] Revert "Merge branch 'master' into 'master'"
This reverts commit a37fea0dfcba38812c45db5f9524c7c9580dd666, reversing
changes made to 3ae92499b87ab144e33bab7ac69cc224381ea811.
---
src/DynareFlex.ll | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/DynareFlex.ll b/src/DynareFlex.ll
index 82248e1f..9292d35f 100644
--- a/src/DynareFlex.ll
+++ b/src/DynareFlex.ll
@@ -608,8 +608,6 @@ DATE -?[0-9]+([ya]|m([1-9]|1[0-2])|q[1-4]|w([1-9]{1}|[1-4][0-9]|5[0-2]))
<DYNARE_STATEMENT>interactive {return token::INTERACTIVE;}
<DYNARE_STATEMENT>screen_shocks {return token::SCREEN_SHOCKS;}
<DYNARE_STATEMENT>steadystate {return token::STEADYSTATE;}
-<DYNARE_STATEMENT>unconditional {return token::UNCONDITIONAL;}
-<DYNARE_STATEMENT>conditional {return token::CONDITIONAL;}
<DYNARE_STATEMENT>type {return token::TYPE;}
<DYNARE_STATEMENT>qoq {return token::QOQ; }
<DYNARE_STATEMENT>yoy {return token::YOY; }
--
GitLab