# HG changeset patch # User mjsousa # Date 1391930610 0 # Node ID 443e8243f289cbbfad3725a406b32cc65a0cbc3a # Parent 7669a8d43c1162516e99bf891420f450596ac0d9 Code cleanup (part 3): generate_c_typedecl_c is no longer needed for code generation in POUS.c It is now only needed for datatype declaration in POUS.h diff -r 7669a8d43c11 -r 443e8243f289 stage4/generate_c/generate_c_il.cc --- a/stage4/generate_c/generate_c_il.cc Sat Feb 08 23:10:12 2014 +0000 +++ b/stage4/generate_c/generate_c_il.cc Sun Feb 09 07:23:30 2014 +0000 @@ -126,7 +126,7 @@ -class generate_c_il_c: public generate_c_typedecl_c, il_default_variable_visitor_c { +class generate_c_il_c: public generate_c_base_c, il_default_variable_visitor_c { public: typedef enum { @@ -197,7 +197,7 @@ public: generate_c_il_c(stage4out_c *s4o_ptr, symbol_c *name, symbol_c *scope, const char *variable_prefix = NULL) - : generate_c_typedecl_c(s4o_ptr), + : generate_c_base_c(s4o_ptr), implicit_variable_current (IL_DEFVAR, NULL), implicit_variable_result (IL_DEFVAR, NULL), implicit_variable_result_back(IL_DEFVAR_BACK, NULL) diff -r 7669a8d43c11 -r 443e8243f289 stage4/generate_c/generate_c_inlinefcall.cc --- a/stage4/generate_c/generate_c_inlinefcall.cc Sat Feb 08 23:10:12 2014 +0000 +++ b/stage4/generate_c/generate_c_inlinefcall.cc Sun Feb 09 07:23:30 2014 +0000 @@ -26,7 +26,7 @@ #define INLINE_RESULT_TEMP_VAR "__res" #define INLINE_PARAM_COUNT "__PARAM_COUNT" -class generate_c_inlinefcall_c: public generate_c_typedecl_c { +class generate_c_inlinefcall_c: public generate_c_base_c { public: typedef enum { @@ -76,7 +76,7 @@ public: generate_c_inlinefcall_c(stage4out_c *s4o_ptr, symbol_c *name, symbol_c *scope, const char *variable_prefix = NULL) - : generate_c_typedecl_c(s4o_ptr), + : generate_c_base_c(s4o_ptr), implicit_variable_current(IL_DEFVAR, NULL) { search_varfb_instance_type = new search_varfb_instance_type_c(scope); diff -r 7669a8d43c11 -r 443e8243f289 stage4/generate_c/generate_c_sfc.cc --- a/stage4/generate_c/generate_c_sfc.cc Sat Feb 08 23:10:12 2014 +0000 +++ b/stage4/generate_c/generate_c_sfc.cc Sun Feb 09 07:23:30 2014 +0000 @@ -657,7 +657,7 @@ /***********************************************************************/ /***********************************************************************/ -class generate_c_sfc_c: public generate_c_typedecl_c { +class generate_c_sfc_c: public generate_c_base_c { private: std::list variable_list; @@ -667,7 +667,7 @@ public: generate_c_sfc_c(stage4out_c *s4o_ptr, symbol_c *name, symbol_c *scope, const char *variable_prefix = NULL) - : generate_c_typedecl_c(s4o_ptr) { + : generate_c_base_c(s4o_ptr) { generate_c_sfc_elements = new generate_c_sfc_elements_c(s4o_ptr, name, scope, variable_prefix); search_var_instance_decl = new search_var_instance_decl_c(scope); this->set_variable_prefix(variable_prefix); diff -r 7669a8d43c11 -r 443e8243f289 stage4/generate_c/generate_c_sfcdecl.cc --- a/stage4/generate_c/generate_c_sfcdecl.cc Sat Feb 08 23:10:12 2014 +0000 +++ b/stage4/generate_c/generate_c_sfcdecl.cc Sun Feb 09 07:23:30 2014 +0000 @@ -32,7 +32,7 @@ /***********************************************************************/ /***********************************************************************/ -class generate_c_sfcdecl_c: protected generate_c_typedecl_c { +class generate_c_sfcdecl_c: protected generate_c_base_c { public: typedef enum { @@ -59,7 +59,7 @@ public: generate_c_sfcdecl_c(stage4out_c *s4o_ptr, symbol_c *scope, const char *variable_prefix = NULL) - : generate_c_typedecl_c(s4o_ptr) { + : generate_c_base_c(s4o_ptr) { this->set_variable_prefix(variable_prefix); search_var_instance_decl = new search_var_instance_decl_c(scope); } diff -r 7669a8d43c11 -r 443e8243f289 stage4/generate_c/generate_c_st.cc --- a/stage4/generate_c/generate_c_st.cc Sat Feb 08 23:10:12 2014 +0000 +++ b/stage4/generate_c/generate_c_st.cc Sun Feb 09 07:23:30 2014 +0000 @@ -44,7 +44,7 @@ /***********************************************************************/ -class generate_c_st_c: public generate_c_typedecl_c { +class generate_c_st_c: public generate_c_base_c { public: typedef enum { @@ -94,7 +94,7 @@ public: generate_c_st_c(stage4out_c *s4o_ptr, symbol_c *name, symbol_c *scope, const char *variable_prefix = NULL) - : generate_c_typedecl_c(s4o_ptr) { + : generate_c_base_c(s4o_ptr) { search_fb_instance_decl = new search_fb_instance_decl_c (scope); search_varfb_instance_type = new search_varfb_instance_type_c(scope); search_var_instance_decl = new search_var_instance_decl_c (scope);