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

Merge pull request #12957 from bojidar-bg/12928-numeric-underscores

Browse Source 
Allow underscores in GDScript numeric literals
This commit is contained in:
Rémi Verschelde 2017-11-16 09:04:31 +01:00 committed by GitHub
commit 3002130a6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/gdscript/gd_tokenizer.cpp
View File

@ -885,6 +885,9 @@ void GDTokenizerText::_advance() {
return; return;
} }
sign_found = true; sign_found = true;
} else if (GETCHAR(i) == '_') {
i++;
continue; // Included for readability, shouldn't be a part of the string
} else } else
break; break;
@ -897,7 +900,7 @@ void GDTokenizerText::_advance() {
return; return;
} }
INCPOS(str.length()); INCPOS(i);
if (hexa_found) { if (hexa_found) {
int64_t val = str.hex_to_int64(); int64_t val = str.hex_to_int64();
_make_constant(val); _make_constant(val);

7
scene/gui/text_edit.cpp
View File

@ -894,17 +894,18 @@ void TextEdit::_notification(int p_what) {
is_hex_notation = false; is_hex_notation = false;
} }
// check for dot or 'x' for hex notation in floating point number // check for dot or underscore or 'x' for hex notation in floating point number
if ((str[j] == '.' || str[j] == 'x') && !in_word && prev_is_number && !is_number) { if ((str[j] == '.' || str[j] == 'x' || str[j] == '_') && !in_word && prev_is_number && !is_number) {
is_number = true; is_number = true;
is_symbol = false; is_symbol = false;
is_char = false;
if (str[j] == 'x' && str[j - 1] == '0') { if (str[j] == 'x' && str[j - 1] == '0') {
is_hex_notation = true; is_hex_notation = true;
} }
} }
if (!in_word && _is_char(str[j])) { if (!in_word && _is_char(str[j]) && !is_number) {
in_word = true; in_word = true;
} }