added support for binary literals

updated dependencies
vshaxe · Apr 19, 2024 · ddad8b4 · ddad8b4
1 parent b3cb0d3
commit ddad8b4
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 18 deletions.
diff --git a/.haxerc b/.haxerc
@@ -1,4 +1,4 @@
 {
-  "version": "4.2.0",
+  "version": "4.3.4",
   "resolveLibs": "scoped"
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,7 +3,7 @@
 		"editor.formatOnSave": true,
 		"editor.formatOnPaste": true,
 		"editor.codeActionsOnSave": {
-			"source.sortImports": true
+			"source.sortImports": "explicit"
 		}
 	}
 }
diff --git a/baselines/BasicTypes.hx.baseline.txt b/baselines/BasicTypes.hx.baseline.txt
@@ -35,6 +35,11 @@ original file
 
 0xFFf_f50i32;
 
+0b1000;
+0b11111111111111111111111111111111u32;
+0b1111111111111111111111111111111111111111111111111111111111111111i64;
+0b11_0i32;
+
 "hello";
 "hello \"world\" !";
 'hello "world" !';
@@ -292,6 +297,35 @@ null;
 >
  ^
  source.hx
+>0b1000;
+ ^^^^^^
+ source.hx constant.numeric.bin.hx
+       ^
+       source.hx punctuation.terminator.hx
+>0b11111111111111111111111111111111u32;
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ source.hx constant.numeric.bin.hx
+                                   ^^^
+                                   source.hx constant.numeric.bin.hx constant.numeric.suffix.hx
+                                      ^
+                                      source.hx punctuation.terminator.hx
+>0b1111111111111111111111111111111111111111111111111111111111111111i64;
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ source.hx constant.numeric.bin.hx
+                                                                   ^^^
+                                                                   source.hx constant.numeric.bin.hx constant.numeric.suffix.hx
+                                                                      ^
+                                                                      source.hx punctuation.terminator.hx
+>0b11_0i32;
+ ^^^^^^
+ source.hx constant.numeric.bin.hx
+       ^^^
+       source.hx constant.numeric.bin.hx constant.numeric.suffix.hx
+          ^
+          source.hx punctuation.terminator.hx
+>
+ ^
+ source.hx
 >"hello";
  ^
  source.hx string.quoted.double.hx punctuation.definition.string.begin.hx

diff --git a/cases/BasicTypes.hx b/cases/BasicTypes.hx
@@ -33,6 +33,11 @@
 
 0xFFf_f50i32;
 
+0b1000;
+0b11111111111111111111111111111111u32;
+0b1111111111111111111111111111111111111111111111111111111111111111i64;
+0b11_0i32;
+
 "hello";
 "hello \"world\" !";
 'hello "world" !';

diff --git a/haxe.YAML-tmLanguage b/haxe.YAML-tmLanguage
@@ -424,6 +424,10 @@ repository:
       captures:
         '0': {name: constant.numeric.hex.hx}
         '1': {name: constant.numeric.suffix.hx}
+    - match: \b(?:0[bB][01][_01]*([iu][0-9][0-9_]*)?)\b
+      captures:
+        '0': {name: constant.numeric.bin.hx}
+        '1': {name: constant.numeric.suffix.hx}
     - match: |-
         (?x)
         (?<!\$)(?:

diff --git a/haxe.tmLanguage b/haxe.tmLanguage
diff --git a/haxe_libraries/hxnodejs.hxml b/haxe_libraries/hxnodejs.hxml
@@ -1,6 +1,7 @@
-# @install: lix --silent download "haxelib:/hxnodejs#12.0.0" into hxnodejs/12.0.0/haxelib
--cp ${HAXE_LIBCACHE}/hxnodejs/12.0.0/haxelib/src
--D hxnodejs=12.0.0
+# @install: lix --silent download "haxelib:/hxnodejs#12.2.0" into hxnodejs/12.2.0/haxelib
+-cp ${HAXE_LIBCACHE}/hxnodejs/12.2.0/haxelib/src
+-D hxnodejs=12.1.0
 --macro allowPackage('sys')
 # should behave like other target defines and not be defined in macro context
 --macro define('nodejs')
+--macro _internal.SuppressDeprecated.run()
diff --git a/haxe_libraries/tink_core.hxml b/haxe_libraries/tink_core.hxml
@@ -1,3 +1,3 @@
-# @install: lix --silent download "haxelib:/tink_core#1.26.0" into tink_core/1.26.0/haxelib
--cp ${HAXE_LIBCACHE}/tink_core/1.26.0/haxelib/src
--D tink_core=1.26.0
+# @install: lix --silent download "haxelib:/tink_core#2.1.1" into tink_core/2.1.1/haxelib
+-cp ${HAXE_LIBCACHE}/tink_core/2.1.1/haxelib/src
+-D tink_core=2.1.1