matiec: comparison stage1

equal deleted inserted replaced

-:fe4ecf7efa79
+:aead91ec37cd
 *             prev_declared_function_name_token, etc...).
 *
 *       Unfortunately, the language (especially IL) uses tokens that are
 *       not defined as keywords in the spec (e.g. 'IN', 'R1', 'S1', 'PT', etc...)!
 *       This means that it is valid to name a function 'IN', a variable 'PT', etc...
-*       BUT, the lexical parser will interpret these names as tokens (keywords).
+*       In order to solve this potential ambiguity, flex only parses the above
-*       To allow these names to be used as function names, variable names, etc...,
+*       identifiers as keywords / tokens if we are currently parsing IL code.
-*       I (Mario) have augmented the definition of identifier to also include the tokens
+*       When parsing all code other than IL code, the above identifiers are treated
-*       that are not explicitly defined as keywords in the spec!!
+*       just like any other identifier.
 *
 *
 *
 *
 * NOTE 2:
 *          - WITH
 */
 identifier:
 identifier_token	{$$ = new identifier_c($1, locloc(@$));}
-/*  Make sure that all tokens (names) not defined as keywords are included here...
+;
-* I (Mario) have already done this, but if any changes are made to this file,
-* this list MUST be kept consistent!!
-*/
-/**/
-/*
-| PRIORITY		{$$ = new identifier_c(strdup("PRIORITY"), locloc(@$));}
-| SINGLE		{$$ = new identifier_c(strdup("SINGLE"), locloc(@$));}
-| INTERVAL		{$$ = new identifier_c(strdup("INTERVAL"), locloc(@$));}
-*/
-/**/
-/* NOTE: AND, NOT, MOD, OR and XOR are keywords, so should not appear on this list... */
-/*
-| LD_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| LDN_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| ST_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| STN_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| S_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| R_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| S1_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| R1_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| CLK_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| CU_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| CD_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| PV_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| IN_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| PT_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| ANDN_operator		{$$ = il_operator_c_2_identifier_c($1);}
-*/
-/* NOTE: ANDN2_operator corresponds to the string '&N' in the source code!
-*       This is __not__ a valid name, so it is omitted from this list!!
-*| ANDN2_operator		{$$ = il_operator_c_2_identifier_c($1);}
-*/
-/*
-| ORN_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| XORN_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| ADD_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| SUB_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| MUL_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| DIV_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| GT_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| GE_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| EQ_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| LT_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| LE_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| NE_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| CAL_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| CALC_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| CALCN_operator	{$$ = il_operator_c_2_identifier_c($1);}
-| RET_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| RETC_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| RETCN_operator	{$$ = il_operator_c_2_identifier_c($1);}
-| JMP_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| JMPC_operator		{$$ = il_operator_c_2_identifier_c($1);}
-| JMPCN_operator	{$$ = il_operator_c_2_identifier_c($1);}
-*/
-;
 /*********************/
 /* B 1.2 - Constants */
 /*********************/
 constant:
 symbolic_variable:
 /* NOTE: To be entirely correct, variable_name must be replacemed by
 *         prev_declared_variable_name | prev_declared_fb_name | prev_declared_global_var_name
 */
-identifier
+prev_declared_fb_name
-	{$$ = new symbolic_variable_c($1, locloc(@$));}
-| prev_declared_fb_name
 	{$$ = new symbolic_variable_c($1, locloc(@$));}
 | prev_declared_global_var_name
 	{$$ = new symbolic_variable_c($1, locloc(@$));}
 | prev_declared_variable_name
 	{$$ = new symbolic_variable_c($1, locloc(@$));}
 | multi_element_variable
+/*
+| identifier
+	{$$ = new symbolic_variable_c($1, locloc(@$));}
+*/
 ;
 /* NOTE: in section B 1.7, when configuring a program, symbolic_variable
 *       is used. Nevertheless, during the parsing of a configuration,
 *
 * NOTE: Note that 'NOT' is special, as it conflicts
 *       with two operators: the  IL 'NOT' operator, and
 *       the unary operator 'NOT' in ST!!
 *
-*  NOTE: The IL language is ambiguous, since using NOT, AND, ...
+* NOTE: The IL language is ambiguous, since using NOT, AND, ...
 *       may be interpreted as either an IL operator, or
 *       as a standard function call!
 *       I (Mario) opted to interpret it as an IL operator.
 *       This requires changing the syntax for IL language
 *       function   calling, to exclude all function with
 *       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.
+*
+*       This change follows the IEC specification. The specification seems to
+*       imply (or is it explicit?) that in case the same identifier id used
+*       for a variable and an enumerated value, then the variable shall be
+*       considered??????????????
 */
 primary_expression:
 /* constant */
 non_negative_constant
 | enumerated_value_without_identifier
 case_element:
 case_list ':' statement_list
 	{$$ = new case_element_c($1, $3, locloc(@$));}
-| case_list ':' statement_list identifier BOGUS_TOKEN_ID
-	{$$ = new case_element_c($1, $3, locloc(@$)); ERROR;}
 ;
 case_list:
 case_list_element
 ;
 case_list_element:
 signed_integer
+| subrange
 | enumerated_value
-| subrange
-/*
-| identifier
-	{$$ = $1;}
-| prev_declared_enumerated_type_name '#' any_identifier
-	{$$ = new enumerated_value_c($1, $3);}
-*/
 ;

changeset 78	aead91ec37cd
parent 77	fe4ecf7efa79
child 79	7417b346e5a3