matiec: comparison stage1

equal deleted inserted replaced

-:f648065fb66e
+:dadda1b5401e
 %type <leaf>	start
 %type <leaf>	any_identifier
 %token <ID>	prev_declared_variable_name_token
+%token <ID>	prev_declared_direct_variable_token
 %token <ID>	prev_declared_fb_name_token
 %type <leaf>	prev_declared_variable_name
+%type <leaf>	prev_declared_direct_variable
 %type <leaf>	prev_declared_fb_name
 %token  <ID>	prev_declared_simple_type_name_token
 %token  <ID>	prev_declared_subrange_type_name_token
 %token  <ID>	prev_declared_enumerated_type_name_token
 /* Done totally within flex...
 location_prefix
 size_prefix
 */
 %token <ID>	direct_variable_token
-%type  <leaf>	direct_variable
+//%type  <leaf>	direct_variable
 /*************************************/
 /* B.1.4.2   Multi-element Variables */
 /*************************************/
 /*********************/
 /* B 1.4 - Variables */
 /*********************/
 variable:
 symbolic_variable
-| direct_variable
+| prev_declared_direct_variable
 | eno_param
 ;
 symbolic_variable:
 /********************************************/
 /* B.1.4.1   Directly Represented Variables */
 /********************************************/
-direct_variable: direct_variable_token	{$$ = new direct_variable_c($1, locloc(@$));};
+prev_declared_direct_variable: prev_declared_direct_variable_token	{$$ = new direct_variable_c($1, locloc(@$));};
 /*************************************/
 | double_byte_string_spec
 ;
 location:
-AT direct_variable
+AT direct_variable_token
-	{$$ = new location_c($2, locloc(@$));}
+	{$$ = new location_c(new direct_variable_c($2, locloc(@$)), locloc(@$));
+	 direct_variable_symtable.insert($2, prev_declared_direct_variable_token);
+	}
 /* ERROR_CHECK_BEGIN */
 | AT error
 	{$$ = NULL;
 	 if (is_current_syntax_token()) {print_err_msg(locl(@1), locf(@2), "no location defined in location declaration.");}
 	 else {print_err_msg(locf(@2), locl(@2), "invalid location in global location declaration."); yyclearin;}
 function_declaration:
 /*  FUNCTION derived_function_name ':' elementary_type_name io_OR_function_var_declarations_list function_body END_FUNCTION */
 function_name_declaration ':' elementary_type_name io_OR_function_var_declarations_list function_body END_FUNCTION
 	{$$ = new function_declaration_c($1, $3, $4, $5, locloc(@$));
 	 variable_name_symtable.pop();
+	 direct_variable_symtable.pop();
 	 if (allow_function_overloading) {
 	   switch (library_element_symtable.find_value($1)) {
 	     case prev_declared_derived_function_name_token:
 	       /* do nothing, already in map. */
 	       break;
 	}
 /* | FUNCTION derived_function_name ':' derived_type_name io_OR_function_var_declarations_list function_body END_FUNCTION */
 | function_name_declaration ':' derived_type_name io_OR_function_var_declarations_list function_body END_FUNCTION
 	{$$ = new function_declaration_c($1, $3, $4, $5, locloc(@$));
 	 variable_name_symtable.pop();
+	 direct_variable_symtable.pop();
 	 if (allow_function_overloading) {
 	   switch (library_element_symtable.find_value($1)) {
 	     case prev_declared_derived_function_name_token: /* do nothing, already in map. */ break;
 	     case BOGUS_TOKEN_ID: library_element_symtable.insert($1, prev_declared_derived_function_name_token); break;
 	     default: ERROR;
 	  * we have finished parsing the function block,
 	  * the variable names are now out of scope, so
 	  * are no longer valid!
 	  */
 	 variable_name_symtable.pop();
+	 direct_variable_symtable.pop();
 	}
 /* ERROR_CHECK_BEGIN */
 | FUNCTION_BLOCK io_OR_other_var_declarations_list function_block_body END_FUNCTION_BLOCK
 {$$ = NULL; print_err_msg(locl(@1), locf(@2), "no function block name defined in function block declaration."); yynerrs++;}
 | FUNCTION_BLOCK error io_OR_other_var_declarations_list function_block_body END_FUNCTION_BLOCK
 	  * we have finished parsing the program declaration,
 	  * the variable names are now out of scope, so
 	  * are no longer valid!
 	  */
 	 variable_name_symtable.pop();
+	 direct_variable_symtable.pop();
 	}
 /* ERROR_CHECK_BEGIN */
 | PROGRAM program_var_declarations_list function_block_body END_PROGRAM
 {$$ = NULL; print_err_msg(locl(@1), locf(@2), "no program name defined in program declaration.");}
 | PROGRAM error program_var_declarations_list function_block_body END_PROGRAM
 configuration_declaration:
 CONFIGURATION configuration_name
 optional_global_var_declarations
 single_resource_declaration
-{variable_name_symtable.pop();}
+{variable_name_symtable.pop();
+direct_variable_symtable.pop();}
 optional_access_declarations
 optional_instance_specific_initializations
 END_CONFIGURATION
 	{$$ = new configuration_declaration_c($2, $3, $4, $6, $7, locloc(@$));
 	 library_element_symtable.insert($2, prev_declared_configuration_name_token);
 	 variable_name_symtable.pop();
+	 direct_variable_symtable.pop();
 	}
 | CONFIGURATION configuration_name
 optional_global_var_declarations
 resource_declaration_list
 optional_access_declarations
 optional_instance_specific_initializations
 END_CONFIGURATION
 	{$$ = new configuration_declaration_c($2, $3, $4, $5, $6, locloc(@$));
 	 library_element_symtable.insert($2, prev_declared_configuration_name_token);
 	 variable_name_symtable.pop();
+	 direct_variable_symtable.pop();
 }
 /* ERROR_CHECK_BEGIN */
 | CONFIGURATION
 optional_global_var_declarations
 single_resource_declaration
-{variable_name_symtable.pop();}
+{variable_name_symtable.pop();
+direct_variable_symtable.pop();}
 optional_access_declarations
 optional_instance_specific_initializations
 END_CONFIGURATION
 {$$ = NULL; print_err_msg(locl(@1), locf(@2), "no configuration name defined in configuration declaration."); yynerrs++;}
 | CONFIGURATION
 END_CONFIGURATION
 {$$ = NULL; print_err_msg(locl(@1), locf(@2), "no configuration name defined in configuration declaration."); yynerrs++;}
 | CONFIGURATION error
 optional_global_var_declarations
 single_resource_declaration
-{variable_name_symtable.pop();}
+{variable_name_symtable.pop();
+direct_variable_symtable.pop();}
 optional_access_declarations
 optional_instance_specific_initializations
 END_CONFIGURATION
 {$$ = NULL; print_err_msg(locf(@2), locl(@2), "invalid configuration name defined in configuration declaration."); yyerrok;}
 | CONFIGURATION error
 END_CONFIGURATION
 {$$ = NULL; print_err_msg(locf(@4), locl(@4), "invalid resource(s) defined in configuration declaration."); yyerrok;}
 /*| CONFIGURATION configuration_name
 optional_global_var_declarations
 single_resource_declaration
-{variable_name_symtable.pop();}
+{variable_name_symtable.pop();
+direct_variable_symtable.pop();}
 optional_access_declarations
 optional_instance_specific_initializations
 END_OF_INPUT
 {$$ = NULL; print_err_msg(locf(@1), locl(@2), "unclosed configuration declaration."); yyerrok;}*/
 | CONFIGURATION configuration_name
 /* ERROR_CHECK_END */
 ;
 resource_declaration:
-RESOURCE {variable_name_symtable.push();} resource_name ON resource_type_name
+RESOURCE {variable_name_symtable.push();direct_variable_symtable.push();} resource_name ON resource_type_name
 optional_global_var_declarations
 single_resource_declaration
 END_RESOURCE
 	{$$ = new resource_declaration_c($3, $5, $6, $7, locloc(@$));
 	 variable_name_symtable.pop();
+	 direct_variable_symtable.pop();
 	 variable_name_symtable.insert($3, prev_declared_resource_name_token);
 	}
 /* ERROR_CHECK_BEGIN */
-| RESOURCE {variable_name_symtable.push();} ON resource_type_name
+| RESOURCE {variable_name_symtable.push();direct_variable_symtable.push();} ON resource_type_name
 optional_global_var_declarations
 single_resource_declaration
 END_RESOURCE
 {$$ = NULL; print_err_msg(locl(@1), locf(@3), "no resource name defined in resource declaration."); yynerrs++;}
-/*|	RESOURCE {variable_name_symtable.push();} resource_name ON resource_type_name
+/*|	RESOURCE {variable_name_symtable.push();direct_variable_symtable.push();} resource_name ON resource_type_name
 optional_global_var_declarations
 single_resource_declaration
 END_OF_INPUT
 	{$$ = NULL; print_err_msg(locf(@1), locl(@5), "unclosed resource declaration."); yyerrok;}*/
 | RESOURCE error END_RESOURCE
 | access_name ':' access_path ':' non_generic_type_name direction
 ;
 access_path:
-direct_variable
+prev_declared_direct_variable
-| prev_declared_resource_name '.' direct_variable
+| prev_declared_resource_name '.' prev_declared_direct_variable
 | any_fb_name_list symbolic_variable
 | prev_declared_resource_name '.' any_fb_name_list symbolic_variable
 | prev_declared_program_name '.'  any_fb_name_list symbolic_variable
 | prev_declared_resource_name '.' prev_declared_program_name '.' any_fb_name_list symbolic_variable
 ;
 data_source:
 constant
 | global_var_reference
 | program_output_reference
-| direct_variable
+| prev_declared_direct_variable
 ;
 program_configuration:
 //  PROGRAM [RETAIN | NON_RETAIN] program_name [WITH task_name] ':' program_type_name ['(' prog_conf_elements ')'] //
 PROGRAM program_name optional_task_name ':' prev_declared_program_type_name optional_prog_conf_elements
 prog_data_source:
 constant
 | enumerated_value
 | global_var_reference
-| direct_variable
+| prev_declared_direct_variable
 ;
 data_sink:
 global_var_reference
-| direct_variable
+| prev_declared_direct_variable
 ;
 instance_specific_initializations:
 VAR_CONFIG instance_specific_init_list END_VAR
 	{$$ = new instance_specific_initializations_c($2, locloc(@$));}

changeset 175	dadda1b5401e
parent 151	3b898fb11e73
child 177	697562a5da7c