Commiting merge with Laurent's recent dead code removal change.
--- a/stage1_2/iec.y Thu Apr 21 11:22:13 2011 +0200
+++ b/stage1_2/iec.y Sun May 15 10:22:15 2011 +0100
@@ -5186,7 +5186,7 @@
step_name: any_identifier;
action_association:
- action_name '(' {cmd_goto_sfc_qualifier_state()} action_qualifier {cmd_pop_state()} indicator_name_list ')'
+ action_name '(' {cmd_goto_sfc_qualifier_state();} action_qualifier {cmd_pop_state();} indicator_name_list ')'
{$$ = new action_association_c($1, $4, $6, locloc(@$));}
/* ERROR_CHECK_BEGIN */
/*| action_name '(' error ')'
--- a/stage4/stage4.cc Thu Apr 21 11:22:13 2011 +0200
+++ b/stage4/stage4.cc Sun May 15 10:22:15 2011 +0100
@@ -93,6 +93,10 @@
}
}
+void stage4out_c::flush(void) {
+ out->flush();
+}
+
void stage4out_c::enable_output(void) {
allow_output = true;
}
--- a/stage4/stage4.hh Thu Apr 21 11:22:13 2011 +0200
+++ b/stage4/stage4.hh Sun May 15 10:22:15 2011 +0100
@@ -48,7 +48,9 @@
stage4out_c(std::string indent_level = " ");
stage4out_c(const char *dir, const char *radix, const char *extension, std::string indent_level = " ");
~stage4out_c(void);
-
+
+ void flush(void);
+
void enable_output(void);
void disable_output(void);