Added catch clause count to computation of cyclomatic complexity for analysis level 2

Signed-off-by: Saurabh Sinha <sinha108@gmail.com>

Author: sinha108

src/main/java/com/ibm/cldk/SymbolTable.java

@@ -324,8 +324,7 @@ private static int getCyclomaticComplexity(CallableDeclaration callableDeclarati
                 .reduce(0, Integer::sum);
         int conditionalExprCount = callableDeclaration.findAll(ConditionalExpr.class).size();
         int catchClauseCount = callableDeclaration.findAll(CatchClause.class).size();
-        int cyclomaticComplexity = ifStmtCount + loopStmtCount + switchCaseCount + conditionalExprCount + catchClauseCount + 1;
-        return cyclomaticComplexity;
+        return ifStmtCount + loopStmtCount + switchCaseCount + conditionalExprCount + catchClauseCount + 1;
     }
 
     /**

src/main/java/com/ibm/cldk/utils/AnalysisUtils.java

@@ -23,6 +23,7 @@
 import com.ibm.wala.ipa.callgraph.impl.DefaultEntrypoint;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSAConditionalBranchInstruction;
 import com.ibm.wala.ssa.SSASwitchInstruction;
 import com.ibm.wala.types.ClassLoaderReference;
@@ -96,7 +97,11 @@ public static int getCyclomaticComplexity(IR ir) {
         int switchBranchCount = Arrays.stream(ir.getInstructions())
                 .filter(inst -> inst instanceof SSASwitchInstruction)
                 .map(inst -> ((SSASwitchInstruction) inst).getCasesAndLabels().length).reduce(0, Integer::sum);
-        return conditionalBranchCount + switchBranchCount + 1;
+        Iterable<ISSABasicBlock> iterableBasicBlocks = ir::getBlocks;
+        int catchBlockCount = (int) StreamSupport.stream(iterableBasicBlocks.spliterator(), false)
+                .filter(ISSABasicBlock::isCatchBlock)
+                .count();
+        return conditionalBranchCount + switchBranchCount + catchBlockCount + 1;
     }
 
     public static Pair<String, Callable> getCallableFromSymbolTable(IMethod method) {