amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

to_code now adds quotes around strings.

Browse Source 
to_code for map now includes keys.
This maans that the basic script-functions test passes.
This commit is contained in:
Twan van Laarhoven
2020-04-26 17:35:14 +02:00
parent 2e897edbbf
commit c324c8bbbb
5 changed files with 55 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/to_value.hpp
+3 -2
View File
@@ -75,7 +75,7 @@ struct ScriptIterator : public ScriptValue {
CompareWhat compareAs(String&, void const*&) const override;
/// Return the next item for this iterator, or ScriptValueP() if there is no such item
ScriptValueP next(ScriptValueP* key_out = nullptr) override = 0;
ScriptValueP next(ScriptValueP* key_out = nullptr, int* index_out = nullptr) override = 0;
ScriptValueP makeIterator(const ScriptValueP& thisP) const override;
};
@@ -98,9 +98,10 @@ template <typename Collection>
class ScriptCollectionIterator : public ScriptIterator {
public:
ScriptCollectionIterator(const Collection* col) : pos(0), col(col) {}
ScriptValueP next(ScriptValueP* key_out) override {
ScriptValueP next(ScriptValueP* key_out, int* index_out) override {
if (pos < col->size()) {
if (key_out) *key_out = to_script((int)pos);
if (index_out) *index_out = (int)pos;
return to_script(col->at(pos++));
} else {
return ScriptValueP();