[ci] Switch to patched setup-haxe version (#1286)

tobil4sk · web-flow · commit 26a23b42a552 · 2026-01-06T18:59:14.000+01:00
* [ci] Hardcode latest haxe version for setup-haxe

This avoids the invalid url error caused by relative redirect of the
"latest" file.

* Apply Aidan's patch for encoding errors

* Avoid warnings from string encoding code

* [ci] Switch to patched setup-haxe version

* Omit name for unusued null arguments
diff --git a/.github/workflows/setup/action.yml b/.github/workflows/setup/action.yml
@@ -7,7 +7,7 @@ runs:
   using: composite
   steps:
     - name: install haxe
-      uses: Aidan63/setup-haxe@3d3101bcd0a2001699fc8295f4d9eddd0724d3e9
+      uses: krdlab/setup-haxe@hotfix/download-failure
       with:
         haxe-version: ${{ inputs.haxe }}
 
@@ -34,4 +34,4 @@ runs:
     - name: build hxcpp
       working-directory: tools/hxcpp
       shell: pwsh
-      run: haxe compile.hxml
+      run: haxe compile.hxml
diff --git a/include/cpp/encoding/Utf16.hpp b/include/cpp/encoding/Utf16.hpp
@@ -8,17 +8,20 @@ namespace cpp
         {
             static bool isEncoded(const String& string);
 
+            static int getByteCount(const null&);
             static int getByteCount(const char32_t& codepoint);
             static int64_t getByteCount(const String& string);
 
+            static int getCharCount(const null&);
             static int getCharCount(const char32_t& codepoint);
             static int64_t getCharCount(const String& string);
 
+            static int encode(const null&, const cpp::marshal::View<uint8_t>& buffer);
             static int encode(const char32_t& codepoint, const cpp::marshal::View<uint8_t>& buffer);
             static int64_t encode(const String& string, const cpp::marshal::View<uint8_t>& buffer);
 
             static char32_t codepoint(const cpp::marshal::View<uint8_t>& buffer);
             static String decode(const cpp::marshal::View<uint8_t>& buffer);
         };
 	}
-}
+}
diff --git a/include/cpp/encoding/Utf8.hpp b/include/cpp/encoding/Utf8.hpp
@@ -6,17 +6,20 @@ namespace cpp
 	{
         struct Utf8 final
         {
+            static int getByteCount(const null&);
             static int getByteCount(const char32_t& codepoint);
             static int64_t getByteCount(const String& string);
 
+            static int getCharCount(const null&);
             static int getCharCount(const char32_t& codepoint);
             static int64_t getCharCount(const String& string);
 
+            static int encode(const null&, const cpp::marshal::View<uint8_t>& buffer);
             static int encode(const char32_t& codepoint, const cpp::marshal::View<uint8_t>& buffer);
             static int64_t encode(const String& string, const cpp::marshal::View<uint8_t>& buffer);
 
             static char32_t codepoint(const cpp::marshal::View<uint8_t>& buffer);
             static String decode(const cpp::marshal::View<uint8_t>& buffer);
         };
 	}
-}
+}
diff --git a/include/null.h b/include/null.h
@@ -91,6 +91,7 @@ class null
      operator unsigned char () { return 0; }
      operator signed char () { return 0; }
      operator char16_t () { return 0; }
+     operator char32_t () { return 0; }
      operator short () { return 0; }
      operator unsigned short () { return 0; }
      operator cpp::UInt64 () { return 0; }
@@ -145,7 +146,8 @@ class null
 	  HX_NULL_COMPARE_OPS(unsigned short)
 	  HX_NULL_COMPARE_OPS(signed char)
 	  HX_NULL_COMPARE_OPS(unsigned char)
-      HX_NULL_COMPARE_OPS(char16_t)
+	  HX_NULL_COMPARE_OPS(char16_t)
+	  HX_NULL_COMPARE_OPS(char32_t)
 	  HX_NULL_COMPARE_OPS(cpp::Int64)
 	  HX_NULL_COMPARE_OPS(cpp::UInt64)
 	  HX_NULL_COMPARE_MOST_OPS(String)
@@ -215,6 +217,7 @@ HX_COMPARE_NULL_OPS(unsigned short)
 HX_COMPARE_NULL_OPS(signed char)
 HX_COMPARE_NULL_OPS(unsigned char)
 HX_COMPARE_NULL_OPS(char16_t)
+HX_COMPARE_NULL_OPS(char32_t)
 HX_COMPARE_NULL_OPS(cpp::UInt64)
 HX_COMPARE_NULL_OPS(cpp::Int64)
 
diff --git a/src/Dynamic.cpp b/src/Dynamic.cpp
@@ -502,6 +502,7 @@ DYN_OP_ADD(unsigned short)
 DYN_OP_ADD(signed char)
 DYN_OP_ADD(unsigned char)
 DYN_OP_ADD(char16_t)
+DYN_OP_ADD(char32_t)
 DYN_OP_ADD(cpp::Int64)
 DYN_OP_ADD(cpp::UInt64)
 
diff --git a/src/cpp/encoding/Utf16.cpp b/src/cpp/encoding/Utf16.cpp
@@ -68,6 +68,12 @@ bool cpp::encoding::Utf16::isEncoded(const String& string)
 	return string.isUTF16Encoded();
 }
 
+int cpp::encoding::Utf16::getByteCount(const null&)
+{
+	hx::NullReference("String", false);
+	return 0;
+}
+
 int cpp::encoding::Utf16::getByteCount(const char32_t& codepoint)
 {
 	return codepoint <= 0xFFFF ? 2 : 4;
@@ -96,6 +102,12 @@ int64_t cpp::encoding::Utf16::getByteCount(const String& string)
 	}
 }
 
+int cpp::encoding::Utf16::getCharCount(const null&)
+{
+	hx::NullReference("String", false);
+	return 0;
+}
+
 int cpp::encoding::Utf16::getCharCount(const char32_t& codepoint)
 {
 	return getByteCount(codepoint) / sizeof(char16_t);
@@ -106,6 +118,12 @@ int64_t cpp::encoding::Utf16::getCharCount(const String& string)
 	return getByteCount(string) / sizeof(char16_t);
 }
 
+int cpp::encoding::Utf16::encode(const null&, const cpp::marshal::View<uint8_t>& buffer)
+{
+	hx::NullReference("String", false);
+	return 0;
+}
+
 int64_t cpp::encoding::Utf16::encode(const String& string, const cpp::marshal::View<uint8_t>& buffer)
 {
 	if (null() == string)
@@ -258,4 +276,4 @@ char32_t cpp::encoding::Utf16::codepoint(const cpp::marshal::View<uint8_t>& buff
 	{
 		return static_cast<char32_t>(first);
 	}
-}
+}
diff --git a/src/cpp/encoding/Utf8.cpp b/src/cpp/encoding/Utf8.cpp
@@ -24,6 +24,12 @@ namespace
     }
 }
 
+int cpp::encoding::Utf8::getByteCount(const null&)
+{
+    hx::NullReference("String", false);
+    return 0;
+}
+
 int cpp::encoding::Utf8::getByteCount(const char32_t& codepoint)
 {
     if (codepoint <= 0x7F)
@@ -77,6 +83,12 @@ int64_t cpp::encoding::Utf8::getByteCount(const String& string)
 #endif
 }
 
+int cpp::encoding::Utf8::getCharCount(const null&)
+{
+    hx::NullReference("String", false);
+    return 0;
+}
+
 int cpp::encoding::Utf8::getCharCount(const char32_t& codepoint)
 {
     return getByteCount(codepoint) / sizeof(char);
@@ -87,6 +99,12 @@ int64_t cpp::encoding::Utf8::getCharCount(const String& string)
     return getByteCount(string) / sizeof(char);
 }
 
+int cpp::encoding::Utf8::encode(const null&, const cpp::marshal::View<uint8_t>& buffer)
+{
+    hx::NullReference("String", false);
+    return 0;
+}
+
 int64_t cpp::encoding::Utf8::encode(const String& string, const cpp::marshal::View<uint8_t>& buffer)
 {
     if (null() == string)
@@ -282,4 +300,4 @@ char32_t cpp::encoding::Utf8::codepoint(const cpp::marshal::View<uint8_t>& buffe
     {
         return int{ hx::Throw(HX_CSTRING("Failed to read codepoint")) };
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -6,17 +6,20 @@ namespace cpp`
`6`	`6`	`{`
`7`	`7`	`struct Utf8 final`
`8`	`8`	`{`
	`9`	`+ static int getByteCount(const null&);`
`9`	`10`	`static int getByteCount(const char32_t& codepoint);`
`10`	`11`	`static int64_t getByteCount(const String& string);`
`11`	`12`
	`13`	`+ static int getCharCount(const null&);`
`12`	`14`	`static int getCharCount(const char32_t& codepoint);`
`13`	`15`	`static int64_t getCharCount(const String& string);`
`14`	`16`
	`17`	`+ static int encode(const null&, const cpp::marshal::View<uint8_t>& buffer);`
`15`	`18`	`static int encode(const char32_t& codepoint, const cpp::marshal::View<uint8_t>& buffer);`
`16`	`19`	`static int64_t encode(const String& string, const cpp::marshal::View<uint8_t>& buffer);`
`17`	`20`
`18`	`21`	`static char32_t codepoint(const cpp::marshal::View<uint8_t>& buffer);`
`19`	`22`	`static String decode(const cpp::marshal::View<uint8_t>& buffer);`
`20`	`23`	`};`
`21`	`24`	`}`
`22`		`-}`
	`25`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,12 @@ bool cpp::encoding::Utf16::isEncoded(const String& string)`
`68`	`68`	`return string.isUTF16Encoded();`
`69`	`69`	`}`
`70`	`70`
	`71`	`+int cpp::encoding::Utf16::getByteCount(const null&)`
	`72`	`+{`
	`73`	`+ hx::NullReference("String", false);`
	`74`	`+ return 0;`
	`75`	`+}`
	`76`	`+`
`71`	`77`	`int cpp::encoding::Utf16::getByteCount(const char32_t& codepoint)`
`72`	`78`	`{`
`73`	`79`	`return codepoint <= 0xFFFF ? 2 : 4;`
`@@ -96,6 +102,12 @@ int64_t cpp::encoding::Utf16::getByteCount(const String& string)`
`96`	`102`	`}`
`97`	`103`	`}`
`98`	`104`
	`105`	`+int cpp::encoding::Utf16::getCharCount(const null&)`
	`106`	`+{`
	`107`	`+ hx::NullReference("String", false);`
	`108`	`+ return 0;`
	`109`	`+}`
	`110`	`+`
`99`	`111`	`int cpp::encoding::Utf16::getCharCount(const char32_t& codepoint)`
`100`	`112`	`{`
`101`	`113`	`return getByteCount(codepoint) / sizeof(char16_t);`
`@@ -106,6 +118,12 @@ int64_t cpp::encoding::Utf16::getCharCount(const String& string)`
`106`	`118`	`return getByteCount(string) / sizeof(char16_t);`
`107`	`119`	`}`
`108`	`120`
	`121`	`+int cpp::encoding::Utf16::encode(const null&, const cpp::marshal::View<uint8_t>& buffer)`
	`122`	`+{`
	`123`	`+ hx::NullReference("String", false);`
	`124`	`+ return 0;`
	`125`	`+}`
	`126`	`+`
`109`	`127`	`int64_t cpp::encoding::Utf16::encode(const String& string, const cpp::marshal::View<uint8_t>& buffer)`
`110`	`128`	`{`
`111`	`129`	`if (null() == string)`
`@@ -258,4 +276,4 @@ char32_t cpp::encoding::Utf16::codepoint(const cpp::marshal::View<uint8_t>& buff`
`258`	`276`	`{`
`259`	`277`	`return static_cast<char32_t>(first);`
`260`	`278`	`}`
`261`		`-}`
	`279`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,12 @@ namespace`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
	`27`	`+int cpp::encoding::Utf8::getByteCount(const null&)`
	`28`	`+{`
	`29`	`+ hx::NullReference("String", false);`
	`30`	`+ return 0;`
	`31`	`+}`
	`32`	`+`
`27`	`33`	`int cpp::encoding::Utf8::getByteCount(const char32_t& codepoint)`
`28`	`34`	`{`
`29`	`35`	`if (codepoint <= 0x7F)`
`@@ -77,6 +83,12 @@ int64_t cpp::encoding::Utf8::getByteCount(const String& string)`
`77`	`83`	`#endif`
`78`	`84`	`}`
`79`	`85`
	`86`	`+int cpp::encoding::Utf8::getCharCount(const null&)`
	`87`	`+{`
	`88`	`+ hx::NullReference("String", false);`
	`89`	`+ return 0;`
	`90`	`+}`
	`91`	`+`
`80`	`92`	`int cpp::encoding::Utf8::getCharCount(const char32_t& codepoint)`
`81`	`93`	`{`
`82`	`94`	`return getByteCount(codepoint) / sizeof(char);`
`@@ -87,6 +99,12 @@ int64_t cpp::encoding::Utf8::getCharCount(const String& string)`
`87`	`99`	`return getByteCount(string) / sizeof(char);`
`88`	`100`	`}`
`89`	`101`
	`102`	`+int cpp::encoding::Utf8::encode(const null&, const cpp::marshal::View<uint8_t>& buffer)`
	`103`	`+{`
	`104`	`+ hx::NullReference("String", false);`
	`105`	`+ return 0;`
	`106`	`+}`
	`107`	`+`
`90`	`108`	`int64_t cpp::encoding::Utf8::encode(const String& string, const cpp::marshal::View<uint8_t>& buffer)`
`91`	`109`	`{`
`92`	`110`	`if (null() == string)`
`@@ -282,4 +300,4 @@ char32_t cpp::encoding::Utf8::codepoint(const cpp::marshal::View<uint8_t>& buffe`
`282`	`300`	`{`
`283`	`301`	`return int{ hx::Throw(HX_CSTRING("Failed to read codepoint")) };`
`284`	`302`	`}`
`285`		`-}`
	`303`	`+}`