matiec: comparison stage4/generate_c/generate_c

equal deleted inserted replaced

-:e657008f43d0
+:da1a8186f86f
 						     //    unless global_vt is acompanied by resource_vt
 static const unsigned int located_vt  = 0x0080;  // VAR <var_name> AT <location>
 static const unsigned int program_vt  = 0x0100;  // PROGRAM (inside a configuration!)
 						     //    Programs declared inside a resource will not be declared
 						     //    unless program_vt is acompanied by resource_vt
+static const unsigned int en_vt       = 0x0200;  // EN  declaration
-static const unsigned int eneno_vt  = 0x0200;  // EN/ENO declaration
+static const unsigned int eno_vt      = 0x0400;  // ENO declaration
 static const unsigned int resource_vt = 0x8000;  // RESOURCE (inside a configuration!)
 //    This, just of itself, will not print out any declarations!!
 						     //    It must be acompanied by either program_vt and/or global_vt
 /* How variables should be declared: as local variables or
 *                __plc_pt_c<INT, 8*sizeof(INT)> START_P::loc = __plc_pt_c<INT, 8*sizeof(INT)>("I2");
 */
 typedef enum {finterface_vf,
 foutputassign_vf,
 local_vf,
-		              localinit_vf,
+localinit_vf,
-		              init_vf,
+init_vf,
-		              constructorinit_vf,
+constructorinit_vf,
-		              globalinit_vf
+globalinit_vf
-		             } varformat_t;
+} varformat_t;
 private:
 /* variable used to store the types of variables that need to be processed... */
 /* Only set in the constructor...! */
 int finterface_var_count;
 /* Current parsed resource name, for resource
 * specific global variable declaration (with #define...)*/
 symbol_c *resource_name;
-/* Store if En and ENO parameters have been defined by user */
-bool en_declared;
-bool eno_declared;
 /* Holds the references to the type and initial value
 * of the variables currently being declared.
 * Please read the comment under var1_init_decl_c for further
 * details...
 * declared.
 */
 symbol_c *globalnamespace;
 /* Actually produce the output where variables are declared... */
-/* Note that located variables are the exception, they
+/* Note that located variables and EN/ENO are the exception, they
-* being declared in the located_var_decl_c visitor...
+* being declared in the located_var_decl_c,
+* en_param_declaration_c and eno_param_declaration_c visitors...
 */
 void *declare_variables(symbol_c *symbol, bool is_fb = false) {
 list_c *list = dynamic_cast<list_c *>(symbol);
 /* should NEVER EVER occur!! */
 if (list == NULL) ERROR;
 current_var_type_symbol = NULL;
 current_var_init_symbol = NULL;
 globalnamespace         = NULL;
 nv = NULL;
 resource_name = res_name;
-en_declared = false;
-eno_declared = false;
 }
 ~generate_c_vardecl_c(void) {}
-bool is_en_declared(void) {
-return en_declared;
-}
-bool is_eno_declared(void) {
-return eno_declared;
-}
 void print(symbol_c *symbol, symbol_c *scope = NULL, const char *variable_prefix = NULL) {
 this->set_variable_prefix(variable_prefix);
 if (globalinit_vf == wanted_varformat)
 globalnamespace = scope;
 symbol->accept(*this);
 delete nv;
 nv = NULL;
 globalnamespace = NULL;
-}
-void print_eneno(void) {
-if (!en_declared) {
-if (wanted_varformat == finterface_vf) {
-if (finterface_var_count > 0)
-s4o.print(",\n" + s4o.indent_spaces);
-s4o.print("BOOL EN");
-}
-else
-s4o.print(s4o.indent_spaces + "BOOL EN;\n");
-}
-if (!eno_declared) {
-if (wanted_varformat == finterface_vf)
-s4o.print(",\n" + s4o.indent_spaces + "BOOL *ENO");
-else
-s4o.print(s4o.indent_spaces + "BOOL ENO;\n");
-}
 }
 protected:
 /***************************/
 /* B 0 - Programming Model */
 return NULL;
 }
 void *visit(en_param_declaration_c *symbol) {
 TRACE("en_declaration_c");
-if (en_declared) ERROR;
 if (wanted_varformat == finterface_vf) {
 finterface_var_count++;
 }
-if ((current_vartype & eneno_vt) != 0) {
+if ((wanted_vartype & en_vt) != 0) {
 if (wanted_varformat == finterface_vf) {
 s4o.print(nv->get());
-s4o.print("\n" + s4o.indent_spaces + "BOOL EN");
+s4o.print("\n" + s4o.indent_spaces);
-}
+symbol->type->accept(*this);
+s4o.print(" ");
+symbol->name->accept(*this);
+}
+if ((wanted_varformat == local_vf) ||
+(wanted_varformat == init_vf) ||
+(wanted_varformat == localinit_vf)) {
+s4o.print(s4o.indent_spaces);
+if (wanted_varformat != init_vf) {
+symbol->type->accept(*this);
+s4o.print(" ");
+}
+print_variable_prefix();
+symbol->name->accept(*this);
+if (wanted_varformat != local_vf) {
+s4o.print(" = ");
+symbol->value->accept(*this);
+s4o.print(";");
+}
+s4o.print(";\n");
+}
 if (wanted_varformat == constructorinit_vf) {
+/* NOTE: I (Mario) think this is dead code - never gets executed. Must confirm it before deleting it... */
 s4o.print(nv->get());
 this->print_variable_prefix();
-s4o.print("ENO = __BOOL_LITERAL(TRUE);");
+// s4o.print("EN = __BOOL_LITERAL(TRUE);");
+symbol->name->accept(*this);
+s4o.print(" = ");
+symbol->value->accept(*this);
+s4o.print(";");
 }
 }
-en_declared = true;
+return NULL;
-return NULL;
+}
-}
+void *visit(eno_param_declaration_c *symbol) {
+TRACE("eno_declaration_c");
+if (wanted_varformat == finterface_vf) {
+finterface_var_count++;
+}
+if ((wanted_vartype & eno_vt) != 0) {
+if (wanted_varformat == finterface_vf) {
+s4o.print(nv->get());
+// s4o.print("\n" + s4o.indent_spaces + "BOOL *ENO");
+s4o.print("\n" + s4o.indent_spaces);
+symbol->type->accept(*this);
+s4o.print(" *__");
+symbol->name->accept(*this);
+}
+if ((wanted_varformat == local_vf) ||
+(wanted_varformat == init_vf) ||
+(wanted_varformat == localinit_vf)) {
+s4o.print(s4o.indent_spaces);
+if (wanted_varformat != init_vf) {
+symbol->type->accept(*this);
+s4o.print(" ");
+}
+print_variable_prefix();
+symbol->name->accept(*this);
+if (wanted_varformat != local_vf) {
+s4o.print(" = __BOOL_LITERAL(TRUE);");
+}
+s4o.print(";\n");
+}
+if (wanted_varformat == foutputassign_vf) {
+s4o.print(s4o.indent_spaces + "if (__");
+symbol->name->accept(*this);
+s4o.print(" != NULL) {\n");
+s4o.indent_right();
+s4o.print(s4o.indent_spaces + "*__");
+symbol->name->accept(*this);
+s4o.print(" = ");
+symbol->name->accept(*this);
+s4o.print(";\n");
+s4o.indent_left();
+s4o.print(s4o.indent_spaces + "}\n");
+}
+if (wanted_varformat == constructorinit_vf) {
+/* NOTE: I (Mario) think this is dead code - never gets executed. Must confirm it before deleting it... */
+s4o.print(nv->get());
+this->print_variable_prefix();
+// s4o.print("ENO = __BOOL_LITERAL(TRUE);");
+symbol->name->accept(*this);
+s4o.print(" = __BOOL_LITERAL(TRUE);");
+}
+}
+return NULL;
+}
 void *visit(raising_edge_option_c *symbol) {
 // TO DO ...
 s4o.print("R_EDGE");
 return NULL;
 //s4o.indent_left();
 }
 return NULL;
 }
-void *visit(eno_param_declaration_c *symbol) {
-TRACE("eno_declaration_c");
-if (eno_declared) ERROR;
-if (wanted_varformat == finterface_vf) {
-finterface_var_count++;
-}
-if ((current_vartype & eneno_vt) != 0) {
-if (wanted_varformat == finterface_vf) {
-s4o.print(nv->get());
-s4o.print("\n" + s4o.indent_spaces + "BOOL *EN0");
-}
-if (wanted_varformat == constructorinit_vf) {
-s4o.print(nv->get());
-this->print_variable_prefix();
-s4o.print("ENO = __BOOL_LITERAL(TRUE);");
-}
-}
-eno_declared = true;
-return NULL;
-}
 /*  VAR_IN_OUT var_declaration_list END_VAR */
 void *visit(input_output_declarations_c *symbol) {
 TRACE("input_output_declarations_c");
 if ((wanted_vartype & inoutput_vt) != 0) {
 /* loop through each function parameter, find the value we should pass
 * to it, and then output the c equivalent...
 */
 function_param_iterator_c fp_iterator(p_decl);
+#if 0
 function_call_param_iterator_c function_call_param_iterator(symbol);
+#endif
 identifier_c *param_name;
 nv->push("", ", ");
 for(int i = 1; (param_name = fp_iterator.next()) != NULL; i++) {
 symbol_c *param_type = fp_iterator.param_type();
 s4o.print(nv->get());
 s4o.print("&");
 param_value->accept(*this);
 #endif
 	break;
-#if 0
-if (param_value == NULL) {
-	  /* no parameter value given, so we pass a previously declared temporary variable. */
-std::string *temp_var_name = temp_var_name_factory.new_name();
-s4o.print(*temp_var_name);
-delete temp_var_name;
-	} else {
-param_value->accept(*this);
-	}
-#endif
-	break;
 } /* switch */
 } /* for(...) */
 // symbol->parameter_assignment->accept(*this);
 s4o.print(")");

changeset 202	da1a8186f86f
parent 195	66d501d7b67d
child 217	f5dfadf5de54