From 4509136dba03dee393733f824ea669c33b0c57c3 Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan@dynare.org>
Date: Wed, 31 Oct 2012 15:48:39 +0100
Subject: [PATCH] bug fix: remove previous declaration of NONE as token in flex

---
 DynareBison.yy | 4 ++--
 DynareFlex.ll  | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/DynareBison.yy b/DynareBison.yy
index 03f0ed24..5f108976 100644
--- a/DynareBison.yy
+++ b/DynareBison.yy
@@ -149,8 +149,8 @@ class ParsingDriver;
 %token FREQ INITIAL_YEAR INITIAL_SUBPERIOD FINAL_YEAR FINAL_SUBPERIOD DATA VLIST LOG_VAR PERCENT_VAR
 %token VLISTLOG VLISTPER
 %token RESTRICTION RESTRICTION_FNAME CROSS_RESTRICTIONS NLAGS CONTEMP_REDUCED_FORM REAL_PSEUDO_FORECAST
-%token NONE DUMMY_OBS NSTATES INDXSCALESSTATES NO_BAYESIAN_PRIOR SPECIFICATION SIMS_ZHA
-%token <string_val> ALPHA BETA ABAND NINV CMS NCMS CNUM GAMMA INV_GAMMA INV_GAMMA1 INV_GAMMA2 NORMAL UNIFORM EPS PDF FIG DR
+%token DUMMY_OBS NSTATES INDXSCALESSTATES NO_BAYESIAN_PRIOR SPECIFICATION SIMS_ZHA
+%token <string_val> ALPHA BETA ABAND NINV CMS NCMS CNUM GAMMA INV_GAMMA INV_GAMMA1 INV_GAMMA2 NORMAL UNIFORM EPS PDF FIG DR NONE
 %token GSIG2_LMDM Q_DIAG FLAT_PRIOR NCSK NSTD
 %token INDXPARR INDXOVR INDXAP APBAND INDXIMF IMFBAND INDXFORE FOREBAND INDXGFOREHAT INDXGIMFHAT
 %token INDXESTIMA INDXGDLS EQ_MS FILTER_COVARIANCE FILTER_DECOMPOSITION
diff --git a/DynareFlex.ll b/DynareFlex.ll
index 5c08a9e4..14cc17c9 100644
--- a/DynareFlex.ll
+++ b/DynareFlex.ll
@@ -341,7 +341,6 @@ string eofbuff;
 <DYNARE_STATEMENT>gsig2_lmdm {return token::GSIG2_LMDM;}
 <DYNARE_STATEMENT>specification {return token::SPECIFICATION;}
 <DYNARE_STATEMENT>sims_zha {return token::SIMS_ZHA;}
-<DYNARE_STATEMENT>none {return token::NONE;}
 <DYNARE_STATEMENT>q_diag {return token::Q_DIAG;}
 <DYNARE_STATEMENT>flat_prior {return token::FLAT_PRIOR;}
 <DYNARE_STATEMENT>ncsk {return token::NCSK;}
-- 
GitLab