matiec: comparison stage1

equal deleted inserted replaced

-:f01522b04810
+:77174ccc5471
 void cmd_goto_body_state(void);
 int  get_goto_body_state(void);
 void rst_goto_body_state(void);
 %}
+%glr-parser
+// %expect-rr 1
 %union {
 symbol_c 	*leaf;
 %type  <leaf>	enumerated_spec_init
 %type  <leaf>	enumerated_specification
 /* helper symbol for enumerated_value */
 %type  <list>	enumerated_value_list
 %type  <leaf>	enumerated_value
+%type  <leaf>	enumerated_value_without_identifier
 %type  <leaf>	array_type_declaration
 %type  <leaf>	array_spec_init
 %type  <leaf>	array_specification
 /* helper symbol for array_specification */
 /********************************************/
 /* B 1.6 Sequential Function Chart elements */
 /********************************************/
-/* TODO */
 %type  <list>	sequential_function_chart
 %type  <list>	sfc_network
 %type  <leaf>	initial_step
 %type  <leaf>	step
 | prev_declared_enumerated_type_name '#' any_identifier
 	{$$ = new enumerated_value_c($1, $3);}
 ;
+enumerated_value_without_identifier:
+prev_declared_enumerated_type_name '#' any_identifier
+	{$$ = new enumerated_value_c($1, $3);}
+;
 array_type_declaration:
 /*  array_type_name ':' array_spec_init */
 identifier ':' array_spec_init
 	{$$ = new array_type_declaration_c($1, $3);
 symbolic_variable:
 /* NOTE: To be entirely correct, variable_name should be replacemed by
 *         prev_declared_variable_name | prev_declared_fb_name | prev_declared_global_var_name
 */
-prev_declared_variable_name
+identifier
 	{$$ = new symbolic_variable_c($1);}
 | prev_declared_fb_name
 	{$$ = new symbolic_variable_c($1);}
 | prev_declared_global_var_name
+	{$$ = new symbolic_variable_c($1);}
+| prev_declared_variable_name
 	{$$ = new symbolic_variable_c($1);}
 | multi_element_variable
 ;
 	{$$ = $1; $$->add_element($2);}
 ;
 initial_step:
 INITIAL_STEP step_name ':' action_association_list END_STEP
+//  INITIAL_STEP identifier ':' action_association_list END_STEP
 	{$$ = new initial_step_c($2, $4);}
 ;
 step:
 STEP step_name ':' action_association_list END_STEP
+//  STEP identifier ':' action_association_list END_STEP
 	{$$ = new step_c($2, $4);}
 ;
 /* helper symbol for:
 *  - initial_step
 | action_association_list action_association ';'
 	{$$ = $1; $$->add_element($2);}
 ;
-step_name: identifier;
+// step_name: identifier;
+step_name: any_identifier;
 action_association:
 action_name '(' action_qualifier indicator_name_list ')'
 	{$$ = new action_association_c($1, $3, $4, NULL);}
 ;
 	{$$ = new indicator_name_list_c();}
 | indicator_name_list ',' indicator_name
 	{$$ = $1; $$->add_element($3);}
 ;
-action_name: identifier;
+// action_name: identifier;
+action_name: any_identifier;
 action_qualifier:
 /* empty */
 	{$$ = NULL;}
 | qualifier
 | variable
 ;
 indicator_name: variable;
-transition_name: identifier;
+// transition_name: identifier;
+transition_name: any_identifier;
 steps:
 step_name
 	{$$ = new steps_c($1, NULL);}
 | '(' step_name_list ')'
 	{$$ = new step_name_list_c(); $$->add_element($1); $$->add_element($3);}
 | step_name_list ',' step_name
 	{$$ = $1; $$->add_element($3);}
 ;
 transition_header:
 TRANSITION FROM steps TO steps
 	{$$.first = NULL; $$.second = NULL; $$.third = $3; $$.fourth = $5; cmd_goto_body_state();}
 | TRANSITION transition_name FROM steps TO steps
+//| TRANSITION identifier FROM steps TO steps
 	{$$.first = $2; $$.second = NULL; $$.third = $4; $$.fourth = $6; cmd_goto_body_state();}
 | TRANSITION '(' PRIORITY ASSIGN integer ')' FROM steps TO steps
 	{$$.first = NULL; $$.second = $5; $$.third = $8; $$.fourth = $10; cmd_goto_body_state();}
 | TRANSITION transition_name '(' PRIORITY ASSIGN integer ')' FROM steps TO steps
+//| TRANSITION identifier '(' PRIORITY ASSIGN integer ')' FROM steps TO steps
 	{$$.first = $2; $$.second = $6; $$.third = $9; $$.fourth = $11; cmd_goto_body_state();}
 ;
 transition_condition_il:
 ':' eol_list simple_instr_list
 {$$ = new transition_c($1.first, $1.second, $1.third, $1.fourth, NULL, $2);}
 ;
 action_header:
 ACTION action_name ':'
+//  ACTION identifier ':'
 	{$$.first = $2; cmd_goto_body_state();}
 ;
 action:
 RESOURCE {variable_name_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);
-variable_name_symtable.pop();
+	 variable_name_symtable.pop();
 	 variable_name_symtable.insert($3, prev_declared_resource_name_token);
 	}
 ;
 ;
 */
 instruction_list:
 il_instruction
+	{$$ = new instruction_list_c(); $$->add_element($1);}
+| pragma eol_list
 	{$$ = new instruction_list_c(); $$->add_element($1);}
 | instruction_list il_instruction
 	{$$ = $1; $$->add_element($2);}
 | instruction_list pragma
 	{$$ = $1; $$->add_element($2);}
 il_expr_operator_clash '(' eol_list
 	{$$ = $1;}
 ;
+/* NOTE: We use enumerated_value_without_identifier instead of enumerated_value
+*       in order to remove a reduce/reduce conflict between reducing an
+*       identifier to a variable or an enumerated_value.
+*/
 il_operand:
 variable
-| enumerated_value
+| enumerated_value_without_identifier
 | constant
 ;
 il_operand_list:
 *       (i.e. the constant 9, preceded by a unary negation)
 *
 *       To remove the conlfict, we only allow constants without
 *       a preceding '-' to be used in primary_expression
 */
+/* NOTE: We use enumerated_value_without_identifier instead of enumerated_value
+*       in order to remove a reduce/reduce conflict between reducing an
+*       identifier to a variable or an enumerated_value.
+*/
 primary_expression:
 /* constant */
 non_negative_constant
-| enumerated_value
+| enumerated_value_without_identifier
 | variable
 | '(' expression ')'
 	{$$ = $2;}
 |  function_invocation
 ;
 /********************/
 /* B 3.2 Statements */
 /********************/
 statement_list:
-/* empty */
+statement ';'
-	{$$ = new statement_list_c();}
+	{$$ = new statement_list_c(); $$->add_element($1);}
+| pragma
+	{$$ = new statement_list_c(); $$->add_element($1);}
 | statement_list statement ';'
 	{$$ = $1; $$->add_element($2);}
 | statement_list pragma
 	{$$ = $1; $$->add_element($2);}
 | statement_list error ';'
 case_list_element:
 signed_integer
 | enumerated_value
 | subrange
+/*
+| identifier
+	{$$ = $1;}
+| prev_declared_enumerated_type_name '#' any_identifier
+	{$$ = new enumerated_value_c($1, $3);}
+*/
 ;
 * (Section 3.3.2.4) as being of an integer type
 * (e.g., SINT, INT, or DINT).
 *
 * Obviously this presuposes that the control_variable
 * must have been declared in some VAR .. END_VAR
-* construct, so I (Mario) changed the syntax to read
+* We could therefore change the syntax to read
 * control_variable: prev_declared_variable_name;
+*
+* However, it is probaly best if we leave the semantic checks
+* to the semantic analyser of pass 2.
 */
-control_variable: prev_declared_variable_name {$$ = $1;};
+// control_variable: prev_declared_variable_name {$$ = $1;};
+control_variable: identifier {$$ = $1;};
 /* Integrated directly into for_statement */
 /*
 for_list:
 expression TO expression [BY expression]

changeset 13	77174ccc5471
parent 10	66f4f7f85d0a
child 15	0b472e25eb16