--- a/stage4/generate_c/generate_c_st.cc Sat Apr 14 15:19:17 2012 +0100
+++ b/stage4/generate_c/generate_c_st.cc Sat Apr 14 16:44:53 2012 +0100
@@ -89,6 +89,7 @@
search_expression_type_c *search_expression_type;
search_varfb_instance_type_c *search_varfb_instance_type;
+ search_var_instance_decl_c *search_var_instance_decl;
search_base_type_c search_base_type;
@@ -109,6 +110,8 @@
search_fb_instance_decl = new search_fb_instance_decl_c(scope);
search_expression_type = new search_expression_type_c(scope);
search_varfb_instance_type = new search_varfb_instance_type_c(scope);
+ search_var_instance_decl = new search_var_instance_decl_c(scope);
+
this->set_variable_prefix(variable_prefix);
current_array_type = NULL;
current_param_type = NULL;
@@ -122,6 +125,7 @@
delete search_fb_instance_decl;
delete search_expression_type;
delete search_varfb_instance_type;
+ delete search_var_instance_decl;
}
@@ -133,7 +137,7 @@
private:
void *print_getter(symbol_c *symbol) {
- unsigned int vartype = search_varfb_instance_type->get_vartype(symbol);
+ unsigned int vartype = search_var_instance_decl->get_vartype(symbol);
if (wanted_variablegeneration == fparam_output_vg) {
if (vartype == search_var_instance_decl_c::external_vt)
s4o.print(GET_EXTERNAL_BY_REF);
@@ -155,7 +159,7 @@
variablegeneration_t old_wanted_variablegeneration = wanted_variablegeneration;
wanted_variablegeneration = complextype_base_vg;
symbol->accept(*this);
- if (search_varfb_instance_type->type_is_complex())
+ if (search_varfb_instance_type->type_is_complex(symbol))
s4o.print(",");
wanted_variablegeneration = complextype_suffix_vg;
symbol->accept(*this);
@@ -172,8 +176,8 @@
bool type_is_complex = false;
if (fb_symbol == NULL) {
- unsigned int vartype = search_varfb_instance_type->get_vartype(symbol);
- type_is_complex = search_varfb_instance_type->type_is_complex();
+ unsigned int vartype = search_var_instance_decl->get_vartype(symbol);
+ type_is_complex = search_varfb_instance_type->type_is_complex(symbol);
if (vartype == search_var_instance_decl_c::external_vt)
s4o.print(SET_EXTERNAL);
else if (vartype == search_var_instance_decl_c::located_vt)