matiec: comparison stage1_2/iec

equal deleted inserted replaced

-:76324f461aed
+:2a42a68f4b59
 /* A global flag used to tell the parser whether to include the full variable location when printing out error messages... */
 extern bool full_token_loc;
 /* A global flag used to tell the parser whether to generate conversion function for enumerated data types. */
-extern bool conversion_functions_;
+extern bool conversion_functions;
-/* A global flag used to tell the parser whether to allow use of REF_TO ANY datatypes (non-standard extension) */
+/* A global flag used to tell the parser whether to allow use of DREF and '^' operators (defined in IEC 61131-3 v3) */
+extern bool allow_ref_dereferencing;
+/* A global flag used to tell the parser whether to allow use of REF_TO ANY datatypes (non-standard extension to IEC 61131-3 v3) */
 extern bool allow_ref_to_any;
 /* A global flag used to tell the parser whether to allow use of REF_TO as a struct or array element (non-standard extension) */
 extern bool allow_ref_to_in_derived_datatypes;
 structure_type_name: identifier;
 */
 data_type_declaration:
 TYPE type_declaration_list END_TYPE
-	{$$ = new data_type_declaration_c($2, locloc(@$)); if (conversion_functions_) 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++;}
 | TYPE error type_declaration_list END_TYPE
 	{$$ = NULL; print_err_msg(locf(@2), locl(@2), "unexpected token after 'TYPE' in data type(s) declaration."); yyerrok;}
 | identifier
 	{$$ = new symbolic_variable_c($1, locloc(@$));}
 */
 | symbolic_variable '^'
 	/* Dereferencing operator defined in IEC 61131-3 v3. However, implemented here differently then how it is defined in the standard! See following note for explanation! */
-	{$$ = new deref_expression_c($1, locloc(@$));}
+	{$$ = new deref_expression_c($1, locloc(@$));
+	 if (!allow_ref_dereferencing) {
+	   print_err_msg(locf(@$), locl(@$), "Derefencing REF_TO datatypes with '^' is not allowed (use -r option to activate support for this IEC 61131-3 v3 feature).");
+	   yynerrs++;
+	 }
+}
 ;
 /*
 * NOTE: The syntax defined in the v3 standard for the dereferencing operator '^' seems to me to be un-intentionally
 *       limited. For example
 *         ref_to_bool_var := REF(        array_of_bool [1] );   <---     Allowed!
 */
 bool allow_extensible_function_parameters = false;
 /* A global flag indicating whether to include the full variable location when printing out error messages... */
 bool full_token_loc;
+/* A global flag used to tell the parser whether to generate conversion function for enumerated data types. */
+bool conversion_functions = false;
+/* A global flag used to tell the parser whether to allow use of DREF and '^' operators (defined in IEC 61131-3 v3) */
+bool allow_ref_dereferencing;
 /* A global flag used to tell the parser whether to allow use of REF_TO ANY datatypes (non-standard extension) */
 bool allow_ref_to_any = false;
 /* A global flag used to tell the parser whether to allow use of REF_TO as a struct or array element (non-standard extension) */
 bool allow_ref_to_in_derived_datatypes = false;
 #define DEF_LIBFILENAME LIBDIRECTORY "/" LIBFILE
 extern const char *INCLUDE_DIRECTORIES[];
 int stage2__(const char *filename,
-const char *includedir,   /* Include directory, where included files will be searched for... */
 symbol_c **tree_root_ref,
-bool full_token_loc_,                     /* error messages specify full token location */
+stage1_2_options_t options
-bool allow_ref_to_nonstandard_extensions_ /* allow use of non-standard REF_TO ANY datatypes, and REF_TO inside structs and arrays */
+) {
-) {
 char *libfilename = NULL;
-if (includedir != NULL) {
+if (options.includedir != NULL) {
-INCLUDE_DIRECTORIES[0] = includedir;
+INCLUDE_DIRECTORIES[0] = options.includedir;
 }
 /* first parse the standard library file... */
 /* Do not debug the standard library, even if debug flag is set! */
 /*
 return -1;
 }
 allow_function_overloading           = true;
 allow_extensible_function_parameters = true;
-full_token_loc                       = full_token_loc_;
+full_token_loc                       = options.full_token_loc;
-allow_ref_to_any                     = allow_ref_to_nonstandard_extensions_;
+conversion_functions                 = options.conversion_functions;
-allow_ref_to_in_derived_datatypes    = allow_ref_to_nonstandard_extensions_;
+allow_ref_dereferencing              = options.ref_standard_extensions;
+allow_ref_to_any                     = options.ref_nonstand_extensions;
+allow_ref_to_in_derived_datatypes    = options.ref_nonstand_extensions;
 if (yyparse() != 0)
 ERROR;
 fclose(libfile);
 if (yynerrs > 0) {
 return -1;
 }
 allow_function_overloading           = false;
 allow_extensible_function_parameters = false;
-full_token_loc                       = full_token_loc_;
+full_token_loc                       = options.full_token_loc;
-allow_ref_to_any                     = allow_ref_to_nonstandard_extensions_;
+conversion_functions                 = options.conversion_functions;
-allow_ref_to_in_derived_datatypes    = allow_ref_to_nonstandard_extensions_;
+allow_ref_dereferencing              = options.ref_standard_extensions;
+allow_ref_to_any                     = options.ref_nonstand_extensions;
+allow_ref_to_in_derived_datatypes    = options.ref_nonstand_extensions;
 //allow_ref_to_any = false;    /* we only allow REF_TO ANY in library functions/FBs, no matter what the user asks for in the command line */
 if (yyparse() != 0) {
 fprintf (stderr, "\nParsing failed because of too many consecutive syntax errors. Bailing out!\n");
 exit(EXIT_FAILURE);

changeset 934	2a42a68f4b59
parent 933	76324f461aed
child 936	0f7bcc160568