fixed suffixes for negative numeric literals

HaxeCheckstyle · Sep 14, 2022 · a1be77a · a1be77a
1 parent a36d74c
commit a1be77a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## dev branch / next version (1.x.x)
 
+## version 1.2.3 (2022-09-14)
+
+- Fixed suffixes for negative numeric literals
+
 ## version 1.2.2 (2022-09-14)
 
 - Updated haxeparser to support latest Haxe nightly syntax

diff --git a/haxelib.json b/haxelib.json
@@ -7,8 +7,8 @@
     "contributors": [
         "AlexHaxe"
     ],
-    "releasenote": "updated haxeparser to support latest Haxe nightly syntax - see CHANGELOG for details",
-    "version": "1.2.2",
+    "releasenote": "fixed suffixes for negative numeric literals - see CHANGELOG for details",
+    "version": "1.2.3",
     "url": "https://github.com/HaxeCheckstyle/tokentree",
     "dependencies": {}
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tokentree",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "description": "TokenTree library used by haxe-checkstyle, haxe-formatter and haxe-languageserver",
     "repository": {
         "type": "git",

diff --git a/src/tokentree/TokenStream.hx b/src/tokentree/TokenStream.hx
@@ -340,12 +340,21 @@ class TokenStream {
 				return new TokenTree(tok.tok, tok.space, tok.pos, tok.index);
 		}
 		switch (token()) {
+			#if (haxe >= version("4.3.0-rc.1"))
+			case Const(CInt(v, s)):
+				var const:TokenTree = consumeConst();
+				return new TokenTree(Const(CInt('-$v', s)), const.space, {file: tok.pos.file, min: tok.pos.min, max: const.pos.max}, tok.index);
+			case Const(CFloat(v, s)):
+				var const:TokenTree = consumeConst();
+				return new TokenTree(Const(CFloat('-$v', s)), const.space, {file: tok.pos.file, min: tok.pos.min, max: const.pos.max}, tok.index);
+			#else
 			case Const(CInt(n)):
 				var const:TokenTree = consumeConst();
 				return new TokenTree(Const(CInt('-$n')), const.space, {file: tok.pos.file, min: tok.pos.min, max: const.pos.max}, tok.index);
 			case Const(CFloat(n)):
 				var const:TokenTree = consumeConst();
 				return new TokenTree(Const(CFloat('-$n')), const.space, {file: tok.pos.file, min: tok.pos.min, max: const.pos.max}, tok.index);
+			#end
 			default:
 				throw NO_MORE_TOKENS;
 		}