Added unsigned int and uint64_t to Variant (#165)

* Added unsigned int and uint64_t to Variant

* Added TypeConverter for uint64_t

* Added unsigned int/uint64_t to LUA

Include/RmlUi/Core/TypeConverter.inl

@@ -174,6 +174,16 @@ public:
 	}
 };
 
+template<>
+class TypeConverter< String, uint64_t >
+{
+public:
+	static bool Convert(const String& src, uint64_t& dest)
+	{
+		return sscanf(src.c_str(), "%" SCNu64, &dest) == 1;
+	}
+};
+
 template<>
 class TypeConverter< String, int64_t >
 {

Include/RmlUi/Core/Variant.h

@@ -59,6 +59,8 @@ public:
 		DOUBLE = 'd',
 		INT = 'i',
 		INT64 = 'I',
+		UINT = 'u',
+		UINT64 = 'U',
 		STRING = 's',
 		VECTOR2 = '2',
 		VECTOR3 = '3',
@@ -129,6 +131,8 @@ private:
 	void Set(const double value);
 	void Set(const int value);
 	void Set(const int64_t value);
+	void Set(const unsigned int value);
+	void Set(const uint64_t value);
 	void Set(const char* value);
 	void Set(void* value);
 	void Set(const Vector2f value);

Include/RmlUi/Core/Variant.inl

@@ -81,6 +81,14 @@ bool Variant::GetInto(T& value) const
 		return TypeConverter< int64_t, T >::Convert(*(int64_t*)data, value);
 		break;
 
+	case UINT:
+		return TypeConverter< unsigned int, T >::Convert(*(unsigned int*)data, value);
+		break;
+
+	case UINT64:
+		return TypeConverter< uint64_t, T >::Convert(*(uint64_t*)data, value);
+		break;
+
 	case STRING:
 		return TypeConverter< String, T >::Convert(*(String*)data, value);
 		break;

Source/Core/Variant.cpp

@@ -233,6 +233,18 @@ void Variant::Set(const int64_t value)
 	SET_VARIANT(int64_t);
 }
 
+void Variant::Set(const unsigned int value)
+{
+	type = UINT;
+	SET_VARIANT(unsigned int);
+}
+
+void Variant::Set(const uint64_t value)
+{
+	type = UINT64;
+	SET_VARIANT(uint64_t);
+}
+
 void Variant::Set(const char* value) 
 {
 	Set(String(value));
@@ -470,6 +482,10 @@ bool Variant::operator==(const Variant & other) const
 		return DEFAULT_VARIANT_COMPARE(int);
 	case INT64:
 		return DEFAULT_VARIANT_COMPARE(int64_t);
+	case UINT:
+		return DEFAULT_VARIANT_COMPARE(unsigned int);
+	case UINT64:
+		return DEFAULT_VARIANT_COMPARE(uint64_t);
 	case STRING:
 		return DEFAULT_VARIANT_COMPARE(String);
 	case VECTOR2:

Source/Lua/Utilities.cpp

@@ -53,6 +53,12 @@ void PushVariant(lua_State* L, const Variant* var)
 	case Variant::INT64:
 		lua_pushinteger(L, var->Get<int64_t>());
 		break;
+	case Variant::UINT:
+		lua_pushinteger(L, var->Get<unsigned int>());
+		break;
+	case Variant::UINT64:
+		lua_pushinteger(L, var->Get<uint64_t>());
+		break;
 	case Variant::FLOAT:
 	case Variant::DOUBLE:
 		lua_pushnumber(L, var->Get<double>());