Merge branch 'dev'

Author: adireddy

CHECKS.md

@@ -0,0 +1,9 @@
+###Report of default checks on CheckStyle library itself
+
+`Info: LINE - 4: Invalid enum member signature: INFO (name should be ~/^[a-z]+[a-zA-Z0-9]*$/)`
+
+`Info: LINE - 5: Invalid enum member signature: WARNING (name should be ~/^[a-z]+[a-zA-Z0-9]*$/)`
+
+`Info: LINE - 6: Invalid enum member signature: ERROR (name should be ~/^[a-z]+[a-zA-Z0-9]*$/)`
+
+`Total Issues: 3 (Errors: 0 Warnings: 0 Infos: 3)`

README.md

@@ -299,19 +299,26 @@ To see all the options available run the following command.
 [-p | --path] <loc>              : Set reporter path
 [-x | --xslt] <x>                : Set reporter style (XSLT)
 [-r | --reporter] <reporterName> : Set reporter
-[--list-reporters]               : List all reporters
 [-c | --config] <configPath>     : Set config file
 [--list-checks]                  : List all checks
+[-report]                        : Generate build time report
 [-s | --source] <sourcePath>     : Set sources to process
 ```
+###Compile Time Report
+
+Now you can generate compile time report in console by passing `-report` option.
+
+`haxelib run checkstyle -s src -p report.xml -report`
+
+Note that `-report` option only works with `xml` report.
 
 ###Hudson and Bamboo Integration
 
 You can generate the report in checkstyle XML format that can be integrated with Hudson and Bamboo easily.
 
 You can also set XSLT style for the XML generated. See the sample below.
 
-`haxelib run checkstyle -s src -c config.json -r xml -p report.xml -x report.xsl`
+`haxelib run checkstyle -s src -c config.json -p report.xml -x report.xsl`
 
 Sample Hudson Checkstyle Trend Chart:
 

build.hxml

@@ -1,17 +1,4 @@
 -cp resources
--cmd echo "*** Default check - no config ***"
--cmd neko run -s checkstyle -r xml -p resources/static-analysis.xml
--x StaticAnalysis
-
---next
--cp resources
--cmd echo "*** Default check - with config ***"
--cmd neko run -s checkstyle -c ./resources/config.json -r xml -p resources/static-analysis.xml
--x StaticAnalysis
-
--cmd rm StaticAnalysis.n
---next
-
 -cp checkstyle
 -lib hxparse:3.0.0
 -lib haxeparser
@@ -21,6 +8,12 @@
 
 --each
 
+-main checkstyle.Main
+-D checkstyle
+-neko run.n
+-cmd neko run -s checkstyle -p resources/static-analysis.xml -report
+
+--next
 -main checkstyle.Main
 -neko run.n
 

checkstyle/ComplexTypeUtils.hx

@@ -9,8 +9,7 @@ import haxeparser.Data.EnumConstructor;
 import haxe.macro.Expr;
 
 class ComplexTypeUtils {
-
-	@SuppressWarnings('checkstyle:Anonymous')
+	
 	public static function walkFile(file:{ pack:Array<String>, decls:Array<TypeDecl> }, cb:ComplexTypeCallback) {
 		for (decl in file.decls) walkTypeDecl(decl, cb);
 	}
@@ -130,8 +129,7 @@ class ComplexTypeUtils {
 				if (e != null) walkExpr(e, cb);
 		}
 	}
-
-	@SuppressWarnings('checkstyle:Anonymous')
+	
 	public static function walkComplexType(t:ComplexType, name:String, pos:Position, cb:ComplexTypeCallback) {
 		cb(t, name, pos);
 		switch(t){

checkstyle/ExprUtils.hx

@@ -9,8 +9,7 @@ import haxeparser.Data.EnumConstructor;
 import haxe.macro.Expr;
 
 class ExprUtils {
-
-	@SuppressWarnings('checkstyle:Anonymous')
+	
 	public static function walkFile(file:{ pack: Array<String>, decls: Array<TypeDecl> }, cb:Expr -> Void) {
 		for (decl in file.decls) walkTypeDecl(decl, cb);
 	}
@@ -130,8 +129,7 @@ class ExprUtils {
 				if (e != null) walkExpr(e, cb);
 		}
 	}
-
-	@SuppressWarnings('checkstyle:Anonymous')
+	
 	public static function walkComplexType(t:ComplexType, cb:Expr -> Void) {
 		switch(t){
 			case TPath(p): walkTypePath(p, cb);

checkstyle/Main.hx

@@ -29,6 +29,11 @@ class Main {
 
 			var main = new Main();
 			main.run(args);
+			
+			if (REPORT && REPORT_TYPE == "xml") {
+				var reporter = new Report();
+				reporter.generateReport(PATH);
+			}
 		}
 		catch(e:Dynamic) {
 			trace(e);
@@ -41,7 +46,8 @@ class Main {
 	var info:ChecksInfo;
 	var checker:Checker;
 
-	static var REPORT_TYPE:String = "default";
+	static var REPORT:Bool = false;
+	static var REPORT_TYPE:String = "xml";
 	static var PATH:String = "check-style-report.xml";
 	static var STYLE:String = "";
 
@@ -60,9 +66,9 @@ class Main {
 		@doc("Set reporter path") ["-p", "--path"] => function(loc:String) PATH = loc,
 		@doc("Set reporter style (XSLT)") ["-x", "--xslt"] => function(x:String) STYLE = x,
 		@doc("Set reporter") ["-r", "--reporter"] => function(reporterName:String) REPORT_TYPE = reporterName,
-		@doc("List all reporters") ["--list-reporters"] => function() listReporters(),
 		@doc("Set config file") ["-c", "--config"] => function(cpath:String) configPath = cpath,
 		@doc("List all checks") ["--list-checks"] => function() listChecks(),
+		@doc("Generate build time report") ["-report"] => function() REPORT = true,
 		@doc("Set sources to process") ["-s", "--source"] => function(sourcePath:String) traverse(sourcePath,files),
 		_ => function(arg:String) throw "Unknown command: " + arg
 		]);
@@ -110,12 +116,6 @@ class Main {
 		for (check in info.checks()) Sys.println('${check.name}: ${check.description}');
 	}
 
-	static function listReporters() {
-		Sys.println("default - Default reporter");
-		Sys.println("xml - Checkstyle-like XML reporter");
-		Sys.exit(0);
-	}
-
 	static function createReporter():IReporter {
 		return switch(REPORT_TYPE) {
 			case "xml": new XMLReporter(PATH, STYLE);

checkstyle/Report.hx

@@ -0,0 +1,59 @@
+package checkstyle;
+
+import sys.io.File;
+#if checkstyle
+import sys.io.FileOutput;
+#end
+
+class Report {
+
+	var staticAnalysisXML:Xml;
+
+	#if checkstyle
+	var reportFile:FileOutput;
+	#end
+
+	public function new() {}
+
+	@SuppressWarnings('checkstyle:LineLength')
+	public function generateReport(path:String) {
+		staticAnalysisXML = Xml.parse(File.getContent(path));
+
+		#if checkstyle
+		reportFile = File.write("CHECKS.md", false);
+		reportFile.writeString("###Report of default checks on CheckStyle library itself\n\n");
+		#end
+		
+		var errors = 0;
+		var warnings = 0;
+		var infos = 0;
+		var total = 0;
+		var fileName;
+		for (node in staticAnalysisXML.firstElement().elementsNamed("file")) {
+			var fileNode:Xml = node;
+			fileName = fileNode.get("name").split("/").join(".");
+			if (fileNode.elementsNamed("error").hasNext()) Sys.println("\033[1mCLASS: " + fileName + "\033[0m");
+			for (error in fileNode.elementsNamed("error")) {
+				var errorNode:Xml = error;
+				switch (errorNode.get("severity")) {
+					case "error":
+						errors++;
+						Sys.println("\t\033[91mError: LINE - " + errorNode.get("line") + ": " + StringTools.htmlUnescape(errorNode.get("message")) + "\033[0m");
+						#if checkstyle reportFile.writeString("`Error: LINE - " + errorNode.get("line") + ": " + StringTools.htmlUnescape(errorNode.get("message")) + "`\n\n"); #end
+					case "warning":
+						warnings++;
+						Sys.println("\t\033[95mWarning: LINE - " + errorNode.get("line") + ": " + StringTools.htmlUnescape(errorNode.get("message")) + "\033[0m");
+						#if checkstyle reportFile.writeString("`Warning: LINE - " + errorNode.get("line") + ": " + StringTools.htmlUnescape(errorNode.get("message")) + "`\n\n"); #end
+					case "info":
+						infos++;
+						Sys.println("\t\033[94mInfo: LINE - " + errorNode.get("line") + ": " + StringTools.htmlUnescape(errorNode.get("message")) + "\033[0m");
+						#if checkstyle reportFile.writeString("`Info: LINE - " + errorNode.get("line") + ": " + StringTools.htmlUnescape(errorNode.get("message")) + "`\n\n"); #end
+				}
+				total++;
+			}
+		}
+
+		Sys.println("\033[1m\nTotal Issues: " + total + " (\033[0m\033[91mErrors: " + errors + "\033[0m, \033[95mWarnings: " + warnings + "\033[0m, \033[94mInfos: " + infos + ")\n" + "\033[0m");
+		#if checkstyle reportFile.writeString("`Total Issues: " + total + " (Errors: " + errors + " Warnings: " + warnings + " Infos: " + infos + ")`"); #end
+	}
+}

checkstyle/checks/AnonymousCheck.hx

@@ -29,18 +29,26 @@ class AnonymousCheck extends Check {
 			}
 		}
 	}
-
-	@SuppressWarnings('checkstyle:Anonymous')
+	
 	function checkField(f:Field) {
-		if (Std.string(f.kind).indexOf("TAnonymous") > -1) error(f.name, f.pos);
+		switch(f.kind) {
+			case FVar(TAnonymous(fields), val):
+				error(f.name, f.pos);
+			default:
+		}
 	}
-
-	@SuppressWarnings('checkstyle:Anonymous')
+	
 	function checkLocalVars() {
 		ExprUtils.walkFile(checker.ast, function(e) {
 			switch(e.expr){
 				case EVars(vars):
-					for (v in vars) if (Std.string(v).indexOf("TAnonymous") > -1) error(v.name, e.pos);
+					for (v in vars) {
+						switch(v.type) {
+							case TAnonymous(fields):
+								error(v.name, e.pos);
+							default:
+						}
+					}
 				default:
 			}
 		});

checkstyle/checks/Check.hx

@@ -79,7 +79,7 @@ class Check {
 		return isCharPosSuppressed(pos.min);
 	}
 
-	@SuppressWarnings('checkstyle:Anonymous')
+	@SuppressWarnings('checkstyle:CyclomaticComplexity')
 	function isCharPosSuppressed(pos:Int):Bool {
 		for (td in checker.ast.decls) {
 			switch (td.decl){

checkstyle/checks/CyclomaticComplexityCheck.hx

@@ -22,8 +22,7 @@ class CyclomaticComplexityCheck extends Check {
 			{ severity : "ERROR", complexity : 25 }
 		];
 	}
-
-	@SuppressWarnings('checkstyle:Return')
+	
 	override function actualRun() {
 		checker.ast.decls.map(function(type:TypeDecl):Null<Definition<ClassFlag, Array<Field>>> {
 			return switch (type.decl) {
@@ -34,8 +33,7 @@ class CyclomaticComplexityCheck extends Check {
 			return definition != null;
 		}).iter(checkFields);
 	}
-
-	@SuppressWarnings('checkstyle:Return')
+	
 	function checkFields(definition:Definition<ClassFlag, Array<Field>>) {
 		definition.data.map(function(field:Field):Null<Target> {
 			return switch (field.kind) {
@@ -49,8 +47,7 @@ class CyclomaticComplexityCheck extends Check {
 			return f != null;
 		}).iter(calculateComplexity);
 	}
-
-	@SuppressWarnings('checkstyle:Return')
+	
 	function calculateComplexity(method:Target) {
 		var complexity:Int = 1 + evaluateExpr(method.expr);