diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-21 16:48:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-21 16:48:29 +0100 |
| commit | a77c862b18c283e2795a7bdf665b2d9cc9c3b4d2 (patch) | |
| tree | 29701b02651ef860c1c610ec9145c799767d93b6 /modules/gdscript/gdscript_tokenizer.cpp | |
| parent | 0447d6fc8edfd636fa6c859d32e76ec8a760f42e (diff) | |
| parent | 3c0059650da3f1feb3c95364d571fe706826dec6 (diff) | |
Merge pull request #36400 from reduz/variant-string-name
Added StringName as a variant type.
Diffstat (limited to 'modules/gdscript/gdscript_tokenizer.cpp')
| -rw-r--r-- | modules/gdscript/gdscript_tokenizer.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/modules/gdscript/gdscript_tokenizer.cpp b/modules/gdscript/gdscript_tokenizer.cpp index 745dd37a5b..a39a778c82 100644 --- a/modules/gdscript/gdscript_tokenizer.cpp +++ b/modules/gdscript/gdscript_tokenizer.cpp @@ -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); } |