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

fixed reading of IndexMaps: loop, initialization of 'index'

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@41 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2006-10-20 13:38:03 +00:00
parent c15bc94ee7
commit b5cb26474a
3 changed files with 71 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/io/reader.hpp
+10 -4
View File
@@ -146,12 +146,16 @@ shared_ptr<T> read_new(Reader& reader) {
return new_shared<T>();
}
/// Update the 'index' member of a value for use by IndexMap
template <typename T> void update_index(T&, size_t index) {}
template <typename T>
void Reader::handle(const Char* name, vector<T>& vector) {
String vectorKey = singular_form(name);
while (enterBlock(vectorKey)) {
vector.resize(vector.size() + 1);
handle(vector.back());
update_index(vector.back(), vector.size() - 1); // update index for IndexMap
exitBlock();
}
}
@@ -169,11 +173,13 @@ void Reader::handle(map<K,V>& m) {
template <typename K, typename V>
void Reader::handle(IndexMap<K,V>& m) {
while (indent >= expected_indent) {
do {
UInt l = line_number;
for (typename IndexMap<K,V>::iterator it = m.begin() ; it != m.end() ; ++it) {
handle(get_key_name(*it).c_str(), *it);
}
}
if (l == line_number) unknownKey(m);
} while (indent >= expected_indent);
}
// ----------------------------------------------------------------------------- : Reflection
@@ -181,11 +187,11 @@ void Reader::handle(IndexMap<K,V>& m) {
/// Implement reflection as used by Reader
#define REFLECT_OBJECT_READER(Cls) \
template<> void Reader::handle<Cls>(Cls& object) { \
while (indent >= expected_indent) { \
do { \
UInt l = line_number; \
object.reflect(*this); \
if (l == line_number) unknownKey(object); \
} \
} while (indent >= expected_indent); \
} \
void Cls::reflect(Reader& reader) { \
reflect_impl(reader); \