Marshal String Encodings

include/Array.h

@@ -40,6 +40,7 @@ template<> struct ReturnNull<float> { typedef Dynamic type; };
 template<> struct ReturnNull<bool> { typedef Dynamic type; };
 template<> struct ReturnNull<char> { typedef Dynamic type; };
 template<> struct ReturnNull<char16_t> { typedef Dynamic type; };
+template<> struct ReturnNull<char32_t> { typedef Dynamic type; };
 template<> struct ReturnNull<signed char> { typedef Dynamic type; };
 template<> struct ReturnNull<unsigned char> { typedef Dynamic type; };
 template<> struct ReturnNull<short> { typedef Dynamic type; };
@@ -433,6 +434,7 @@ template<> struct ArrayClassId<signed char> { enum { id=hx::clsIdArrayByte }; };
 template<> struct ArrayClassId<unsigned short> { enum { id=hx::clsIdArrayShort }; };
 template<> struct ArrayClassId<signed short> { enum { id=hx::clsIdArrayShort }; };
 template<> struct ArrayClassId<char16_t> { enum { id = hx::clsIdArrayShort }; };
+template<> struct ArrayClassId<char32_t> { enum { id = hx::clsIdArrayInt }; };
 template<> struct ArrayClassId<unsigned int> { enum { id=hx::clsIdArrayInt }; };
 template<> struct ArrayClassId<signed int> { enum { id=hx::clsIdArrayInt }; };
 template<> struct ArrayClassId<float> { enum { id=hx::clsIdArrayFloat32 }; };

include/Dynamic.h

@@ -25,6 +25,7 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES Dynamic : public hx::ObjectPtr<hx::Object>
    Dynamic(unsigned char inVal);
    Dynamic(signed char inVal);
    Dynamic(char16_t inVal);
+   Dynamic(char32_t inVal);
    Dynamic(const cpp::CppInt32__ &inVal);
    Dynamic(bool inVal);
    Dynamic(double inVal);
@@ -73,6 +74,7 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES Dynamic : public hx::ObjectPtr<hx::Object>
    inline operator char () const { return mPtr ? mPtr->__ToInt() : 0; }
    inline operator signed char () const { return mPtr ? mPtr->__ToInt() : 0; }
    inline operator char16_t () const { return mPtr ? mPtr->__ToInt() : 0; }
+   inline operator char32_t () const { return mPtr ? mPtr->__ToInt() : 0; }
    inline operator bool() const { return mPtr && mPtr->__ToInt(); }
    inline operator cpp::Int64() const { return mPtr ? mPtr->__ToInt64() : 0; }
    inline operator cpp::UInt64() const { return mPtr ? mPtr->__ToInt64() : 0; }
@@ -174,6 +176,7 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES Dynamic : public hx::ObjectPtr<hx::Object>
       bool operator op (signed char inRHS)  const { return IsNumeric() && ((double)(*this) op (double)inRHS); } \
       bool operator op (unsigned char inRHS)  const { return IsNumeric() && ((double)(*this) op (double)inRHS); } \
       bool operator op (char16_t inRHS)  const { return IsNumeric() && ((double)(*this) op (double)inRHS); } \
+      bool operator op (char32_t inRHS)  const { return IsNumeric() && ((double)(*this) op (double)inRHS); } \
       bool operator op (bool inRHS)  const { return IsBool() && ((double)(*this) op (double)inRHS); } \
 
    bool operator != (const String &inRHS)  const { return !mPtr || ((String)(*this) != inRHS); }
@@ -188,6 +191,7 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES Dynamic : public hx::ObjectPtr<hx::Object>
    bool operator != (signed char inRHS)  const { return !IsNumeric() || ((double)(*this) != (double)inRHS); }
    bool operator != (unsigned char inRHS)  const { return !IsNumeric() || ((double)(*this) != (double)inRHS); }
    bool operator != (char16_t inRHS)  const { return !IsNumeric() || ((double)(*this) != (double)inRHS); }
+   bool operator != (char32_t inRHS)  const { return !IsNumeric() || ((double)(*this) != (double)inRHS); }
    bool operator != (bool inRHS)  const { return !IsBool() || ((double)(*this) != (double)inRHS); }
 
 
@@ -234,6 +238,7 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES Dynamic : public hx::ObjectPtr<hx::Object>
     Dynamic operator+(const signed char &i) const;
     Dynamic operator+(const unsigned char &i) const;
     Dynamic operator+(const char16_t& i) const;
+    Dynamic operator+(const char32_t& i) const;
     Dynamic operator+(const double &d) const;
     Dynamic operator+(const float &d) const;
     Dynamic operator+(const cpp::Variant &d) const;
@@ -277,6 +282,8 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES Dynamic : public hx::ObjectPtr<hx::Object>
         { return mPtr->__GetType()==vtInt ?  Dynamic((int)(*this) op inRHS) : Dynamic((double)(*this) op inRHS); } \
       Dynamic operator op (const char16_t &inRHS) const \
         { return mPtr->__GetType()==vtInt ?  Dynamic((int)(*this) op inRHS) : Dynamic((double)(*this) op inRHS); } \
+      Dynamic operator op (const char32_t &inRHS) const \
+        { return mPtr->__GetType()==vtInt ?  Dynamic((int)(*this) op inRHS) : Dynamic((double)(*this) op inRHS); } \
       Dynamic operator op (const cpp::Int64 &inRHS) const \
         { return Dynamic((double)(*this) op inRHS); } \
       Dynamic operator op (const cpp::UInt64 &inRHS) const \
@@ -465,6 +472,7 @@ COMPARE_DYNAMIC_OP( >  )
    inline double operator op (const signed char &inLHS,const Dynamic &inRHS) { return inLHS op (double)inRHS; } \
    inline double operator op (const unsigned char &inLHS,const Dynamic &inRHS) { return inLHS op (double)inRHS; } \
    inline double operator op (const char16_t &inLHS,const Dynamic &inRHS) { return inLHS op (double)inRHS; } \
+   inline double operator op (const char32_t &inLHS,const Dynamic &inRHS) { return inLHS op (double)inRHS; } \
 
 ARITH_DYNAMIC( - )
 ARITH_DYNAMIC( + )

include/cpp/Variant.h

@@ -110,6 +110,7 @@ namespace cpp
       inline operator char () const { return asInt(); }
       inline operator signed char () const { return asInt(); }
       inline operator char16_t() const { return asInt(); }
+      inline operator char32_t() const { return asInt(); }
       inline operator cpp::Int64 () const { return asInt64(); }
       inline operator cpp::UInt64 () const { return asInt64(); }
       inline bool operator !() const { return !asInt(); }
@@ -208,6 +209,7 @@ namespace cpp
    inline bool operator op (signed char inRHS)  const { return isNumeric() && (asDouble() op (double)inRHS); } \
    inline bool operator op (unsigned char inRHS)  const { return isNumeric() && (asDouble() op (double)inRHS); } \
    inline bool operator op (char16_t inRHS)  const { return isNumeric() && (asDouble() op (double)inRHS); } \
+   inline bool operator op (char32_t inRHS)  const { return isNumeric() && (asDouble() op (double)inRHS); } \
    inline bool operator op (bool inRHS)  const { return isBool() && (asDouble() op (double)inRHS); } \
    inline bool operator op (const Dynamic &inRHS)  const { return Compare(inRHS) op 0; } \
 
@@ -281,6 +283,7 @@ namespace cpp
    inline double operator op (const signed char &inLHS,const cpp::Variant &inRHS) { return inLHS op (double)inRHS; } \
    inline double operator op (const unsigned char &inLHS,const cpp::Variant &inRHS) { return inLHS op (double)inRHS; } \
    inline double operator op (const char16_t &inLHS,const cpp::Variant &inRHS) { return inLHS op (double)inRHS; } \
+   inline double operator op (const char32_t &inLHS,const cpp::Variant &inRHS) { return inLHS op (double)inRHS; } \
    inline double operator op (const signed short &inLHS,const cpp::Variant &inRHS) { return inLHS op (double)inRHS; } \
    inline double operator op (const unsigned short &inLHS,const cpp::Variant &inRHS) { return inLHS op (double)inRHS; } \
    inline double operator op (const cpp::Int64 &inLHS,const cpp::Variant &inRHS) { return inLHS op (double)inRHS; } \
@@ -608,6 +611,7 @@ HX_VARIANT_OP_ISEQ(unsigned short)
 HX_VARIANT_OP_ISEQ(signed char)
 HX_VARIANT_OP_ISEQ(unsigned char)
 HX_VARIANT_OP_ISEQ(char16_t)
+HX_VARIANT_OP_ISEQ(char32_t)
 HX_VARIANT_OP_ISEQ(bool)
 
 inline bool operator < (bool inLHS,const cpp::Variant &inRHS) { return false; }
@@ -639,6 +643,8 @@ inline bool operator > (bool inLHS,const cpp::Variant &inRHS) { return false; }
       { return inRHS.isNumeric() && (inLHS op (double)inRHS); } \
    inline bool operator op (char16_t inLHS,const ::cpp::Variant &inRHS) \
       { return inRHS.isNumeric() && (inLHS op (double)inRHS); } \
+   inline bool operator op (char32_t inLHS,const ::cpp::Variant &inRHS) \
+      { return inRHS.isNumeric() && (inLHS op (double)inRHS); } \
    inline bool operator op (const null &,const ::cpp::Variant &inRHS) \
       { return false; } \
 

include/cpp/encoding/Ascii.hpp

@@ -0,0 +1,24 @@
+#pragma once
+
+namespace cpp
+{
+	namespace encoding
+	{
+        struct Ascii final
+        {
+            static bool isEncoded(const String& string);
+
+            /// <summary>
+            /// Encode the provided string to ASCII bytes and write them to the buffer.
+            /// If the provided string is UTF16 encoded an exception is raised and nothing is written to the buffer.
+            /// </summary>
+            /// <returns>Number of chars written to the buffer.</returns>
+            static int64_t encode(const String& string, cpp::marshal::View<uint8_t> buffer);
+
+            /// <summary>
+            /// Create a string from the provided ASCII bytes.
+            /// </summary>
+            static String decode(cpp::marshal::View<uint8_t> string);
+        };
+	}
+}

include/cpp/encoding/Utf16.hpp

@@ -0,0 +1,24 @@
+#pragma once
+
+namespace cpp
+{
+	namespace encoding
+	{
+        struct Utf16 final
+        {
+            static bool isEncoded(const String& string);
+
+            static int getByteCount(const char32_t& codepoint);
+            static int64_t getByteCount(const String& string);
+
+            static int getCharCount(const char32_t& codepoint);
+            static int64_t getCharCount(const String& string);
+
+            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);
+        };
+	}
+}

include/cpp/encoding/Utf8.hpp

@@ -0,0 +1,22 @@
+#pragma once
+
+namespace cpp
+{
+	namespace encoding
+	{
+        struct Utf8 final
+        {
+            static int getByteCount(const char32_t& codepoint);
+            static int64_t getByteCount(const String& string);
+
+            static int getCharCount(const char32_t& codepoint);
+            static int64_t getCharCount(const String& string);
+
+            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);
+        };
+	}
+}