Changeset 53

Timestamp:

02/21/12 11:13:27 (13 years ago)

Author:

phdmakk

Message:

• switched to upstream AbstractVisitor? and exceptions
• changed version number
• fixed reference to T3Q in error messages
• fixed import all except crash
• fixed import all except import view output
• fixed nested enum crash

Location:

trunk/t3d/src/org/etsi/t3d

Files:

• DependencyPrinter.java (modified) (1 diff)
• ImportPrinter.java (modified) (3 diffs)
• T3D.java (modified) (3 diffs)
• exceptions (deleted)
• visitor/AbstractVisitor.java (deleted)
• visitor/DependencyVisitor.java (modified) (2 diffs)
• visitor/ImportVisitor.java (modified) (2 diffs)
• visitor/T3DVisitor.java (modified) (2 diffs)

trunk/t3d/src/org/etsi/t3d/DependencyPrinter.java

@@ -87 +87 @@
                                         if (symbol instanceof EnumSymbol) {
                                                 //TODO: need to add handling in documentation and imports generators too probably
-                                                declarationNode = symbol.getSurroundingScope().getScopeSymbol().getDeclarationNode();
+                                                declarationNode = symbol.getDeclarationNode();
+                                                //declarationNode = symbol.getSurroundingScope().getScopeSymbol().getDeclarationNode();
                                                 id = VisitorCommonFunctions.getIdFromIdentifier(declarationNode);
                                         }

trunk/t3d/src/org/etsi/t3d/ImportPrinter.java

@@ -32 +32 @@
         }
 
-        private void closeModule(){
+        public void closeModule(){
                 writeStream("\n</module>");             
         }
@@ -88 +88 @@
                         }
                 }
-                closeModule();
+                //closeModule();
         }
         
         private String getImportBehavior(LocationAST importDef){
                 String b = VisitorCommonFunctions.getWholeElement(importDef, true).replaceAll("\\r", "");
+                String allWithExcepts = "";
+                if (!ASTUtil.findTypeNodes(importDef, TTCN3ParserTokenTypes.ExceptsDef).isEmpty()){
+                        allWithExcepts = "all except ";
+                }
                 b = StringEscapeUtils.escapeXml(b);
                 b = b.replaceAll("\\n", "").trim();
@@ -100 +104 @@
                         b = b.replaceFirst("import from \\w* ", "");
                 b = VisitorCommonFunctions.replaceReferences(b, VisitorCommonFunctions.getReferences(importDef));
+                b = allWithExcepts+b;
                 return b.trim();
         }

trunk/t3d/src/org/etsi/t3d/T3D.java

@@ -29 +29 @@
 import org.etsi.t3d.config.DocumentationProfile;
 import org.etsi.t3d.config.T3DOptionsHandler;
-import org.etsi.t3d.exceptions.TTCN3BehaviorException;
-import org.etsi.t3d.exceptions.TTCN3ParserException;
 import org.etsi.t3d.visitor.DependencyVisitor;
 import org.etsi.t3d.visitor.ImportVisitor;
@@ -49 +47 @@
 import de.ugoe.cs.swe.trex.core.analyzer.rfparser.TTCN3AnalyzerFlyweightFactory;
 import de.ugoe.cs.swe.trex.core.analyzer.rfparser.TTCN3Parser;
+import de.ugoe.cs.swe.trex.core.visitor.TTCN3BehaviorException;
+import de.ugoe.cs.swe.trex.core.visitor.TTCN3ParserException;
 
 public class T3D {
 
-        public static String versionNumber = "v1.0.2";
+        public static String versionNumber = "v1.0.3";
         //set during automated server builds
         private static String buildStamp = "---BUILD_STAMP---";
@@ -771 +771 @@
                                         stacktrace+="\n    "+ste.toString();
                                 }
-                                System.err.println("ERROR: A problem occurred while running T3Q" +
+                                System.err.println("ERROR: A problem occurred while running T3D" +
                                                 "\n  Problem type: " + 
                                                 e +
                                                 "\n  Stacktrace:" +
                                                 stacktrace + 
-                                                "\n  Run T3Q with --verbosity=DEBUG for a more detailed report" );
+                                                "\n  Run T3D with --verbosity=DEBUG for a more detailed report" );
                         }
                 }

trunk/t3d/src/org/etsi/t3d/visitor/DependencyVisitor.java

@@ -5 +5 @@
 
 import org.etsi.t3d.DependencyPrinter;
-import org.etsi.t3d.exceptions.TTCN3BehaviorException;
 
 import de.ugoe.cs.swe.trex.core.analyzer.rfparser.ASTUtil;
@@ -12 +11 @@
 import de.ugoe.cs.swe.trex.core.analyzer.rfparser.symboltable.EnumSymbol;
 import de.ugoe.cs.swe.trex.core.analyzer.rfparser.symboltable.Symbol;
+import de.ugoe.cs.swe.trex.core.visitor.AbstractVisitor;
+import de.ugoe.cs.swe.trex.core.visitor.TTCN3BehaviorException;
 
 public class DependencyVisitor extends AbstractVisitor {

trunk/t3d/src/org/etsi/t3d/visitor/ImportVisitor.java

@@ -5 +5 @@
 import org.etsi.t3d.ImportPrinter;
 import org.etsi.t3d.T3D;
-import org.etsi.t3d.exceptions.TTCN3BehaviorException;
 
 import de.ugoe.cs.swe.trex.core.analyzer.rfparser.LocationAST;
+import de.ugoe.cs.swe.trex.core.visitor.AbstractVisitor;
+import de.ugoe.cs.swe.trex.core.visitor.TTCN3BehaviorException;
 
 public class ImportVisitor extends AbstractVisitor {
@@ -30 +31 @@
                 importPrinter.newModule(VisitorCommonFunctions.getName(node));
                 importPrinter.printImportView(node);
+                importPrinter.closeModule();
                 if(T3D.activeProfile.isCheckCyclicImports())
                         importPrinter.checkForCyclicImports(node, new LinkedList<String>());

trunk/t3d/src/org/etsi/t3d/visitor/T3DVisitor.java

@@ -7 +7 @@
 import org.etsi.t3d.T3D;
 import org.etsi.t3d.XMLPrinter;
-import org.etsi.t3d.exceptions.TTCN3BehaviorException;
 
 import de.ugoe.cs.swe.trex.core.analyzer.rfparser.ASTUtil;
@@ -13 +12 @@
 import de.ugoe.cs.swe.trex.core.analyzer.rfparser.TTCN3ParserTokenTypes;
 import de.ugoe.cs.swe.trex.core.analyzer.rfparser.TokenWithIndex;
+import de.ugoe.cs.swe.trex.core.visitor.AbstractVisitor;
+import de.ugoe.cs.swe.trex.core.visitor.TTCN3BehaviorException;
 
 import elements.*;