From 52f3b964b2440a7d57d98da15ea8a629effa8f52 Mon Sep 17 00:00:00 2001
From: Johannes Pfeifer <jpfeifer@gmx.de>
Date: Fri, 16 Jun 2017 13:51:03 +0200
Subject: [PATCH] Fix bug in use_shock_groups and colormap

Option was not written to correct subfield of options_-structure. Related to 7cd56e96877de4ed2dd22bb579884ab292034d71
---
 DynareBison.yy | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/DynareBison.yy b/DynareBison.yy
index c82b7025..d9e3169e 100644
--- a/DynareBison.yy
+++ b/DynareBison.yy
@@ -2553,8 +2553,8 @@ plot_shock_decomposition_options_list : plot_shock_decomposition_option COMMA pl
                                       | plot_shock_decomposition_option
                                       ;
 
-plot_shock_decomposition_option : o_psd_use_shock_groups
-                                | o_psd_colormap
+plot_shock_decomposition_option : o_use_shock_groups
+                                | o_colormap
                                 | o_psd_nodisplay
                                 | o_psd_graph_format
                                 | o_psd_detail_plot
@@ -3375,14 +3375,10 @@ o_lmmcp : LMMCP {driver.option_num("lmmcp.status", "1"); };
 o_occbin : OCCBIN {driver.option_num("occbin", "1"); };
 o_function : FUNCTION EQUAL filename { driver.option_str("function", $3); };
 o_sampling_draws : SAMPLING_DRAWS EQUAL INT_NUMBER { driver.option_num("sampling_draws",$3); };
-o_use_shock_groups : USE_SHOCK_GROUPS { driver.option_str("use_shock_groups","default"); }
-                   | USE_SHOCK_GROUPS EQUAL symbol { driver.option_str("use_shock_groups", $3); }
+o_use_shock_groups : USE_SHOCK_GROUPS { driver.option_str("plot_shock_decomp.use_shock_groups","default"); }
+                   | USE_SHOCK_GROUPS EQUAL symbol { driver.option_str("plot_shock_decomp.use_shock_groups", $3); }
                    ;
-o_psd_use_shock_groups : USE_SHOCK_GROUPS { driver.option_str("plot_shock_decomp.use_shock_groups","default"); }
-                       | USE_SHOCK_GROUPS EQUAL symbol { driver.option_str("plot_shock_decomp.use_shock_groups", $3); }
-                       ;
 o_colormap : COLORMAP EQUAL symbol { driver.option_num("plot_shock_decomp.colormap",$3); };
-o_psd_colormap : COLORMAP EQUAL symbol { driver.option_num("plot_shock_decomp.colormap",$3); };
 
 range : symbol ':' symbol
         {