updated haxeparser lib with latest Haxe nightly syntax

haxe_libraries/haxeparser.hxml

@@ -1,4 +1,4 @@
-# @install: lix --silent download "gh://github.com/HaxeCheckstyle/haxeparser#1ea2a8915956ac3af6f1a11c67e0e56261b75929" into haxeparser/3.3.0/github/1ea2a8915956ac3af6f1a11c67e0e56261b75929
+# @install: lix --silent download "gh://github.com/HaxeCheckstyle/haxeparser#f0a7f07101c14dc32b0964dd52af8dcaa322e178" into haxeparser/4.3.0-rc.1/github/f0a7f07101c14dc32b0964dd52af8dcaa322e178
 -lib hxparse
--cp ${HAXE_LIBCACHE}/haxeparser/3.3.0/github/1ea2a8915956ac3af6f1a11c67e0e56261b75929/src
--D haxeparser=3.3.0
+-cp ${HAXE_LIBCACHE}/haxeparser/4.3.0-rc.1/github/f0a7f07101c14dc32b0964dd52af8dcaa322e178/src
+-D haxeparser=4.3.0-rc.1

haxelib.json

@@ -7,8 +7,8 @@
     "contributors": [
         "AlexHaxe"
     ],
-    "releasenote": "moved inline markup code to haxeparser - see CHANGELOG for details",
-    "version": "1.2.1",
+    "releasenote": "updated haxeparser to support latest Haxe nightly syntax - see CHANGELOG for details",
+    "version": "1.2.2",
     "url": "https://github.com/HaxeCheckstyle/tokentree",
     "dependencies": {}
 }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "tokentree",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "description": "TokenTree library used by haxe-checkstyle, haxe-formatter and haxe-languageserver",
     "repository": {
         "type": "git",

src/tokentree/ToTokenTreeDef.hx

@@ -17,12 +17,12 @@ abstract ToTokenTreeDef(TokenTreeDef) {
 		return new ToTokenTreeDef(switch (tok) {
 			case Kwd(k): Kwd(k);
 			case Const(c): switch (c) {
-					#if (haxe < version("4.3.0-rc.1"))
-					case CInt(v): Const(CInt(v));
-					case CFloat(f): Const(CFloat(f));
-					#else
+					#if (haxe >= version("4.3.0-rc.1"))
 					case CInt(v, s): Const(CInt(v, s));
 					case CFloat(f, s): Const(CFloat(f, s));
+					#else
+					case CInt(v): Const(CInt(v));
+					case CFloat(f): Const(CFloat(f));
 					#end
 					case CString(s, kind): Const(CString(s, kind));
 					case CIdent(s): Const(CIdent(s));
@@ -39,6 +39,7 @@ abstract ToTokenTreeDef(TokenTreeDef) {
 			case Semicolon: Semicolon;
 			case Dot: Dot;
 			case DblDot: DblDot;
+			case QuestionDot: QuestionDot;
 			case Arrow: Arrow;
 			case Comma: Comma;
 			case BkOpen: BkOpen;
@@ -50,6 +51,7 @@ abstract ToTokenTreeDef(TokenTreeDef) {
 			case Question: Question;
 			case At: At;
 			case Eof: Eof;
+			case Spread: Spread;
 		});
 	}
 }

src/tokentree/TokenTreeDef.hx

@@ -17,6 +17,7 @@ enum TokenTreeDef {
 	Semicolon;
 	Dot;
 	DblDot;
+	QuestionDot;
 	Arrow;
 	Comma;
 	BkOpen;
@@ -28,4 +29,5 @@ enum TokenTreeDef {
 	Question;
 	At;
 	Eof;
+	Spread;
 }

src/tokentree/TokenTreeDefPrinter.hx

@@ -5,7 +5,13 @@ class TokenTreeDefPrinter {
 		return switch (def) {
 			case Root: "<root>";
 			case Kwd(k): k.getName().substr(3).toLowerCase();
-			case Const(CInt(s) | CFloat(s) | CIdent(s)): s;
+			#if (haxe >= version("4.3.0-rc.1"))
+			case Const(CInt(v, null) | CFloat(v, null)): v;
+			case Const(CInt(v, s) | CFloat(v, s)): '$v$s';
+			#else
+			case Const(CInt(s) | CFloat(s)): s;
+			#end
+			case Const(CIdent(s)): s;
 			case Const(CString(s)): '"$s"';
 			case Const(CRegexp(r, opt)): '~/$r/$opt';
 			case Const(CMarkup(s)): '$s';
@@ -19,6 +25,7 @@ class TokenTreeDefPrinter {
 			case Semicolon: ";";
 			case Dot: ".";
 			case DblDot: ":";
+			case QuestionDot: "?.";
 			case Arrow: "->";
 			case Comma: ",";
 			case BkOpen: "[";
@@ -30,6 +37,7 @@ class TokenTreeDefPrinter {
 			case Question: "?";
 			case At: "@";
 			case Eof: "<eof>";
+			case Spread: "...";
 		}
 	}
 }

src/tokentree/utils/TokenTreeCheckUtils.hx

@@ -22,7 +22,7 @@ class TokenTreeCheckUtils {
 				case Kwd(KwdExtern):
 				case Const(CIdent(_)):
 				case Dot:
-				case Binop(OpIn):
+				case Kwd(KwdIn) | Binop(OpIn):
 				case Kwd(KwdImport):
 					return true;
 				case Kwd(KwdUsing):
@@ -67,10 +67,12 @@ class TokenTreeCheckUtils {
 			}
 		}
 		switch (prev.tok) {
-			case Binop(OpIn):
+			case Kwd(KwdIn) | Binop(OpIn):
 				return true;
 			case Binop(_):
 				return true;
+			case Spread:
+				return true;
 			case BkOpen:
 				return true;
 			case BkClose:

src/tokentree/walk/WalkFor.hx

@@ -77,7 +77,7 @@ class WalkFor {
 		}
 		var inTok:Null<TokenTree> = null;
 		switch (stream.token()) {
-			case Binop(OpIn):
+			case Kwd(KwdIn) | Binop(OpIn):
 				inTok = stream.consumeToken();
 				identifier.addChild(inTok);
 				WalkComment.walkComment(stream, inTok);

src/tokentree/walk/WalkStatement.hx

@@ -74,7 +74,7 @@ class WalkStatement {
 					}
 					return;
 				}
-			case IntInterval(_):
+			case IntInterval(_) | Spread:
 				wantMore = true;
 			case Const(CIdent("final")) | Kwd(_):
 				if (walkKeyword(stream, parent)) wantMore = true;
@@ -107,7 +107,7 @@ class WalkStatement {
 				WalkSharp.walkSharp(stream, parent, walkStatement);
 				walkStatementContinueAfterSharp(stream, parent);
 				return;
-			case Dot:
+			case Dot | QuestionDot:
 				wantMore = true;
 			case DblDot:
 				switch (parent.tok) {
@@ -158,7 +158,7 @@ class WalkStatement {
 	public static function walkStatementContinue(stream:TokenStream, parent:TokenTree) {
 		if (!stream.hasMore()) return;
 		switch (stream.token()) {
-			case Dot:
+			case Dot | QuestionDot:
 				walkStatementWithoutSemicolon(stream, parent);
 			case DblDot:
 				walkDblDot(stream, parent);
@@ -206,6 +206,8 @@ class WalkStatement {
 						walkStatementContinue(stream, parent);
 					default:
 				}
+			case Spread:
+				walkStatementWithoutSemicolon(stream, parent);
 			default:
 		}
 	}