Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Make hex_to_int and bin_to_int handle the prefix automatically

Browse source 
Also add BinToInt to C#
This commit is contained in:
Aaron Franke 2021-01-28 07:39:05 -05:00
parent 726967f453
commit a3e3bf8227
No known key found for this signature in database
GPG key ID: 40A1750B977E56BF
7 changed files with 84 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

22
core/string/ustring.cpp
View file

@ -2097,8 +2097,9 @@ String::String(const StrRange &p_range) {
copy_from(p_range.c_str, p_range.len);
}
int64_t String::hex_to_int(bool p_with_prefix) const {
if (p_with_prefix && length() < 3) {
int64_t String::hex_to_int() const {
int len = length();
if (len == 0) {
return 0;
}
@ -2110,10 +2111,7 @@ int64_t String::hex_to_int(bool p_with_prefix) const {
s++;
}
if (p_with_prefix) {
if (s[0] != '0' || s[1] != 'x') {
return 0;
}
if (len > 2 && s[0] == '0' && s[1] == 'x') {
s += 2;
}
@ -2140,8 +2138,9 @@ int64_t String::hex_to_int(bool p_with_prefix) const {
return hex * sign;
}
int64_t String::bin_to_int(bool p_with_prefix) const {
if (p_with_prefix && length() < 3) {
int64_t String::bin_to_int() const {
int len = length();
if (len == 0) {
return 0;
}
@ -2153,10 +2152,7 @@ int64_t String::bin_to_int(bool p_with_prefix) const {
s++;
}
if (p_with_prefix) {
if (s[0] != '0' || s[1] != 'b') {
return 0;
}
if (len > 2 && s[0] == '0' && s[1] == 'b') {
s += 2;
}
@ -4251,7 +4247,7 @@ bool String::is_valid_ip_address() const {
continue;
}
if (n.is_valid_hex_number(false)) {
int64_t nint = n.hex_to_int(false);
int64_t nint = n.hex_to_int();
if (nint < 0 || nint > 0xffff) {
return false;
}