cnescatlab#137 Replaced VAR with FNAME in the NAMING state for severa…

…l rules (overlooked in previous treatment of the issue)
begarco · Sep 13, 2018 · 7a4e0ba · 7a4e0ba
1 parent 091b473
commit 7a4e0ba
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/fr.cnes.analysis.tools.shell.rules/lex/COMINSTCodeComment.lex b/fr.cnes.analysis.tools.shell.rules/lex/COMINSTCodeComment.lex
@@ -163,7 +163,7 @@ CLE			= {RESERVED}| {POSIX} | {BUILTINS}
 /************************/
 <NAMING>   	
 		{
-				{VAR}			{location = yytext(); loc.add(yytext()); yybegin(PREHEADER);}
+				{FNAME}			{location = yytext(); loc.add(yytext()); yybegin(PREHEADER);}
 				\n             	{yybegin(YYINITIAL);}  
 			   	.              	{}
 		}

diff --git a/fr.cnes.analysis.tools.shell.rules/lex/COMINSTLine.lex b/fr.cnes.analysis.tools.shell.rules/lex/COMINSTLine.lex
@@ -119,7 +119,7 @@ CONDITIONAL_STRUCT		= [\[][\[]({VAR}|{SPACE}|{VALUE}|{OPERATOR}|{BRACKET})*[\]][
 /************************/
 <NAMING>   	
 		{
-				{VAR}			{	
+				{FNAME}			{	
 									location = yytext();
 									LOGGER.fine("["+this.parsedFileName+":"+(yyline+1)+":"+yycolumn+"] - NAMING -> YYINITIAL (Transition : VAR \""+yytext()+"\" )");
 									yybegin(YYINITIAL);}

diff --git a/fr.cnes.analysis.tools.shell.rules/lex/COMPRESIndent.lex b/fr.cnes.analysis.tools.shell.rules/lex/COMPRESIndent.lex
@@ -227,7 +227,7 @@ IGNORETEXT	 = "<<" {SPACE}* "EOF" [^"<<"]* "EOF" | ` [^`]* `
 /************************/
 <NAMING>   	
 		{
-				{VAR}			{location = yytext(); yybegin(BEGINFUNC);}
+				{FNAME}			{location = yytext(); yybegin(BEGINFUNC);}
 				\n             	{currentPos=0; yybegin(YYINITIAL);}  
 			   	.              	{}
 		}

diff --git a/fr.cnes.analysis.tools.shell.rules/lex/SHFLOWCheckCodeReturn.lex b/fr.cnes.analysis.tools.shell.rules/lex/SHFLOWCheckCodeReturn.lex
@@ -190,7 +190,7 @@ IGNORE_STRING_S = [\\][\']
 /************************/
 <NAMING>   	
 		{
-				{VAR}			{location = yytext(); functions.put(location, false); yybegin(BEGINFUNC);}
+				{FNAME}			{location = yytext(); functions.put(location, false); yybegin(BEGINFUNC);}
 				\n             	{yybegin(YYINITIAL);}  
 				<<EOF>>			{return getCheckResults();}
 			   	.              	{}