# HG changeset patch
# User Manuele Conti <conti.ma@alice.it>
# Date 1354056442 -3600
# Node ID ffd8ac7e82f5709e78049594bb3a8a65e6be4e98
# Parent  1972c31c844d4fa2d51659423ea1c82833d20615# Parent  f1fc4aa6f0e35421a2c5a1ea0b2a254dedd62746
Merge with Mario's changes.

diff -r f1fc4aa6f0e3 -r ffd8ac7e82f5 stage1_2/iec_bison.yy
--- a/stage1_2/iec_bison.yy	Tue Nov 27 15:49:05 2012 +0000
+++ b/stage1_2/iec_bison.yy	Tue Nov 27 23:47:22 2012 +0100
@@ -2506,7 +2506,7 @@
 
 data_type_declaration:
   TYPE type_declaration_list END_TYPE
-	{$$ = new data_type_declaration_c($2, locloc(@$)); include_string((create_enumtype_conversion_functions_c::get_declaration($$)).c_str());}
+	{$$ = new data_type_declaration_c($2, locloc(@$)); if (conversion_functions_) include_string((create_enumtype_conversion_functions_c::get_declaration($$)).c_str());}
 /* ERROR_CHECK_BEGIN */
 | TYPE END_TYPE
 	{$$ = NULL; print_err_msg(locl(@1), locf(@2), "no data type declared in data type(s) declaration."); yynerrs++;}