godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89984 from Repiteo/core/variant-integer-cleanup 

Core: Use fixed-width integer types in Variant
This commit is contained in:
Rémi Verschelde 2024-04-04 17:09:14 +02:00
parent 63135ac753 b0cda1f85f
commit 1634f82142
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 139 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

305
core/variant/variant.cpp
View File

@ -1417,42 +1417,6 @@ void Variant::_clear_internal() {
}
}
Variant::operator signed int() const {
switch (type) {
case NIL:
return 0;
case BOOL:
return _data._bool ? 1 : 0;
case INT:
return _data._int;
case FLOAT:
return _data._float;
case STRING:
return operator String().to_int();
default: {
return 0;
}
}
}
Variant::operator unsigned int() const {
switch (type) {
case NIL:
return 0;
case BOOL:
return _data._bool ? 1 : 0;
case INT:
return _data._int;
case FLOAT:
return _data._float;
case STRING:
return operator String().to_int();
default: {
return 0;
}
}
}
Variant::operator int64_t() const {
switch (type) {
case NIL:
@ -1471,6 +1435,60 @@ Variant::operator int64_t() const {
}
}
Variant::operator int32_t() const {
switch (type) {
case NIL:
return 0;
case BOOL:
return _data._bool ? 1 : 0;
case INT:
return _data._int;
case FLOAT:
return _data._float;
case STRING:
return operator String().to_int();
default: {
return 0;
}
}
}
Variant::operator int16_t() const {
switch (type) {
case NIL:
return 0;
case BOOL:
return _data._bool ? 1 : 0;
case INT:
return _data._int;
case FLOAT:
return _data._float;
case STRING:
return operator String().to_int();
default: {
return 0;
}
}
}
Variant::operator int8_t() const {
switch (type) {
case NIL:
return 0;
case BOOL:
return _data._bool ? 1 : 0;
case INT:
return _data._int;
case FLOAT:
return _data._float;
case STRING:
return operator String().to_int();
default: {
return 0;
}
}
}
Variant::operator uint64_t() const {
switch (type) {
case NIL:
@ -1489,6 +1507,60 @@ Variant::operator uint64_t() const {
}
}
Variant::operator uint32_t() const {
switch (type) {
case NIL:
return 0;
case BOOL:
return _data._bool ? 1 : 0;
case INT:
return _data._int;
case FLOAT:
return _data._float;
case STRING:
return operator String().to_int();
default: {
return 0;
}
}
}
Variant::operator uint16_t() const {
switch (type) {
case NIL:
return 0;
case BOOL:
return _data._bool ? 1 : 0;
case INT:
return _data._int;
case FLOAT:
return _data._float;
case STRING:
return operator String().to_int();
default: {
return 0;
}
}
}
Variant::operator uint8_t() const {
switch (type) {
case NIL:
return 0;
case BOOL:
return _data._bool ? 1 : 0;
case INT:
return _data._int;
case FLOAT:
return _data._float;
case STRING:
return operator String().to_int();
default: {
return 0;
}
}
}
Variant::operator ObjectID() const {
if (type == INT) {
return ObjectID(_data._int);
@ -1499,122 +1571,8 @@ Variant::operator ObjectID() const {
}
}
#ifdef NEED_LONG_INT
Variant::operator signed long() const {
switch (type) {
case NIL:
return 0;
case BOOL:
return _data._bool ? 1 : 0;
case INT:
return _data._int;
case FLOAT:
return _data._float;
case STRING:
return operator String().to_int();
default: {
return 0;
}
}
return 0;
}
Variant::operator unsigned long() const {
switch (type) {
case NIL:
return 0;
case BOOL:
return _data._bool ? 1 : 0;
case INT:
return _data._int;
case FLOAT:
return _data._float;
case STRING:
return operator String().to_int();
default: {
return 0;
}
}
return 0;
}
#endif
Variant::operator signed short() const {
switch (type) {
case NIL:
return 0;
case BOOL:
return _data._bool ? 1 : 0;
case INT:
return _data._int;
case FLOAT:
return _data._float;
case STRING:
return operator String().to_int();
default: {
return 0;
}
}
}
Variant::operator unsigned short() const {
switch (type) {
case NIL:
return 0;
case BOOL:
return _data._bool ? 1 : 0;
case INT:
return _data._int;
case FLOAT:
return _data._float;
case STRING:
return operator String().to_int();
default: {
return 0;
}
}
}
Variant::operator signed char() const {
switch (type) {
case NIL:
return 0;
case BOOL:
return _data._bool ? 1 : 0;
case INT:
return _data._int;
case FLOAT:
return _data._float;
case STRING:
return operator String().to_int();
default: {
return 0;
}
}
}
Variant::operator unsigned char() const {
switch (type) {
case NIL:
return 0;
case BOOL:
return _data._bool ? 1 : 0;
case INT:
return _data._int;
case FLOAT:
return _data._float;
case STRING:
return operator String().to_int();
default: {
return 0;
}
}
}
Variant::operator char32_t() const {
return operator unsigned int();
return operator uint32_t();
}
Variant::operator float() const {
@ -2420,57 +2378,44 @@ Variant::Variant(bool p_bool) {
_data._bool = p_bool;
}
Variant::Variant(signed int p_int) {
Variant::Variant(int64_t p_int64) {
type = INT;
_data._int = p_int;
_data._int = p_int64;
}
Variant::Variant(unsigned int p_int) {
Variant::Variant(int32_t p_int32) {
type = INT;
_data._int = p_int;
_data._int = p_int32;
}
#ifdef NEED_LONG_INT
Variant::Variant(signed long p_int) {
Variant::Variant(int16_t p_int16) {
type = INT;
_data._int = p_int;
_data._int = p_int16;
}
Variant::Variant(unsigned long p_int) {
Variant::Variant(int8_t p_int8) {
type = INT;
_data._int = p_int;
}
#endif
Variant::Variant(int64_t p_int) {
type = INT;
_data._int = p_int;
_data._int = p_int8;
}
Variant::Variant(uint64_t p_int) {
Variant::Variant(uint64_t p_uint64) {
type = INT;
_data._int = p_int;
_data._int = p_uint64;
}
Variant::Variant(signed short p_short) {
Variant::Variant(uint32_t p_uint32) {
type = INT;
_data._int = p_short;
_data._int = p_uint32;
}
Variant::Variant(unsigned short p_short) {
Variant::Variant(uint16_t p_uint16) {
type = INT;
_data._int = p_short;
_data._int = p_uint16;
}
Variant::Variant(signed char p_char) {
Variant::Variant(uint8_t p_uint8) {
type = INT;
_data._int = p_char;
}
Variant::Variant(unsigned char p_char) {
type = INT;
_data._int = p_char;
_data._int = p_uint8;
}
Variant::Variant(float p_float) {

37
core/variant/variant.h
View File

@ -355,19 +355,14 @@ public:
const Variant &operator[](const Variant &p_key) const = delete;
operator bool() const;
operator signed int() const;
operator unsigned int() const; // this is the real one
operator signed short() const;
operator unsigned short() const;
operator signed char() const;
operator unsigned char() const;
//operator long unsigned int() const;
operator int64_t() const;
operator int32_t() const;
operator int16_t() const;
operator int8_t() const;
operator uint64_t() const;
#ifdef NEED_LONG_INT
operator signed long() const;
operator unsigned long() const;
#endif
operator uint32_t() const;
operator uint16_t() const;
operator uint8_t() const;
operator ObjectID() const;
@ -430,18 +425,14 @@ public:
Object *get_validated_object_with_check(bool &r_previously_freed) const;
Variant(bool p_bool);
Variant(signed int p_int); // real one
Variant(unsigned int p_int);
#ifdef NEED_LONG_INT
Variant(signed long p_long); // real one
Variant(unsigned long p_long);
#endif
Variant(signed short p_short); // real one
Variant(unsigned short p_short);
Variant(signed char p_char); // real one
Variant(unsigned char p_char);
Variant(int64_t p_int); // real one
Variant(uint64_t p_int);
Variant(int64_t p_int64);
Variant(int32_t p_int32);
Variant(int16_t p_int16);
Variant(int8_t p_int8);
Variant(uint64_t p_uint64);
Variant(uint32_t p_uint32);
Variant(uint16_t p_uint16);
Variant(uint8_t p_uint8);
Variant(float p_float);
Variant(double p_double);
Variant(const ObjectID &p_id);

1
platform/ios/detect.py
View File

@ -140,7 +140,6 @@ def configure(env: "SConsEnvironment"):
)
)
env.Append(ASFLAGS=["-arch", "arm64"])
env.Append(CPPDEFINES=["NEED_LONG_INT"])
# Temp fix for ABS/MAX/MIN macros in iOS SDK blocking compilation
env.Append(CCFLAGS=["-Wno-ambiguous-macro"])