Merge branch 'dev' of github.com:adireddy/haxe-checkstyle into dev

Conflicts:
	checkstyle/checks/CyclomaticComplexityCheck.hx
	run.n

Author: AlexHaxe

checkstyle/checks/CyclomaticComplexityCheck.hx

@@ -13,7 +13,10 @@ using Lambda;
 @desc("McCabe simplified cyclomatic complexity check")
 class CyclomaticComplexityCheck extends Check {
 
-	public var thresholds:Array<Threshold> = [];
+	public var thresholds:Array<Threshold> = [
+		{ severity : "WARNING", complexity : 11 },
+		{ severity : "ERROR", complexity : 21 }
+	];
 
 	override function _actualRun() {
 		_checker.ast.decls.map(function(type:TypeDecl):Null<Definition<ClassFlag, Array<Field>>> {
@@ -51,10 +54,7 @@ class CyclomaticComplexityCheck extends Check {
 
 	// This would not pass the cyclomatic complexity test.
 	function evaluateExpr(e:Expr):Int {
-		if (e == null) {
-			return 0;
-		}
-		if (e.expr == null) {
+		if (e == null || e.expr == null) {
 			return 0;
 		}
 		return switch(e.expr) {

haxelib.json

@@ -10,8 +10,8 @@
 	],
 	"description": "Automated code analysis ideal for projects that want to enforce a coding standard.",
 	"contributors": ["adireddy"],
-	"releasenote": "added NestedIfDepth, NestedForDepth and NestedTryDepth checks by @AlexHaxe",
-	"version": "1.1.0",
+	"releasenote": "added Cyclomatic Complexity test by @alebianco",
+	"version": "1.1.1",
 	"url": "https://github.com/adireddy/haxe-checkstyle",
 	"dependencies": {
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "checkstyle",
-	"version": "1.1.0",
+	"version": "1.1.1",
 	"description": "Automated code analysis ideal for projects that want to enforce a coding standard.",
 	"repository": {
 		"type": "git",