Support unsigned long values for Dynamic

Fixes ambiguous calls when compiling with Xcode

Author: singpolyma

include/Dynamic.h

@@ -30,6 +30,7 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES Dynamic : public hx::ObjectPtr<hx::Object>
    Dynamic(float inVal);
    Dynamic(cpp::Int64 inVal);
    Dynamic(cpp::UInt64 inVal);
+   Dynamic(unsigned long inVal);
    Dynamic(hx::Object *inObj) : super(inObj) { }
    Dynamic(const String &inString);
    Dynamic(const null &inNull) : super(0) { }
@@ -40,7 +41,6 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES Dynamic : public hx::ObjectPtr<hx::Object>
    Dynamic(const hx::Native<T *> &inInterface):super(inInterface.ptr ? inInterface->__GetRealObject() : (hx::Object *)0 ) { }
    #if !defined(__GNUC__) || defined(__MINGW32__) || (defined(__WORDSIZE) && (__WORDSIZE != 64))
    Dynamic(long inVal);
-   Dynamic(unsigned long inVal);
    #endif
 #ifdef __OBJC__
 #ifdef HXCPP_OBJC
@@ -74,6 +74,7 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES Dynamic : public hx::ObjectPtr<hx::Object>
    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; }
+   inline operator unsigned long() const { return mPtr ? mPtr->__ToInt64() : 0; }
 
    // Conversion to generic pointer requires you to tag the class with a typedef
    template<typename T>

include/cpp/Variant.h

@@ -70,6 +70,7 @@ namespace cpp
 
       inline Variant(cpp::Int64 inValue) : type(typeInt64), valInt64(inValue) { }
       inline Variant(cpp::UInt64 inValue) : type(typeInt64), valInt64(inValue) { }
+      inline Variant(unsigned long inValue) : type(typeInt64), valInt64(inValue) { }
       inline Variant(int inValue) : type(typeInt), valInt(inValue) { }
       inline Variant(cpp::UInt32 inValue) : type(typeInt), valInt(inValue) { }
       inline Variant(cpp::Int16 inValue) : type(typeInt), valInt(inValue) { }
@@ -111,6 +112,7 @@ namespace cpp
       inline operator signed char () const { return asInt(); }
       inline operator cpp::Int64 () const { return asInt64(); }
       inline operator cpp::UInt64 () const { return asInt64(); }
+      inline operator unsigned long () const { return asInt64(); }
       inline bool operator !() const { return !asInt(); }
 
       inline int Compare(hx::Object *inRHS) const;

include/hxString.h

@@ -95,6 +95,7 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES String
    String(const float &inRHS);
    String(const cpp::Int64 &inRHS);
    String(const cpp::UInt64 &inRHS);
+   String(const unsigned long &inRHS);
    explicit String(const bool &inRHS);
    inline String(const null &inRHS) : __s(0), length(0) { }
    String(hx::Null< ::String > inRHS) : __s(inRHS.value.__s), length(inRHS.value.length) { }

include/null.h

@@ -92,6 +92,7 @@ class null
      operator signed char () { return 0; }
      operator short () { return 0; }
      operator unsigned short () { return 0; }
+     operator unsigned long () { return 0; }
      operator cpp::UInt64 () { return 0; }
      operator cpp::Int64 () { return 0; }
      template<typename T>

src/Dynamic.cpp

@@ -367,10 +367,6 @@ Dynamic::Dynamic(short inVal)
 }
 
 #if !defined(__GNUC__) || defined(__MINGW32__) || (defined(__WORDSIZE) && (__WORDSIZE != 64))
-Dynamic::Dynamic(unsigned long inVal)
-{
-   mPtr = fromInt(inVal);
-}
 Dynamic::Dynamic(long inVal)
 {
    mPtr = fromInt(inVal);
@@ -440,6 +436,19 @@ Dynamic::Dynamic(cpp::UInt64 inVal)
       mPtr = (hx::Object *)new Int64Data(inVal);
 }
 
+Dynamic::Dynamic(unsigned long inVal)
+{
+   if ( (int)inVal==inVal && inVal<256 )
+   {
+      int idx = inVal+1;
+      mPtr = sConstDynamicInts[idx].mPtr;
+      if (!mPtr)
+         mPtr = sConstDynamicInts[idx].mPtr = new (hx::NewObjConst)IntData(inVal);
+   }
+   else
+      mPtr = (hx::Object *)new Int64Data(inVal);
+}
+
 
 
 

src/String.cpp

@@ -862,6 +862,14 @@ String::String(const cpp::UInt64 &inRHS)
    __s = GCStringDup(buf,-1,&length);
 }
 
+String::String(const unsigned long &inRHS)
+{
+   char buf[100];
+   SPRINTF(buf,100,"%llu", (unsigned long long int)inRHS);
+   buf[99]='\0';
+   __s = GCStringDup(buf,-1,&length);
+}
+
 String::String(const float &inRHS)
 {
    char buf[100];