fixed EFunction changes in Haxe 4 (#474)

Author: AlexHaxe

.travis.yml

@@ -36,7 +36,7 @@ matrix:
       install:
         - haxelib git tokentree https://github.com/HaxeCheckstyle/tokentree master src
         - haxelib git hxparse https://github.com/simn/hxparse
-        - haxelib git haxeparser https://github.com/AlexHaxe/haxeparser add_final
+        - haxelib git haxeparser https://github.com/simn/haxeparser
         - haxelib git mcover https://github.com/massiveinteractive/mcover master src
         - haxelib git munit https://github.com/massiveinteractive/MassiveUnit master src
         - haxelib git hxnodejs https://github.com/HaxeFoundation/hxnodejs.git master

CHANGELOG.md

@@ -24,8 +24,9 @@
 - Fixed Java regexp issue in IndentationCheck ([#468](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/468))
 - Fixed empty lines between types with conditionals ([#469](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/469))
 - Fixed empty lines before comments with conditionals ([#472](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/472))
+- Fixed EFunction changes in Haxe 4rc4
 - Changed return block indentation [#453](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/453)
-- Changed to use formatter [#461](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/461)
+- Changed applied formatter [#461](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/461)
 - Refactored coverage reporting [#462](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/462)
 
 ## version 2.4.2 (2018-07-01)

resources/checkstyle-schema.json

@@ -354,18 +354,18 @@
             "type": "object"
         },
         "DocCommentStyleCheck": {
-            "description": "Checks code documentation style (/**…**/ vs /*…*/)",
+            "description": "Checks code documentation style (/**...**/ vs /*...*/)",
             "additionalProperties": false,
             "properties": {
                 "type": {
-                    "description": "Checks code documentation style (/**…**/ vs /*…*/)",
+                    "description": "Checks code documentation style (/**...**/ vs /*...*/)",
                     "type": "string",
                     "enum": [
                         "DocCommentStyle"
                     ]
                 },
                 "props": {
-                    "description": "Checks code documentation style (/**…**/ vs /*…*/)",
+                    "description": "Checks code documentation style (/**...**/ vs /*...*/)",
                     "additionalProperties": false,
                     "properties": {
                         "lineStyle": {

src/checkstyle/checks/comments/DocCommentStyleCheck.hx

@@ -4,7 +4,7 @@ package checkstyle.checks.comments;
 	Checks code documentation style (/** vs /*)
 **/
 @name("DocCommentStyle")
-@desc("Checks code documentation style (/**…**/ vs /*…*/)")
+@desc("Checks code documentation style (/**...**/ vs /*...*/)")
 class DocCommentStyleCheck extends Check {
 	/**
 		Defines how doc comments should start / end:

src/checkstyle/checks/size/MethodLengthCheck.hx

@@ -62,8 +62,21 @@ class MethodLengthCheck extends Check {
 		var lmax = checker.getLinePos(f.pos.max).line;
 		var fname = "(anonymous)";
 		switch (f.expr) {
+			#if (haxe_ver < 4.0)
 			case EFunction(name, ff):
 				if (name != null) fname = name;
+			#else
+			case EFunction(kind, ff):
+				switch (kind) {
+					case null:
+					case FAnonymous:
+						var fname = "(anonymous)";
+					case FNamed(name, inlined):
+						fname = name;
+					case FArrow:
+						var fname = "(anonymous arrow)";
+				}
+			#end
 			default:
 				throw "EFunction only";
 		}

src/checkstyle/checks/type/ReturnCheck.hx

@@ -64,9 +64,21 @@ class ReturnCheck extends Check {
 	function checkInlineFunctions() {
 		checker.ast.walkFile(function(e) {
 			switch (e.expr) {
+				#if (haxe_ver < 4.0)
 				case EFunction(fname, f):
 					var funNoReturn:Bool = (f.ret == null);
 					walkExpr(f.expr, funNoReturn, fname, e.pos);
+				#else
+				case EFunction(kind, f):
+					var name:Null<String> = switch (kind) {
+						case null: null;
+						case FAnonymous: null;
+						case FNamed(name, inlined): name;
+						case FArrow: null;
+					}
+					var funNoReturn:Bool = (f.ret == null);
+					walkExpr(f.expr, funNoReturn, name, e.pos);
+				#end
 				default:
 			}
 		});

src/checkstyle/utils/ComplexTypeUtils.hx

@@ -183,8 +183,19 @@ class ComplexTypeUtils {
 				walkExpr(e, cb);
 			case EVars(vars):
 				for (v in vars) walkVar(v, e.pos, cb);
+			#if (haxe_ver < 4.0)
 			case EFunction(name, f):
 				walkFunction(f, name, e.pos, cb);
+			#else
+			case EFunction(kind, f):
+				var name:Null<String> = switch (kind) {
+					case null: null;
+					case FAnonymous: null;
+					case FNamed(name, inlined): name;
+					case FArrow: null;
+				}
+				walkFunction(f, name, e.pos, cb);
+			#end
 			case EBlock(exprs):
 				for (e in exprs) walkExpr(e, cb);
 			case EFor(it, expr):