Changeset 40 for trunk/t3q/src/org/etsi

Timestamp:

05/08/11 21:11:57 (14 years ago)

Author:

phdmakk

Message:

+ fixed log statement processing issues (failure to combine subsequent log statement and failure to process log statements containing variable or other references)

File:

• trunk/t3q/src/org/etsi/t3q/visitor/QualityChecker.java (modified) (4 diffs)

trunk/t3q/src/org/etsi/t3q/visitor/QualityChecker.java

@@ -1862 +1862 @@
                                 subsequentLogStatementNodes.add(subsequentLogStatementNode);
                                 subsequentLogStatementNode = getSubsequentLogStatement(subsequentLogStatementNode);
-                        } 
+                        }
                 }
                 checkLogFormat(node, logStatementText, endLine);
@@ -1871 +1871 @@
         private LocationAST getSubsequentLogStatement(LocationAST logStatementNode) {
                 LocationAST subsequentLogStatementNode = null;
-                LocationAST nextStatement = logStatementNode.getNthParent(3)
-                                .getNextSibling();
+                LocationAST nextStatement = LocationAST.resolveParentsUntilType(logStatementNode, new int[]{TTCN3ParserTokenTypes.FunctionStatement, TTCN3ParserTokenTypes.ControlStatementOrDef}).getNextSibling();
 
                 if ((nextStatement != null) && (nextStatement.getType() == TTCN3ParserTokenTypes.SemiColon)) {
@@ -1880 +1879 @@
                         if (nextStatement.getType() == TTCN3ParserTokenTypes.FunctionStatement || 
                                         nextStatement.getType() == TTCN3ParserTokenTypes.ControlStatementOrDef) {
-                                LocationAST thirdChild = nextStatement
-                                                .getNthChild(3);
-                                if (thirdChild != null
-                                                && thirdChild.getType() == TTCN3ParserTokenTypes.LogStatement) {
-                                        subsequentLogStatementNode = thirdChild;
+                                LocationAST logStatement = nextStatement
+                                                .getNthChild(2);
+                                if (logStatement != null
+                                                && logStatement.getType() == TTCN3ParserTokenTypes.LogStatement) {
+                                        subsequentLogStatementNode = logStatement;
                                 }
                         }
@@ -1905 +1904 @@
                                 //TODO: attempt to perform resolution
                                 logStatementText += "";
+                                //TODO: consider fixing the parser, this is an ugly workaround
+                                LinkedList<LocationAST> cStringNodes = ASTUtil.findTypeNodes(logItem, TTCN3ParserTokenTypes.CharStringValue);
+                                for (LocationAST cStringNode : cStringNodes){
+                                        logStatementText+=cStringNode.getFirstChild().getText();
+                                }
                         }
                         logItem = logItem.getNextSibling();