Fix cnescatlab#50 Exception structure correction.

WaldoFR · Sep 6, 2017 · fa58b53 · fa58b53
1 parent c543ac4
commit fa58b53
Show file tree

Hide file tree

Showing 184 changed files with 459 additions and 455 deletions.
diff --git a/...es.analysis.tools.analyzer/src/fr/cnes/analysis/tools/analyzer/datas/AbstractChecker.java b/...es.analysis.tools.analyzer/src/fr/cnes/analysis/tools/analyzer/datas/AbstractChecker.java
@@ -169,17 +169,4 @@ public File getInputFile() {
         return inputFile;
     }
 
-    /**
-     * @param str
-     *            to set to ASCII decimal
-     * @return
-     * @return ASCII decimal of <code>str</code>
-     */
-    public static final String toASCII(final String str) {
-        String code = "";
-        for (char character : str.toCharArray()) {
-            code += (int) character;
-        }
-        return code;
-    }
 }
diff --git a/...analysis.tools.analyzer/src/fr/cnes/analysis/tools/analyzer/exception/JFlexException.java b/...analysis.tools.analyzer/src/fr/cnes/analysis/tools/analyzer/exception/JFlexException.java
@@ -11,6 +11,8 @@
  * 
  */
 public class JFlexException extends Exception {
+    /** Line separator for system executing the log */
+    private static final String BLANK = System.getProperty("line.separator");
 
     /**
      * Serial Version UID.
@@ -36,6 +38,16 @@ public JFlexException() {
         super();
     }
 
+    /**
+     * Constructor with original exception.
+     * 
+     * @param exception
+     *            the original exception.
+     */
+    public JFlexException(final Exception exception) {
+        super(exception);
+    }
+
     /**
      * @param pRuleName
      *            Rules causing the exception
@@ -77,25 +89,16 @@ public JFlexException(final String pRuleName, final String pFileName, final Stri
      */
     private static String errorMessage(String pRuleName, String pFileName, String pMessage,
                     String pLastScan, int pLine, int pColumn) {
-        final String message = "i-Code CNES analysis encountered a problem.\n\n" + pMessage + "\n"
-                        + "CheckerId : " + pRuleName + "\n" + "File : " + pFileName + "\n" + "Line:"
-                        + pLine + "\n" + "Column:" + pColumn + "\n"
+        final String message = "i-Code CNES analysis encountered a problem." + BLANK + BLANK
+                        + pMessage + BLANK + "CheckerId: " + pRuleName + BLANK + "File: "
+                        + pFileName + BLANK + "Line:" + pLine + BLANK + "Column:" + pColumn + BLANK
 
-                        + "Last word scanned :" + pLastScan + "\n"
-                        + "You can report this issue on : https://github.com/dupuisa/i-CodeCNES/issues/";
+                        + "Last word scanned : [" + pLastScan + "] [" + toDecimalCode(pLastScan)
+                        + "]" + BLANK
+                        + "Please report this issue on : https://github.com/dupuisa/i-CodeCNES/issues/";
         return message;
     }
 
-    /**
-     * Constructor with original exception.
-     * 
-     * @param exception
-     *            the original exception.
-     */
-    public JFlexException(final Exception exception) {
-        super(exception);
-    }
-
     /**
      * @return the fileName
      */
@@ -137,4 +140,18 @@ public final String getErrorMessage() {
     public final String getRuleName() {
         return ruleName;
     }
+
+    /**
+     * @param str
+     *            to set to ASCII decimal
+     * @return
+     * @return ASCII decimal of <code>str</code>
+     */
+    public static final String toDecimalCode(final String str) {
+        String code = "";
+        for (char character : str.toCharArray()) {
+            code += (int) character + " ";
+        }
+        return code;
+    }
 }
diff --git a/fr.cnes.analysis.tools.fortran77.metrics/lex/F77METComplexitySimplified.lex b/fr.cnes.analysis.tools.fortran77.metrics/lex/F77METComplexitySimplified.lex
@@ -231,8 +231,8 @@ STRING		 = \'[^\']*\' | \"[^\"]*\"
 
 
 				[^]            {
-									String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				                    final String errorMessage = "Analysis failure : Your file could not be analyzed. Please verify that it was encoded in an UNIX format.";
 				                    throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                                    errorMessage, parsedWord, yyline, yycolumn);
+				                                    errorMessage, yytext(), yyline, yycolumn);
 								}
diff --git a/fr.cnes.analysis.tools.fortran77.metrics/lex/F77METLineOfCode.lex b/fr.cnes.analysis.tools.fortran77.metrics/lex/F77METLineOfCode.lex
@@ -263,8 +263,8 @@ SPACE		 = [\ \r\f\t]
 /* DEFAULT STATE 	*/
 /********************/
 				[^]            {
-									String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				                    final String errorMessage = "Analysis failure : Your file could not be analyzed. Please verify that it was encoded in an UNIX format.";
 				                    throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                                    errorMessage, parsedWord, yyline, yycolumn);
+				                                    errorMessage, yytext(), yyline, yycolumn);
 								}
diff --git a/fr.cnes.analysis.tools.fortran77.metrics/lex/F77METNesting.lex b/fr.cnes.analysis.tools.fortran77.metrics/lex/F77METNesting.lex
@@ -263,8 +263,8 @@ SMBL		 = \&   	  | \+			| \$
 
 
 				[^]            {
-									String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				                    final String errorMessage = "Analysis failure : Your file could not be analyzed. Please verify that it was encoded in an UNIX format.";
 				                    throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                                    errorMessage, parsedWord, yyline, yycolumn);
+				                                    errorMessage, yytext(), yyline, yycolumn);
 								}
diff --git a/fr.cnes.analysis.tools.fortran77.metrics/lex/F77METRatioComment.lex b/fr.cnes.analysis.tools.fortran77.metrics/lex/F77METRatioComment.lex
@@ -303,8 +303,8 @@ END			 = END		  | end
 /*	ERROR THROWN	 */
 /*********************/	
 				[^]            {
-									String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				                    final String errorMessage = "Analysis failure : Your file could not be analyzed. Please verify that it was encoded in an UNIX format.";
 				                    throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                                    errorMessage, parsedWord, yyline, yycolumn);
+				                                    errorMessage, yytext(), yyline, yycolumn);
 								}
diff --git a/fr.cnes.analysis.tools.fortran77.rules/lex/COMDATAFloatCompare.lex b/fr.cnes.analysis.tools.fortran77.rules/lex/COMDATAFloatCompare.lex
@@ -521,8 +521,8 @@ FUNCTION	 = {VAR}{SPACE}*"("
 /*	ERROR THROWN	 */
 /*********************/			
 			[^]      	{
-                                    String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				                    final String errorMessage = "Analysis failure : Your file could not be analyzed. Please verify that it was encoded in an UNIX format.";
 				                    throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                                    errorMessage, parsedWord, yyline, yycolumn);
+				                                    errorMessage, yytext(), yyline, yycolumn);
 				        }
diff --git a/fr.cnes.analysis.tools.fortran77.rules/lex/COMDATAInitialisation.lex b/fr.cnes.analysis.tools.fortran77.rules/lex/COMDATAInitialisation.lex
@@ -272,10 +272,10 @@ SEE_FUNC	 = ([^a-zA-Z0-9\_])?("if" | "elseif" | "forall" | "while" | "where" | "
 
 							}
 						}else{
-							String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				            final String errorMessage = "Excepted parameter of "+ entList.get(i) +" unreachable.";
 				            throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                            errorMessage, parsedWord, yyline, yycolumn);
+				                            errorMessage, yytext(), yyline, yycolumn);
 						}
 
 					}
@@ -769,8 +769,8 @@ return getCheckResults();
 /* ERROR STATE	        */
 /************************/
 				[^]            {
-									String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				                    final String errorMessage = "Analysis failure : Your file could not be analyzed. Please verify that it was encoded in an UNIX format.";
 				                    throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                                    errorMessage, parsedWord, yyline, yycolumn);
+				                                    errorMessage, yytext(), yyline, yycolumn);
                                }
diff --git a/fr.cnes.analysis.tools.fortran77.rules/lex/COMDATAInvariant.lex b/fr.cnes.analysis.tools.fortran77.rules/lex/COMDATAInvariant.lex
@@ -109,10 +109,10 @@ STRING		 = \'[^\']*\' | \"[^\"]*\"
 		        	LOGGER.fine("Setting error line "+errors.get(i)+" for the variable "+variables.get(i)+".");
 					setError(locations.get(i),"The variable " + variables.get(i) + " must be defined as constant.", errors.get(i));
  				}else{
-                    		String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				            final String errorMessage = "Error's line of variable's "+ variables.get(i)+" violation unreachable.";
 				            throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                            errorMessage, parsedWord, yyline, yycolumn);
+				                            errorMessage, yytext(), yyline, yycolumn);
  				}
             }		
 		}
@@ -329,8 +329,8 @@ return getCheckResults();
 /* ERROR STATE	        */
 /************************/
 				[^]            {
-				                    String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				                    final String errorMessage = "Analysis failure : Your file could not be analyzed. Please verify that it was encoded in an UNIX format.";
 				                    throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                                    errorMessage, parsedWord, yyline, yycolumn);
+				                                    errorMessage, yytext(), yyline, yycolumn);
                                 }
diff --git a/fr.cnes.analysis.tools.fortran77.rules/lex/COMDATALoopCondition.lex b/fr.cnes.analysis.tools.fortran77.rules/lex/COMDATALoopCondition.lex
@@ -111,10 +111,10 @@ STRING		 = \'[^\']*\' | \"[^\"]*\"
 				closeWhileLoop();
 			identifiers.remove(idLength);
 		}else{
-            String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
             final String errorMessage = "Analysis failure : Loop's identifier unreachable.";
             throw new JFlexException(this.getClass().getName(), parsedFileName,
-                            errorMessage, parsedWord, yyline, yycolumn);
+                            errorMessage, yytext(), yyline, yycolumn);
 		}
         LOGGER.finest("end method closeCondition");
 	}
@@ -411,8 +411,8 @@ WHILE	  = "while"
 <LINE>      	.              	{}
 
 				[^]            {
-                                    String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				                    final String errorMessage = "Analysis failure : Your file could not be analyzed. Please verify that it was encoded in an UNIX format.";
 				                    throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                                    errorMessage, parsedWord, yyline, yycolumn);
+				                                    errorMessage, yytext(), yyline, yycolumn);
                                 }
diff --git a/fr.cnes.analysis.tools.fortran77.rules/lex/COMDATANotUsed.lex b/fr.cnes.analysis.tools.fortran77.rules/lex/COMDATANotUsed.lex
@@ -272,8 +272,8 @@ return getCheckResults();
 /* ERROR STATE	        */
 /************************/
 				[^]            {
-                                    String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				                    final String errorMessage = "Analysis failure : Your file could not be analyzed. Please verify that it was encoded in an UNIX format.";
 				                    throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                                    errorMessage, parsedWord, yyline, yycolumn);
+				                                    errorMessage, yytext(), yyline, yycolumn);
                                 }
diff --git a/fr.cnes.analysis.tools.fortran77.rules/lex/COMDESIGNActiveWait.lex b/fr.cnes.analysis.tools.fortran77.rules/lex/COMDESIGNActiveWait.lex
@@ -221,8 +221,8 @@ WAIT		 = "sleep" 	| "wait"	| "pause"
 /* ERROR STATE	        */
 /************************/
 				[^]            {
-                                    String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				                    final String errorMessage = "Analysis failure : Your file could not be analyzed. Please verify that it was encoded in an UNIX format.";
 				                    throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                                    errorMessage, parsedWord, yyline, yycolumn);
+				                                    errorMessage, yytext(), yyline, yycolumn);
                                 }
diff --git a/fr.cnes.analysis.tools.fortran77.rules/lex/COMDESIGNAlloc.lex b/fr.cnes.analysis.tools.fortran77.rules/lex/COMDESIGNAlloc.lex
@@ -384,8 +384,8 @@ INT			 = [0-9]+
 /* ERROR STATE	        */
 /************************/
 				[^]            {
-                                    String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				                    final String errorMessage = "Analysis failure : Your file could not be analyzed. Please verify that it was encoded in an UNIX format.";
 				                    throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                                    errorMessage, parsedWord, yyline, yycolumn);
+				                                    errorMessage, yytext(), yyline, yycolumn);
                                 }
diff --git a/fr.cnes.analysis.tools.fortran77.rules/lex/COMFLOWAbort.lex b/fr.cnes.analysis.tools.fortran77.rules/lex/COMFLOWAbort.lex
@@ -184,8 +184,8 @@ return getCheckResults();
 /* ERROR STATE	        */
 /************************/
 				[^]            {
-                                    String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				                    final String errorMessage = "Analysis failure : Your file could not be analyzed. Please verify that it was encoded in an UNIX format.";
 				                    throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                                    errorMessage, parsedWord, yyline, yycolumn);
+				                                    errorMessage, yytext(), yyline, yycolumn);
                                 }
diff --git a/fr.cnes.analysis.tools.fortran77.rules/lex/COMFLOWBooleanExpression.lex b/fr.cnes.analysis.tools.fortran77.rules/lex/COMFLOWBooleanExpression.lex
@@ -202,8 +202,8 @@ return getCheckResults();
 /* ERROR STATE	        */
 /************************/
 				[^]           {
-                                    String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				                    final String errorMessage = "Analysis failure : Your file could not be analyzed. Please verify that it was encoded in an UNIX format.";
 				                    throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                                    errorMessage, parsedWord, yyline, yycolumn);
+				                                    errorMessage, yytext(), yyline, yycolumn);
                                 }
diff --git a/fr.cnes.analysis.tools.fortran77.rules/lex/COMFLOWCheckCodeReturn.lex b/fr.cnes.analysis.tools.fortran77.rules/lex/COMFLOWCheckCodeReturn.lex
@@ -567,8 +567,8 @@ return getCheckResults();
 /* ERROR STATE	        */
 /************************/
 				[^]            	{
-                                    String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				                    final String errorMessage = "Analysis failure : Your file could not be analyzed. Please verify that it was encoded in an UNIX format.";
 				                    throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                                    errorMessage, parsedWord, yyline, yycolumn);
+				                                    errorMessage, yytext(), yyline, yycolumn);
                                 }
diff --git a/fr.cnes.analysis.tools.fortran77.rules/lex/COMFLOWCheckUser.lex b/fr.cnes.analysis.tools.fortran77.rules/lex/COMFLOWCheckUser.lex
@@ -223,8 +223,8 @@ GETUID		 = "GETUID"{SPACE}*\({SPACE}*\)
 /* ERROR STATE	        */
 /************************/
 				[^]            {
-                                    String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				                    final String errorMessage = "Analysis failure : Your file could not be analyzed. Please verify that it was encoded in an UNIX format.";
 				                    throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                                    errorMessage, parsedWord, yyline, yycolumn);
+				                                    errorMessage, yytext(), yyline, yycolumn);
                                 }
diff --git a/fr.cnes.analysis.tools.fortran77.rules/lex/COMFLOWExit.lex b/fr.cnes.analysis.tools.fortran77.rules/lex/COMFLOWExit.lex
@@ -206,8 +206,8 @@ return getCheckResults();
 /* ERROR STATE	        */
 /************************/
 				[^]            {
-                                    String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				                    final String errorMessage = "Analysis failure : Your file could not be analyzed. Please verify that it was encoded in an UNIX format.";
 				                    throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                                    errorMessage, parsedWord, yyline, yycolumn);
+				                                    errorMessage, yytext(), yyline, yycolumn);
                                 }
diff --git a/fr.cnes.analysis.tools.fortran77.rules/lex/COMFLOWExitLoop.lex b/fr.cnes.analysis.tools.fortran77.rules/lex/COMFLOWExitLoop.lex
@@ -226,7 +226,7 @@ END       = [^a-zA-Z0-9\_]("end")[^a-zA-Z0-9\_]{SPACE}*({IF} | {SELECT} | {DO} |
 /*	ERROR THROWN	 */
 /*********************/
 			[^]			{
-									String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				                    final String errorMessage = "Analysis failure : Your file could not be analyzed. Please verify that it was encoded in an UNIX format.";
 				                    throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                                    errorMessage, parsedWord, yyline, yycolumn);                        }
+				                                    errorMessage, yytext(), yyline, yycolumn);                        }
diff --git a/fr.cnes.analysis.tools.fortran77.rules/lex/COMFLOWFileExistence.lex b/fr.cnes.analysis.tools.fortran77.rules/lex/COMFLOWFileExistence.lex
@@ -268,8 +268,8 @@ return getCheckResults();
 /* ERROR STATE	        */
 /************************/
 				[^]           {
-                          			String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				                    final String errorMessage = "Analysis failure : Your file could not be analyzed. Please verify that it was encoded in an UNIX format.";
 				                    throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                                    errorMessage, parsedWord, yyline, yycolumn);
+				                                    errorMessage, yytext(), yyline, yycolumn);
                               }
diff --git a/fr.cnes.analysis.tools.fortran77.rules/lex/COMFLOWFilePath.lex b/fr.cnes.analysis.tools.fortran77.rules/lex/COMFLOWFilePath.lex
@@ -204,8 +204,8 @@ return getCheckResults();
 /* ERROR STATE	        */
 /************************/
 				[^]            {
-                                    String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				                    final String errorMessage = "Analysis failure : Your file could not be analyzed. Please verify that it was encoded in an UNIX format.";
 				                    throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                                    errorMessage, parsedWord, yyline, yycolumn);
+				                                    errorMessage, yytext(), yyline, yycolumn);
                                 }
diff --git a/fr.cnes.analysis.tools.fortran77.rules/lex/COMINSTBoolNegation.lex b/fr.cnes.analysis.tools.fortran77.rules/lex/COMINSTBoolNegation.lex
@@ -216,8 +216,8 @@ return getCheckResults();
 /* ERROR STATE	        */
 /************************/
 				[^]           {
-                                    String parsedWord = "Word ["+yytext()+"], code  [" + toASCII(yytext()) + "]";
+
 				                    final String errorMessage = "Analysis failure : Your file could not be analyzed. Please verify that it was encoded in an UNIX format.";
 				                    throw new JFlexException(this.getClass().getName(), parsedFileName,
-				                                    errorMessage, parsedWord, yyline, yycolumn);
+				                                    errorMessage, yytext(), yyline, yycolumn);
                                }