Fixes for #349 (#350)

* Fixes for #349

Changed the excludes to use the string as a regular expression except in
the case where a "path" option is provided. Where a path is provided, it
should work as before. Removed the appended class name because the
simpler provided path will still match paths checked against it.

* Fixed some compilation errors

* Fixed pull request issues

* Added the path option to excludes in order to let excludes work as they did before.

Author: pypmannetjies

checkstyle.json

@@ -518,6 +518,7 @@
 		}
 	],
 	"exclude": {
+		"path": "RELATIVE_TO_SOURCE",
 		"all": [],
 		"Dynamic": [
 			"checkstyle/Main",

src/checkstyle/Checker.hx

@@ -279,8 +279,7 @@ class Checker {
 		var slashes:EReg = ~/[\/\\]/g;
 		cls = slashes.replace(cls, ":");
 		for (exclude in excludesForCheck) {
-			var regStr:String = slashes.replace(exclude, ":") + ":.*?" + cls.substring(cls.lastIndexOf(":") + 1, cls.length) + "$";
-			var r = new EReg(regStr, "i");
+			var r = new EReg(exclude, "i");
 			if (r.match(cls)) return true;
 		}
 		return false;

src/checkstyle/Main.hx

@@ -144,7 +144,6 @@ class Main {
 	function parseExcludes(config:ExcludeConfig) {
 		var excludes = Reflect.fields(config);
 		var pathType = Reflect.field(config, "path");
-		if (pathType == null) pathType = RELATIVE_TO_SOURCE;
 		for (exclude in excludes) {
 			if (exclude == "path") continue;
 			createExcludeMapElement(exclude);
@@ -159,21 +158,38 @@ class Main {
 	}
 
 	function updateExcludes(exclude:String, val:String, pathType:ExcludePath) {
-		if (pathType == RELATIVE_TO_SOURCE) {
-			for (p in paths) {
-				//var basePath = ~/[\/\\]/.split(p)[0];
-				var path = p + "/" + val.split(".").join("/");
-				if (exclude == "all") allExcludes.push(path);
-				else excludesMap.get(exclude).push(path);
-			}
+		if (pathType == null) {
+			addToExclude(exclude, val);
 		}
 		else {
-			var path = val.split(".").join("/");
-			if (exclude == "all") allExcludes.push(path);
-			else excludesMap.get(exclude).push(path);
+			if (pathType == RELATIVE_TO_SOURCE) {
+				for (path in paths) {
+					addNormalisedPathToExclude(exclude, path + ":" + val);
+				}
+			}
+			else {
+				addNormalisedPathToExclude(exclude, val);
+			}
 		}
 	}
 
+	function addNormalisedPathToExclude(exclude:String, path:String) {
+		var path = normalisePath(path);
+		addToExclude(exclude, path);
+	}
+
+	function normalisePath(path:String):String {
+		var slashes:EReg = ~/[\/\\]/g;
+		path = path.split(".").join(":");
+		path = slashes.replace(path, ":");
+		return path;
+	}
+
+	function addToExclude(exclude:String, value:String) {
+		if (exclude == "all") allExcludes.push(value);
+		else excludesMap.get(exclude).push(value);
+	}
+
 	function createCheck(checkConf:CheckConfig):Check {
 		var check:Check = info.build(checkConf.type);
 		if (check == null) {