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

Merge pull request #5443 from samuelgrigolato/iterate-string-in-gdscript 

Add support to String type in gdscript iteration
This commit is contained in:
Juan Linietsky 2016-07-10 13:32:37 -03:00 committed by GitHub
parent bcf6491a86 9ac7eaa89c
commit 9dac41432e
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/variant_op.cpp
View File

@ -2911,6 +2911,14 @@ bool Variant::iter_init(Variant& r_iter,bool &valid) const {
return ret;
} break;
case STRING: {
const String *str=reinterpret_cast<const String*>(_data._mem);
if (str->empty())
return false;
r_iter = 0;
return true;
} break;
case DICTIONARY: {
const Dictionary *dic=reinterpret_cast<const Dictionary*>(_data._mem);
@ -3028,6 +3036,17 @@ bool Variant::iter_next(Variant& r_iter,bool &valid) const {
return ret;
} break;
case STRING: {
const String *str=reinterpret_cast<const String*>(_data._mem);
int idx = r_iter;
idx++;
if (idx >= str->size())
return false;
r_iter = idx;
return true;
} break;
case DICTIONARY: {
const Dictionary *dic=reinterpret_cast<const Dictionary*>(_data._mem);
@ -3158,6 +3177,11 @@ Variant Variant::iter_get(const Variant& r_iter,bool &r_valid) const {
return ret;
} break;
case STRING: {
const String *str=reinterpret_cast<const String*>(_data._mem);
return str->substr(r_iter,1);
} break;
case DICTIONARY: {
return r_iter; //iterator is the same as the key