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

Merge pull request #82786 from theraot/donotreplacestartingdigitwithunderscore 

Do not replace starting digit with underscore when making identifier
This commit is contained in:
Rémi Verschelde 2023-10-05 12:29:42 +02:00
parent 57256d712c 5cd7ca0ccc
commit c2b916751d
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/string/ustring.cpp
View File

@ -3974,24 +3974,22 @@ bool String::is_absolute_path() const {
} }
} }
static _FORCE_INLINE_ bool _is_valid_identifier_bit(int p_index, char32_t p_char) {
if (p_index == 0 && is_digit(p_char)) {
return false; // No start with number plz.
}
return is_ascii_identifier_char(p_char);
}
String String::validate_identifier() const { String String::validate_identifier() const {
if (is_empty()) { if (is_empty()) {
return "_"; // Empty string is not a valid identifier; return "_"; // Empty string is not a valid identifier;
} }
String result = *this; String result;
if (is_digit(operator[](0))) {
result = "_" + *this;
} else {
result = *this;
}
int len = result.length(); int len = result.length();
char32_t *buffer = result.ptrw(); char32_t *buffer = result.ptrw();
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
if (!_is_valid_identifier_bit(i, buffer[i])) { if (!is_ascii_identifier_char(buffer[i])) {
buffer[i] = '_'; buffer[i] = '_';
} }
} }
@ -4006,10 +4004,14 @@ bool String::is_valid_identifier() const {
return false; return false;
} }
if (is_digit(operator[](0))) {
return false;
}
const char32_t *str = &operator[](0); const char32_t *str = &operator[](0);
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
if (!_is_valid_identifier_bit(i, str[i])) { if (!is_ascii_identifier_char(str[i])) {
return false; return false;
} }
} }

2
tests/core/string/test_string.h
View File

@ -1716,7 +1716,7 @@ TEST_CASE("[String] validate_identifier") {
CHECK(empty_string.validate_identifier() == "_"); CHECK(empty_string.validate_identifier() == "_");
String numeric_only = "12345"; String numeric_only = "12345";
CHECK(numeric_only.validate_identifier() == "_2345"); CHECK(numeric_only.validate_identifier() == "_12345");
String name_with_spaces = "Name with spaces"; String name_with_spaces = "Name with spaces";
CHECK(name_with_spaces.validate_identifier() == "Name_with_spaces"); CHECK(name_with_spaces.validate_identifier() == "Name_with_spaces");