diff options
author | Aaron Franke <arnfranke@yahoo.com> | 2020-05-13 05:31:51 -0400 |
---|---|---|
committer | Aaron Franke <arnfranke@yahoo.com> | 2020-06-03 00:03:34 -0400 |
commit | bb8aa107fd064a095479350bd22b1ce3ed146784 (patch) | |
tree | a92201554e694ece66c0877f63932b02a2432bd6 /core/ustring.cpp | |
parent | 030a26206ff70b1050c885270afce89b0430af70 (diff) |
Remove 32-bit String to_int method
Diffstat (limited to 'core/ustring.cpp')
-rw-r--r-- | core/ustring.cpp | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/core/ustring.cpp b/core/ustring.cpp index cfb547742a..986bf089c8 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -1742,32 +1742,7 @@ int64_t String::bin_to_int64(bool p_with_prefix) const { return binary * sign; } -int String::to_int() const { - if (length() == 0) { - return 0; - } - - int to = (find(".") >= 0) ? find(".") : length(); - - int integer = 0; - int sign = 1; - - for (int i = 0; i < to; i++) { - CharType c = operator[](i); - if (c >= '0' && c <= '9') { - ERR_FAIL_COND_V_MSG(integer > INT32_MAX / 10, sign == 1 ? INT32_MAX : INT32_MIN, "Cannot represent " + *this + " as integer, provided value is " + (sign == 1 ? "too big." : "too small.")); - integer *= 10; - integer += c - '0'; - - } else if (integer == 0 && c == '-') { - sign = -sign; - } - } - - return integer * sign; -} - -int64_t String::to_int64() const { +int64_t String::to_int() const { if (length() == 0) { return 0; } @@ -1780,7 +1755,7 @@ int64_t String::to_int64() const { for (int i = 0; i < to; i++) { CharType c = operator[](i); if (c >= '0' && c <= '9') { - ERR_FAIL_COND_V_MSG(integer > INT64_MAX / 10, sign == 1 ? INT64_MAX : INT64_MIN, "Cannot represent " + *this + " as 64-bit integer, provided value is " + (sign == 1 ? "too big." : "too small.")); + ERR_FAIL_COND_V_MSG(integer > INT64_MAX / 10, sign == 1 ? INT64_MAX : INT64_MIN, "Cannot represent " + *this + " as an integer, provided value is " + (sign == 1 ? "too big." : "too small.")); integer *= 10; integer += c - '0'; |