diff --git a/fr.cnes.analysis.tools.shell.rules/lex/COMINSTCodeComment.lex b/fr.cnes.analysis.tools.shell.rules/lex/COMINSTCodeComment.lex index e197c5f6..d5a76987 100755 --- 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} /************************/ { - {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 index 9797d1de..98d32cf6 100755 --- 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})*[\]][ /************************/ { - {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 index 16de7de1..d1b9e581 100755 --- 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" | ` [^`]* ` /************************/ { - {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 index 6eee4fb0..c8c622e1 100755 --- 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 = [\\][\'] /************************/ { - {VAR} {location = yytext(); functions.put(location, false); yybegin(BEGINFUNC);} + {FNAME} {location = yytext(); functions.put(location, false); yybegin(BEGINFUNC);} \n {yybegin(YYINITIAL);} <> {return getCheckResults();} . {}