matiec: comparison stage4/generate_c/generate_c

equal deleted inserted replaced

-:0036357a990f
+:3a478229db8b
 transition_c *symbol;
 int priority;
 int index;
 } TRANSITION;
 /***********************************************************************/
 /***********************************************************************/
 /***********************************************************************/
 /***********************************************************************/
 private:
 generate_c_il_c *generate_c_il;
 generate_c_st_c *generate_c_st;
 generate_c_SFC_IL_ST_c *generate_c_code;
-search_var_instance_decl_c *search_var_instance_decl;
 int transition_number;
 std::list<TRANSITION> transition_list;
 symbol_c *current_step;
 generate_c_sfc_elements_c(stage4out_c *s4o_ptr, symbol_c *name, symbol_c *scope, const char *variable_prefix = NULL)
 : generate_c_base_c(s4o_ptr) {
 generate_c_il = new generate_c_il_c(s4o_ptr, name, scope, variable_prefix);
 generate_c_st = new generate_c_st_c(s4o_ptr, name, scope, variable_prefix);
 generate_c_code = new generate_c_SFC_IL_ST_c(s4o_ptr, name, scope, variable_prefix);
-search_var_instance_decl = new search_var_instance_decl_c(scope);
 this->set_variable_prefix(variable_prefix);
 }
 ~generate_c_sfc_elements_c(void) {
 transition_list.clear();
 delete generate_c_il;
 delete generate_c_st;
 delete generate_c_code;
-delete search_var_instance_decl;
 }
 void reset_transition_number(void) {transition_number = 0;}
 void generate(symbol_c *symbol, sfcgeneration_t generation_type) {
 s4o.print("].");
 s4o.print(argument);
 }
 void print_transition_number(void) {
-char str[10];
+s4o.print_integer(transition_number);
-sprintf(str, "%d", transition_number);
-s4o.print(str);
 }
 void print_reset_step(symbol_c *step_name) {
 s4o.print(s4o.indent_spaces);
 s4o.print(SET_VAR);
 s4o.print(",1);\n" + s4o.indent_spaces);
 print_step_argument(step_name, "elapsed_time");
 s4o.print(" = __time_to_timespec(1, 0, 0, 0, 0, 0);\n");
 }
-bool is_variable(symbol_c *symbol) {
-/* we try to find the variable instance declaration, to determine its type... */
-symbol_c *var_decl = search_var_instance_decl->get_decl(symbol);
-return var_decl != NULL;
-}
 /*********************************************/
 /* B.1.6  Sequential function chart elements */
 /*********************************************/
 void *visit(initial_step_c *symbol) {
 strcmp(qualifier, "D") == 0 || strcmp(qualifier, "L") == 0) {
 print_action_argument(current_action, "state");
 s4o.print(" = 1;\n");
 }
 if (strcmp(qualifier, "S") == 0) {
-if (is_variable(current_action)) {
+print_action_argument(current_action, "set");
-print_variable_prefix();
-current_action->accept(*this);
-}
-else
-print_action_argument(current_action, "set");
 s4o.print(" = 1;\n");
 }
 if (strcmp(qualifier, "R") == 0) {
-if (is_variable(current_action)) {
+print_action_argument(current_action, "reset");
-print_variable_prefix();
+s4o.print(" = 1;\n");
-current_action->accept(*this);
-s4o.print(" = 0;\n");
-}
-else {
-print_action_argument(current_action, "reset");
-s4o.print(" = 1;\n");
-}
 }
 if (strcmp(qualifier, "SD") == 0 || strcmp(qualifier, "DS") == 0 ||
 strcmp(qualifier, "SL") == 0) {
 if (strcmp(qualifier, "SL") == 0) {
 print_action_argument(current_action, "reset_remaining_time");
 }
 else {
 print_action_argument(current_action, "set_remaining_time");
 }
 s4o.print(" = ");
 }
 }; /* generate_c_sfc_actiondecl_c */
 /***********************************************************************/
 /***********************************************************************/
 /***********************************************************************/
 /***********************************************************************/
 class generate_c_sfc_c: public generate_c_typedecl_c {
 private:
+std::list<VARIABLE> variable_list;
 generate_c_sfc_elements_c *generate_c_sfc_elements;
+search_var_instance_decl_c *search_var_instance_decl;
 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_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);
 }
 virtual ~generate_c_sfc_c(void) {
+variable_list.clear();
 delete generate_c_sfc_elements;
+delete search_var_instance_decl;
+}
+bool is_variable(symbol_c *symbol) {
+/* we try to find the variable instance declaration, to determine if symbol is variable... */
+symbol_c *var_decl = search_var_instance_decl->get_decl(symbol);
+return var_decl != NULL;
 }
 /*********************************************/
 /* B.1.6  Sequential function chart elements */
 /*********************************************/
 void *visit(sequential_function_chart_c *symbol) {
 int i;
 generate_c_sfc_elements->reset_transition_number();
 for(i = 0; i < symbol->n; i++) {
+symbol->elements[i]->accept(*this);
 generate_c_sfc_elements->generate(symbol->elements[i], generate_c_sfc_elements_c::transitionlist_sg);
 }
 s4o.print(s4o.indent_spaces +"INT i;\n");
 s4o.print(s4o.indent_spaces +"BOOL transition;\n");
 s4o.indent_left();
 s4o.print(s4o.indent_spaces + "}\n\n");
 /* generate action execution */
 s4o.print(s4o.indent_spaces + "// Actions execution\n");
+{
+std::list<VARIABLE>::iterator pt;
+for(pt = variable_list.begin(); pt != variable_list.end(); pt++) {
+symbol_c *var_decl = search_var_instance_decl->get_decl(pt->symbol);
+if (var_decl != NULL) {
+unsigned int vartype = search_var_instance_decl->get_vartype();
+s4o.print(s4o.indent_spaces);
+if (vartype == search_var_instance_decl_c::external_vt) {
+	  s4o.print(SET_EXTERNAL);
+	  s4o.print("(");
+	  pt->symbol->accept(*this);
+s4o.print(",");
+}
+	else {
+	  if (vartype == search_var_instance_decl_c::located_vt)
+	    s4o.print(SET_LOCATED);
+	  else
+	    s4o.print(SET_VAR);
+s4o.print("(");
+	}
+print_variable_prefix();
+pt->symbol->accept(*this);
+s4o.print(",");
+print_variable_prefix();
+s4o.print("__action_list[");
+s4o.print(SFC_STEP_ACTION_PREFIX);
+pt->symbol->accept(*this);
+s4o.print("].state);\n");
+}
+}
+}
 for(i = 0; i < symbol->n; i++) {
 generate_c_sfc_elements->generate(symbol->elements[i], generate_c_sfc_elements_c::actionbody_sg);
 }
 s4o.print("\n");
 return NULL;
 }
+void *visit(initial_step_c *symbol) {
+symbol->action_association_list->accept(*this);
+return NULL;
+}
+void *visit(step_c *symbol) {
+symbol->action_association_list->accept(*this);
+return NULL;
+}
+void *visit(action_association_c *symbol) {
+symbol_c *var_decl = search_var_instance_decl->get_decl(symbol->action_name);
+if (var_decl != NULL) {
+std::list<VARIABLE>::iterator pt;
+for(pt = variable_list.begin(); pt != variable_list.end(); pt++) {
+if (!compare_identifiers(pt->symbol, symbol->action_name))
+return NULL;
+}
+VARIABLE *variable;
+variable = new VARIABLE;
+variable->symbol = (identifier_c*)(symbol->action_name);
+variable_list.push_back(*variable);
+}
+return NULL;
+}
+void *visit(transition_c *symbol) {
+return NULL;
+}
+void *visit(action_c *symbol) {
+return NULL;
+}
 void generate(sequential_function_chart_c *sfc) {
 sfc->accept(*this);
 }
 }; /* generate_c_sfc_c */

changeset 244	3a478229db8b
parent 229	ca7bc1324540
child 279	c0453b7f99df