Changeset 28 for branches/t3e-tools/t3q/src/org/etsi/t3q/visitor/QualityChecker.java

Timestamp:

09/24/10 12:14:04 (14 years ago)

Author:

phdmakk

Message:

 

File:

• branches/t3e-tools/t3q/src/org/etsi/t3q/visitor/QualityChecker.java (modified) (3 diffs)

branches/t3e-tools/t3q/src/org/etsi/t3q/visitor/QualityChecker.java

@@ -2185 +2185 @@
         }
 
-        // -------------------------------------------------------------------------------------------
-
+        //TODO: extract, duplicate of nested alt statements
+        public void checkNoNestedModes(LocationAST node) {
+
+                LinkedList<LocationAST> nestedNodes = ASTUtil.findTypeNodes(node
+//                              .getFirstChild()
+                                , TTCN3ParserTokenTypes.ModeSpecification);
+                if (nestedNodes != null && nestedNodes.size() > 0) {
+                        LocationAST nestedNode;
+
+                        int[] nodeTypes = new int[] {TTCN3ParserTokenTypes.ModeSpecification};
+                        for (int n = 0; n < nestedNodes.size(); n++) {
+                                nestedNode = nestedNodes.get(n);
+                                int nestingDepth = getConstructNesting(nestedNode, nodeTypes); 
+                                if (nestingDepth > T3Q.activeProfile.getEmbeddedExtensionConfig().getAllowedModeNestingDepth()) {
+                                        this.getLoggingInterface().logWarning(nestedNode.getLine(), nestedNode.getEndLine(), MessageClass.STYLE, "Mode nesting depth ("+nestingDepth+") exceeds maximum allowed nesting depth ("+T3Q.activeProfile.getEmbeddedExtensionConfig().getAllowedModeNestingDepth()+")!", "EC.XX, "+MiscTools.getMethodName());
+                                }
+                        }
+                }
+
+        }
+        
+        // -------------------------------------------------------------------------------------------
+
+        //TODO: further potential for reuse?
         public void checkNoNestedAltStatements(LocationAST node) {
 
@@ -2193 +2215 @@
 //                              .getFirstChild()
                                 , TTCN3ParserTokenTypes.AltConstruct);
-
                 if (nestedAltConstructNodes != null && nestedAltConstructNodes.size() > 0) {
                         LocationAST nestedAltConstructNode;
 
+                        int[] nodeTypes = new int[] {TTCN3ParserTokenTypes.AltConstruct, TTCN3ParserTokenTypes.AltstepDef};
                         for (int n = 0; n < nestedAltConstructNodes.size(); n++) {
                                 nestedAltConstructNode = nestedAltConstructNodes.get(n);
-                                int nestingDepth = getAltConstructNesting(nestedAltConstructNode); 
+                                int nestingDepth = getConstructNesting(nestedAltConstructNode, nodeTypes); 
                                 if (nestingDepth > T3Q.activeProfile.getMaximumAllowedNestingDepth()) {
                                         this.getLoggingInterface().logWarning(nestedAltConstructNode.getLine(), nestedAltConstructNode.getEndLine(), MessageClass.STYLE, "Alt statement nesting depth ("+nestingDepth+") exceeds maximum allowed nesting depth ("+T3Q.activeProfile.getMaximumAllowedNestingDepth()+")!", "6.3, "+MiscTools.getMethodName());
@@ -2210 +2232 @@
         // -------------------------------------------------------------------------------------------
 
-        private int getAltConstructNesting(LocationAST node){
+        private int getConstructNesting(LocationAST node, int[] nodeTypes){
                 int nestingDepth = 1;
-                LocationAST containingAltConstructNode = LocationAST.resolveParentsUntilType(node.getParent(), new int[] {TTCN3ParserTokenTypes.AltConstruct, TTCN3ParserTokenTypes.AltstepDef});
+                LocationAST containingConstructNode = LocationAST.resolveParentsUntilType(node.getParent(), nodeTypes);
                 
-                if (containingAltConstructNode != null){
-                        nestingDepth += getAltConstructNesting(containingAltConstructNode);
+                if (containingConstructNode != null){
+                        nestingDepth += getConstructNesting(containingConstructNode, nodeTypes);
                 } else {
                         nestingDepth = 0;