Index: /trunk/t3d/src/org/etsi/t3d/DependencyPrinter.java =================================================================== --- /trunk/t3d/src/org/etsi/t3d/DependencyPrinter.java (revision 8) +++ /trunk/t3d/src/org/etsi/t3d/DependencyPrinter.java (revision 9) @@ -4,6 +4,14 @@ import java.io.FileOutputStream; import java.io.PrintStream; +import java.util.ArrayList; +import java.util.LinkedList; +import org.etsi.t3d.visitor.VisitorCommonFunctions; + +import de.ugoe.cs.swe.trex.core.analyzer.rfparser.ASTUtil; import de.ugoe.cs.swe.trex.core.analyzer.rfparser.LocationAST; +import de.ugoe.cs.swe.trex.core.analyzer.rfparser.TTCN3ParserTokenTypes; +import de.ugoe.cs.swe.trex.core.analyzer.rfparser.symboltable.EnumSymbol; +import de.ugoe.cs.swe.trex.core.analyzer.rfparser.symboltable.Symbol; public class DependencyPrinter { @@ -15,43 +23,139 @@ } + //TODO: unify + + /** + * Extracts identifiers related to a module definition identifier within the + * corresponding module definition subtree + * TODO: filter out predefined functions + * @param moduleDefinitionIdentifierNode - A module definition identifier node + * @return - A list of referenced identifier nodes, excluding the identifier + * nodes of the module definition itself; if node is not of type Identifier + * an empty list is returned instead + */ + //TODO: this may need to be moved for reuse + private static LinkedList getRelatedIdentifierNodes( + LocationAST identifierNode) { + LinkedList identifierNodes = new LinkedList(); + if (identifierNode.getType() != TTCN3ParserTokenTypes.Identifier) { + return identifierNodes; + } + LocationAST moduleDefinitionNode = LocationAST.resolveParentsUntilType(identifierNode, + TTCN3ParserTokenTypes.ModuleDefinition); + + LocationAST typeNode = LocationAST.getModuleDefinitionTypeNode(moduleDefinitionNode); + if (typeNode.getType() == TTCN3ParserTokenTypes.ModuleParDef + && typeNode.getFirstChild().getType() == TTCN3ParserTokenTypes.MultitypedModuleParList) { + LocationAST sibling = identifierNode.getNextSibling(); + if (sibling != null + && sibling.getType() != TTCN3ParserTokenTypes.Identifier) { + identifierNodes.addAll(ASTUtil.findTypeNodes(sibling, + TTCN3ParserTokenTypes.Identifier)); + + } + LocationAST moduleParNode = LocationAST.resolveParentsUntilType(identifierNode, + TTCN3ParserTokenTypes.ModulePar); + LocationAST moduleParTypeNode = moduleParNode.getFirstChild(); + identifierNodes.addAll(ASTUtil.findTypeNodes(moduleParTypeNode, + TTCN3ParserTokenTypes.Identifier)); + + } else { + identifierNodes = ASTUtil.findTypeNodes(moduleDefinitionNode, + TTCN3ParserTokenTypes.Identifier); + ArrayList moduleDefinitionIdentifierNodes = LocationAST.getModuleDefinitionIdentifiersList(moduleDefinitionNode); + identifierNodes.removeAll(moduleDefinitionIdentifierNodes); + } + // TODO: exclude predefined functions + return identifierNodes; + } + + /** + * Transforms a list of identifier nodes into a list of reference IDs + * @param identifierNodes - the list of identifier nodes + * @return - A list of reference IDs + */ + private LinkedList getReferenceIds(LinkedList identifierNodes){ + LinkedList referencedIds = new LinkedList(); + + for (LocationAST identifierNode : identifierNodes) { + LocationAST declarationNode = VisitorCommonFunctions.getDeclarationNodeFromIdentifier(identifierNode.getFirstChild()); + if (declarationNode != null) { + String id = VisitorCommonFunctions.getIdFromIdentifier(declarationNode); + // TODO: move predefined filtering up + if (!id.equals("#") && !id.startsWith("trexPredefined")) { + Symbol symbol = identifierNode.getFirstChild().getSymbol(); + if (symbol instanceof EnumSymbol) { + //TODO: need to add handling in documentation and imports generators too probably + declarationNode = symbol.getSurroundingScope().getScopeSymbol().getDeclarationNode(); + id = VisitorCommonFunctions.getIdFromIdentifier(declarationNode); + } + if (VisitorCommonFunctions.isValidCrossReference(declarationNode)) { + if (!referencedIds.contains(id)) { + referencedIds.add(id); + } + } + } + } else { + referencedIds.add("unresolvedReference---" + + VisitorCommonFunctions.getName(identifierNode.getFirstChild())); + } + } + return referencedIds; + } + + + private String getDependecies(LocationAST identifierNode) { + //TODO: this should be a part of the printer + LinkedList referenceIds = getReferenceIds(getRelatedIdentifierNodes(identifierNode)); + //sanitize list for slipped-through enumerated values + referenceIds.remove(VisitorCommonFunctions.getIdFromIdentifier(identifierNode)); + String refs = "\n\t\t"; + for (String id : referenceIds) + refs += "\n\t\t\t"; + refs += "\n\t\t"; + return refs; + } - public void newElement(String name, String id, int type, int line, - String module, String dependencies) { - writeStream("\n\t"); - writeStream(dependencies); - writeStream("\n\t\n"); + private String getElementList(LocationAST node){ + //TODO: this should be a part of the printer + String elementList = "\n\t\t"; + LinkedList moduleDefinitionsList = ASTUtil.findTypeNodes(LocationAST.resolveParentsUntilType(node, TTCN3ParserTokenTypes.ModuleDefinition).getFirstChild(), TTCN3ParserTokenTypes.ModuleDefinition); + for(LocationAST moduleDefinitionNode : moduleDefinitionsList){ + ArrayList identifiersList = LocationAST.getModuleDefinitionIdentifiersList(moduleDefinitionNode); + for(LocationAST identifierNode : identifiersList) + elementList += "\n\t\t\t"; + } + return elementList + "\n\t\t"; } - public void newGroup(String name, String id, int type, int line, String module, - String elementList) { - writeStream("\n\t"); - writeStream(elementList); - writeStream("\n\t\n"); + + public void newElement(LocationAST node) { + ArrayList identifiersList = LocationAST.getModuleDefinitionIdentifiersList(node); + LocationAST typeNode = LocationAST.getModuleDefinitionTypeNode(node); + //TODO: refine further + for (LocationAST identifierNode : identifiersList) { + writeStream("\n\t"); + + if (typeNode.getType()==TTCN3ParserTokenTypes.GroupDef) { + writeStream(getElementList(identifierNode)); + }else { + writeStream(getDependecies(identifierNode)); + } + writeStream("\n\t\n"); + } } - + public void setXMLPath(String xmlpath){ FileOutputStream file; Index: /trunk/t3d/src/org/etsi/t3d/visitor/DependencyVisitor.java =================================================================== --- /trunk/t3d/src/org/etsi/t3d/visitor/DependencyVisitor.java (revision 8) +++ /trunk/t3d/src/org/etsi/t3d/visitor/DependencyVisitor.java (revision 9) @@ -28,51 +28,4 @@ } - - /** - * Extracts identifiers related to a module definition identifier within the - * corresponding module definition subtree - * TODO: filter out predefined functions - * @param moduleDefinitionIdentifierNode - A module definition identifier node - * @return - A list of referenced identifier nodes, excluding the identifier - * nodes of the module definition itself; if node is not of type Identifier - * an empty list is returned instead - */ - //TODO: this may need to be moved for reuse - private static LinkedList getRelatedIdentifierNodes( - LocationAST identifierNode) { - LinkedList identifierNodes = new LinkedList(); - if (identifierNode.getType() != TTCN3ParserTokenTypes.Identifier) { - return identifierNodes; - } - LocationAST moduleDefinitionNode = LocationAST.resolveParentsUntilType(identifierNode, - TTCN3ParserTokenTypes.ModuleDefinition); - - LocationAST typeNode = LocationAST.getModuleDefinitionTypeNode(moduleDefinitionNode); - if (typeNode.getType() == TTCN3ParserTokenTypes.ModuleParDef - && typeNode.getFirstChild().getType() == TTCN3ParserTokenTypes.MultitypedModuleParList) { - LocationAST sibling = identifierNode.getNextSibling(); - if (sibling != null - && sibling.getType() != TTCN3ParserTokenTypes.Identifier) { - identifierNodes.addAll(ASTUtil.findTypeNodes(sibling, - TTCN3ParserTokenTypes.Identifier)); - - } - LocationAST moduleParNode = LocationAST.resolveParentsUntilType(identifierNode, - TTCN3ParserTokenTypes.ModulePar); - LocationAST moduleParTypeNode = moduleParNode.getFirstChild(); - identifierNodes.addAll(ASTUtil.findTypeNodes(moduleParTypeNode, - TTCN3ParserTokenTypes.Identifier)); - - } else { - identifierNodes = ASTUtil.findTypeNodes(moduleDefinitionNode, - TTCN3ParserTokenTypes.Identifier); - ArrayList moduleDefinitionIdentifierNodes = LocationAST.getModuleDefinitionIdentifiersList(moduleDefinitionNode); - identifierNodes.removeAll(moduleDefinitionIdentifierNodes); - } - // TODO: exclude predefined functions - return identifierNodes; - } - - /** * Extracts referenced identifiers from within a module definition subtree @@ -93,86 +46,6 @@ } - - /** - * Transforms a list of identifier nodes into a list of reference IDs - * @param identifierNodes - the list of identifier nodes - * @return - A list of reference IDs - */ - private LinkedList getReferenceIds(LinkedList identifierNodes){ - LinkedList referencedIds = new LinkedList(); - - for (LocationAST identifierNode : identifierNodes) { - LocationAST declarationNode = VisitorCommonFunctions.getDeclarationNodeFromIdentifier(identifierNode.getFirstChild()); - if (declarationNode != null) { - String id = VisitorCommonFunctions.getIdFromIdentifier(declarationNode); - // TODO: move predefined filtering up - if (!id.equals("#") && !id.startsWith("trexPredefined")) { - Symbol symbol = identifierNode.getFirstChild().getSymbol(); - if (symbol instanceof EnumSymbol) { - //TODO: need to add handling in documentation and imports generators too probably - declarationNode = symbol.getSurroundingScope().getScopeSymbol().getDeclarationNode(); - id = VisitorCommonFunctions.getIdFromIdentifier(declarationNode); - } - if (VisitorCommonFunctions.isValidCrossReference(declarationNode)) { - if (!referencedIds.contains(id)) { - referencedIds.add(id); - } - } - } - } else { - referencedIds.add("unresolvedReference---" - + VisitorCommonFunctions.getName(identifierNode.getFirstChild())); - } - } - return referencedIds; - } - - - private String getDependecies(LocationAST identifierNode) { - //TODO: this should be a part of the printer - LinkedList referenceIds = getReferenceIds(getRelatedIdentifierNodes(identifierNode)); - //sanitize list for slipped-through enumerated values - referenceIds.remove(VisitorCommonFunctions.getIdFromIdentifier(identifierNode)); - String refs = "\n\t\t"; - for (String id : referenceIds) - refs += "\n\t\t\t"; - refs += "\n\t\t"; - return refs; - } - - private String getElementList(LocationAST node){ - //TODO: this should be a part of the printer - String elementList = "\n\t\t"; - LinkedList moduleDefinitionsList = ASTUtil.findTypeNodes(LocationAST.resolveParentsUntilType(node, TTCN3ParserTokenTypes.ModuleDefinition).getFirstChild(), TTCN3ParserTokenTypes.ModuleDefinition); - for(LocationAST moduleDefinitionNode : moduleDefinitionsList){ - ArrayList identifiersList = LocationAST.getModuleDefinitionIdentifiersList(moduleDefinitionNode); - for(LocationAST identifierNode : identifiersList) - elementList += "\n\t\t\t"; - } - return elementList + "\n\t\t"; - } - public ContinueStatus visitModuleDefinition(LocationAST node) throws TTCN3BehaviorException { - ArrayList identifiersList = LocationAST.getModuleDefinitionIdentifiersList(node); - LocationAST typeNode = LocationAST.getModuleDefinitionTypeNode(node); - - for (LocationAST identifierNode : identifiersList) { - if (typeNode.getType()==TTCN3ParserTokenTypes.GroupDef) { - dependencyPrinter.newGroup(VisitorCommonFunctions.getName(identifierNode), - VisitorCommonFunctions.getIdFromIdentifier(identifierNode.getFirstChild()), - typeNode.getType(), - identifierNode.getLine(), - VisitorCommonFunctions.getModuleName(identifierNode), - getElementList(identifierNode)); - }else { - dependencyPrinter.newElement(VisitorCommonFunctions.getName(identifierNode), - VisitorCommonFunctions.getIdFromIdentifier(identifierNode.getFirstChild()), - typeNode.getType(), - identifierNode.getLine(), - VisitorCommonFunctions.getModuleName(identifierNode), - getDependecies(identifierNode)); - } - } - + dependencyPrinter.newElement(node); return ContinueStatus.getInstance(true,true); }