godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Added StringName as a variant type.

Browse Source 
Also changed all relevant properties defined manually to StringName.
This commit is contained in:
Juan Linietsky
2020-02-20 18:58:05 -03:00
committed by Juan Linietsky
parent 7ac0973e9a
commit 3c0059650d
55 changed files with 351 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/gdscript/gdscript_tokenizer.cpp
View File

@@ -160,6 +160,7 @@ static const _bit _type_list[] = {
{ Variant::COLOR, "Color" },
{ Variant::_RID, "RID" },
{ Variant::OBJECT, "Object" },
{ Variant::STRING_NAME, "StringName" },
{ Variant::NODE_PATH, "NodePath" },
{ Variant::DICTIONARY, "Dictionary" },
{ Variant::CALLABLE, "Callable" },
@@ -477,7 +478,7 @@ void GDScriptTokenizerText::_advance() {
}
while (true) {
bool is_node_path = false;
bool is_string_name = false;
StringMode string_mode = STRING_DOUBLE_QUOTE;
switch (GETCHAR(0)) {
@@ -751,7 +752,7 @@ void GDScriptTokenizerText::_advance() {
return;
}
INCPOS(1);
is_node_path = true;
is_string_name = true;
FALLTHROUGH;
case '\'':
case '"': {
@@ -862,8 +863,8 @@ void GDScriptTokenizerText::_advance() {
}
INCPOS(i);
if (is_node_path) {
_make_constant(NodePath(str));
if (is_string_name) {
_make_constant(StringName(str));
} else {
_make_constant(str);
}