Changeset 10 for trunk/t3d/src/org

Timestamp:

06/21/10 17:35:41 (14 years ago)

Author:

phdmakk

Message:

+ implemented module definition locations (start - end) (sample, needs refinement)
+ implemented consistency and conflict checks (sample, needs refinement)

File:

• trunk/t3d/src/org/etsi/t3d/DependencyPrinter.java (modified) (2 diffs)

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

@@ -134 +134 @@
                 LocationAST typeNode = LocationAST.getModuleDefinitionTypeNode(node);
                 //TODO: refine further 
+                String option = "";
+                if (identifiersList.size() > 1) {
+                        option = " conflicted=\"true\"";
+                        //TODO: use proper logging interface
+                        System.out.println(currentTTCN3File.substring(currentTTCN3File.lastIndexOf("/") + 1)+": "+node.getLine()+": WARNING: Multiple identifiers declared in a single module defintion!");
+                }
+                LocationAST nextModuleDefinitionNode = node.getNextSibling();
+                while (nextModuleDefinitionNode!=null && nextModuleDefinitionNode.getType()==TTCN3ParserTokenTypes.SemiColon){
+                        nextModuleDefinitionNode = nextModuleDefinitionNode.getNextSibling();
+                }
+                if (nextModuleDefinitionNode!=null && node.getLine()==nextModuleDefinitionNode.getLine()){
+                        option = " conflicted=\"true\"";
+                        //TODO: use proper logging interface
+                        System.out.println(currentTTCN3File.substring(currentTTCN3File.lastIndexOf("/") + 1)+": "+node.getLine()+": WARNING: Multiple module definitions on the same line");
+                }
                 for (LocationAST identifierNode : identifiersList) {
                         writeStream("\n\t<element id=\""
@@ -141 +156 @@
                                         + "\" type=\""
                                         + LocationAST.getTTCN3ParserTokenTypeTypePrettyName(typeNode.getType())
-                                        + "\" line=\""
-                                        + identifierNode.getLine()
+                                        + "\" startline=\""
+                                        + node.getLine()
+                                        + "\" endline=\""
+                                        + node.getEndLine()
                                         + "\" module=\""
                                         + VisitorCommonFunctions.getModuleName(identifierNode)
                                         + "\" file=\""
                                         + currentTTCN3File.substring(currentTTCN3File.lastIndexOf("/") + 1)
-                                        + "\">");
+                                        + "\""
+                                        + option
+                                        + ">");
                         
                         if (typeNode.getType()==TTCN3ParserTokenTypes.GroupDef) {