fixed parsing single false, true or null

HaxeCheckstyle · Jul 30, 2024 · 3738d89 · 3738d89
1 parent c69d45e
commit 3738d89
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 8 deletions.
diff --git a/.github/workflows/tokentree.yml b/.github/workflows/tokentree.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        haxe-version: ['4.3.4', 'nightly']
+        haxe-version: ['4.3.5', 'nightly']
     steps:
     - uses: actions/checkout@v4
     - name: Use Node.js 18

diff --git a/.haxerc b/.haxerc
@@ -1,4 +1,4 @@
 {
-  "version": "4.3.4",
+  "version": "4.3.5",
   "resolveLibs": "scoped"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## dev branch / next version (1.x.x)
 
+## version 1.2.12 (2024-07-30)
+
+- Fixed parsing a single `false`, `true` or `null`
+
 ## version 1.2.11 (2024-02-10)
 
 - Added getBkOpenType utils function

diff --git a/haxelib.json b/haxelib.json
@@ -7,8 +7,8 @@
     "contributors": [
         "AlexHaxe"
     ],
-    "releasenote": "fixed empty switch cases with comments; added getBkOpenType utils function - see CHANGELOG for details",
-    "version": "1.2.11",
+    "releasenote": "fixed parsing a single false, true or null - see CHANGELOG for details",
+    "version": "1.2.12",
     "url": "https://github.com/HaxeCheckstyle/tokentree",
     "dependencies": {}
 }
diff --git a/makeReleaseZip.sh b/makeReleaseZip.sh
@@ -2,7 +2,7 @@
 
 npm install
 npx lix download
-npx lix use haxe 4.3.3
+npx lix use haxe 4.3.5
 
 haxe test.hxml
 

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.11",
+    "version": "1.2.12",
     "description": "TokenTree library used by haxe-checkstyle, haxe-formatter and haxe-languageserver",
     "repository": {
         "type": "git",

diff --git a/src/tokentree/walk/WalkStatement.hx b/src/tokentree/walk/WalkStatement.hx
@@ -267,6 +267,9 @@ class WalkStatement {
 			case Kwd(KwdNull), Kwd(KwdTrue), Kwd(KwdFalse):
 				var newChild:TokenTree = stream.consumeToken();
 				parent.addChild(newChild);
+				if (!stream.hasMore()) {
+					return false;
+				}
 				switch (stream.token()) {
 					case Binop(OpBoolAnd), Binop(OpBoolOr): walkOpBool(stream, newChild);
 					case Question: WalkQuestion.walkQuestion(stream, newChild);

diff --git a/test/tokentree/TokenTreeBuilderParsingTest.hx b/test/tokentree/TokenTreeBuilderParsingTest.hx
@@ -143,6 +143,9 @@ class TokenTreeBuilderParsingTest implements ITest {
 		assertCodeParses(CALL_WITHOUT_SEMICOLON);
 		assertCodeParses(ARRAY_ACCESSS_WITHOUT_SEMICOLON);
 		assertCodeParses(UNICODE_REGEX);
+		assertCodeParses(TRUE);
+		assertCodeParses(FALSE);
+		assertCodeParses(NULL);
 	}
 
 	public function assertCodeParses(code:String, ?pos:PosInfos) {
@@ -1896,4 +1899,10 @@ import #if haxe4 js.lib.Promise #else js.Promise #end as JsPromise;
 	var UNICODE_REGEX = "
 		static final ctrlCharacters = ~/[\\u0000-\\u001F\\u007F-\\u009F\\u2000-\\u200D\\uFEFF]/g;
 	";
+
+	var TRUE = "true";
+
+	var FALSE = "false";
+
+	var NULL = "null";
 }