Changeset 25 for branches

Timestamp:

08/24/10 18:11:38 (14 years ago)

Author:

phdmakk

Message:

+ improved exception and debugging handling (TODO: transfer to t3tools and t3d in t3e-tools; revert outputting formatted source to STDOUT)

File:

• branches/t3e-tools/t3q/src/org/etsi/t3q/T3Q.java (modified) (5 diffs)

branches/t3e-tools/t3q/src/org/etsi/t3q/T3Q.java

@@ -7 +7 @@
 import java.util.HashMap;
 import java.util.List;
+
+import javax.sound.midi.SysexMessage;
 
 import org.apache.commons.cli.CommandLine;
@@ -169 +171 @@
                                                 + analyzer.getFilename(); 
                                         //TODO: adapt to T3D as well
-                                        String tree = "";
-                                        tree = LocationAST.dumpTree((LocationAST)analyzer.getParser().getAST(),1,tree);
                                         if (getLogLevel().equals(LogLevel.DEBUG)) {
+                                                String tree = "";
+                                                tree = LocationAST.dumpTree((LocationAST)analyzer.getParser().getAST(),1,tree);
                                                 exceptionMessage+="\n" +
                                                                 "Parse-tree trace:\n" +
@@ -183 +185 @@
                                                 } catch (TTCN3ParserException e) {
                                                         System.err.println(e.getLocalizedMessage());
-                                                        for (int i1 = 0; i1 < analyzer.getExceptions()
-                                                                        .size(); i1++) {
-                                                                System.err.println("Line "
-                                                                                + analyzer.getExceptions().get(i1)
-                                                                                                .getLine()
-                                                                                + ": "
-                                                                                + analyzer.getExceptions().get(i1)
-                                                                                                .getMessage());
-                                                        }
-                                                        // e.printStackTrace();
+                                                        dumpParserExceptions(analyzer);
                                                 }
                                         }
@@ -260 +253 @@
                         // parsing error
                         System.err.println(e.getLocalizedMessage());
-                        for (int i = 0; i < analyzer.getExceptions().size(); i++) {
-                                System.err.println("Line "
-                                                + analyzer.getExceptions().get(i).getLine() + ": "
-                                                + analyzer.getExceptions().get(i).getMessage());
-                        }
+                        dumpParserExceptions(analyzer);
                         // TODO: Isolate different steps and implement a recovery mechanism:
 
                 }
 
+        }
+
+        private void dumpParserExceptions(TTCN3Analyzer analyzer) {
+                for (RecognitionException re : analyzer.getExceptions()) {
+                        System.err.println("  Cause:\tLine "
+                                        + re.getLine() 
+                                        + ": "
+                                        + re.getMessage());
+                        
+                        String className = re.getStackTrace()[0].getClassName();
+                        System.err.println("    Parser:\t"
+                                        + className.substring(className.lastIndexOf(".")+1));
+                        System.err.println("    Rule: \t"
+                                        + re.getStackTrace()[0].getMethodName());
+                }
         }
 
@@ -342 +346 @@
 //                                      System.out.println("OutputPath: \t\t"+outputPath);
 //                                      System.out.println("****************************");
-//                                      System.out.println(formatted);
+                                        System.out.println(formatted);
 //                                      System.out.println(outputPath);
-                                        MiscTools.writeFile(outputPath, formatted);
+//                                      MiscTools.writeFile(outputPath, formatted);
                                         System.out.println("File \""+outputPath+"\" written successfully!");
 
                                 } catch (RecognitionException e1) {
-                                        System.err.println("Recognition exception:");
-                                        System.err.println(e1.getLocalizedMessage());
+                                        System.err.println("TTCN-3 Recognition exception: "+e1.getLocalizedMessage());
+                                        System.err.println("  Cause:\tLine "
+                                                        + e1.getLine() 
+                                                        + ": "
+                                                        + e1.getMessage());
+                                        
+                                        String className = e1.getStackTrace()[0].getClassName();
+                                        System.err.println("    Parser:\t"
+                                                        + className.substring(className.lastIndexOf(".")+1));
+                                        System.err.println("    Rule/Method: \t"
+                                                        + e1.getStackTrace()[0].getMethodName());
+                                        
                                 } catch (TokenStreamException e) {
                                         System.err.println("Token stream exception:");