matiec: comparison stage1

equal deleted inserted replaced

-:f01522b04810
+:77174ccc5471
 	/*****                                           *****/
 	/*****************************************************/
 	/*****************************************************/
 	/*****************************************************/
-	if (goto_body_state__) {
+	if (get_goto_body_state()) {
 	  yy_push_state(il_st_state);
-	  goto_body_state__ = 0;
+	  rst_goto_body_state();
 	}
 	/*********************************/
 	/* Handle the pragmas!     */
 	/*********************************/
 	/* We start off by searching for the pragmas we handle in the lexical parser. */
 <INITIAL>{file_include_pragma}	unput_text(0); yy_push_state(include_beg);
 	/* Any other pragma we find, we just pass it up to the syntax parser...   */
-	/* Note that the <body> state is exclusive, so we have to include it here too. */
+	/* Note that the <il_st_state> state is exclusive, so we have to include it here too. */
 {pragma}	{/* return the pragmma without the enclosing '{' and '}' */
-		 yytext[strlen(yytext)-2] = '\0';
+		 yytext[strlen(yytext)-1] = '\0';
 		 yylval.ID=strdup(yytext+1);
 		 return pragma_token;
 		}
 <il_st_state>{pragma} {/* return the pragmma without the enclosing '{' and '}' */
-		 yytext[strlen(yytext)-2] = '\0';
+		 yytext[strlen(yytext)-1] = '\0';
 		 yylval.ID=strdup(yytext+1);
 		 return pragma_token;
 		}
 					}
 }
 	/* il_st_state -> (il_state | st_state) */
 <il_st_state>{
+{st_whitespace_no_pragma}			/* Eat any whitespace */
 {qualified_identifier}{st_whitespace}":="	unput_text(0); BEGIN(st_state);
 {qualified_identifier}"["			unput_text(0); BEGIN(st_state);
 RETURN						unput_text(0); BEGIN(st_state);
 IF						unput_text(0); BEGIN(st_state);
 		   BEGIN(il_state);
 		 }
 		 unput_text(0);
 		}
 .		unput_text(0); BEGIN(il_state);
 }	/* end of il_st_state lexical parser */
 	/* (il_state | st_state) -> $previous_state (decl_state or sfc_state) */
 <il_state,st_state>{
 END_FUNCTION		yy_pop_state(); unput_text(0);
 	/***************************************/
 	/* Next is to to remove all whitespace */
 	/***************************************/
 	/* NOTE: pragmas are handled right at the beginning... */
-<INITIAL,config_state,decl_state,st_state,sfc_state,il_st_state>{st_whitespace_no_pragma}	/* Eat any whitespace */
+<INITIAL,config_state,decl_state,st_state,sfc_state>{st_whitespace_no_pragma}	/* Eat any whitespace */
-<il_state,il_st_state>{il_whitespace_no_pragma}		/* Eat any whitespace */
+<il_state>{il_whitespace_no_pragma}		/* Eat any whitespace */
 	/*****************************************/
 	/* B.1.1 Letters, digits and identifiers */
 	/*****************************************/
 	 *
 	 *       That is why the first thing we do with identifiers, even before
 	 *       checking whether they may be a 'keyword', is to check whether
 	 *       they have been previously declared as a variable name,
 	 *
-	 *      TODO: how about function names?
+	 *       However, we have a dilema! Should we here also check for
+	 *       prev_declared_derived_function_name_token?
+	 *       If we do, then the 'MOD' default library function (defined in
+	 *       the standard) will always be returned as a function name, and
+	 *       it will therefore not be possible to use it as an operator as
+	 *       in the following ST expression 'X := Y MOD Z;' !
+	 *       If we don't, then even it will not be possible to use 'MOD'
+	 *       as a funtion as in 'X := MOD(Y, Z);'
+	 *       We solve this by NOT testing for function names here, and
+	 *       handling this function and keyword clash in bison!
 	 */
 {identifier} 	{int token = get_identifier_token(yytext);
 		 if ((token == prev_declared_variable_name_token) ||
+//		     (token == prev_declared_derived_function_name_token) || // DO NOT add this condition!
 		     (token == prev_declared_fb_name_token)) {
 		 /*
 		 if (token != identifier_token)
 		 */
-		 /* NOTE: if we use the above line, then 'MOD' et al must be removed
+		 /* NOTE: if we replace the above uncommented conditions with
-		  * from the library_symbol_table as a default function name!
+*       the simple test of (token != identifier_token), then
+*       'MOD' et al must be removed from the
+*       library_symbol_table as a default function name!
 		  */
 		   yylval.ID=strdup(yytext);
 		   return token;
 		 }
 		 /* otherwise, leave it for the other lexical parser rules... */

changeset 13	77174ccc5471
parent 11	8ce37f36d744
child 15	0b472e25eb16