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 warning 'unexpected key ""' at end of file

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@248 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2007-03-29 19:26:56 +00:00
parent d4bae697cd
commit 44d23356ef
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/io/reader.cpp
+7 -2
View File
@@ -130,10 +130,10 @@ void Reader::unknownKey() {
if (it != aliasses.end()) { if (it != aliasses.end()) {
if (aliasses.find(it->second.new_key) != aliasses.end()) { if (aliasses.find(it->second.new_key) != aliasses.end()) {
// alias points to another alias, don't follow it, there is the risk of infinite loops // alias points to another alias, don't follow it, there is the risk of infinite loops
} else if (it->second.end_version <= file_version) { } else if (it->second.end_version <= file_app_version) {
// alias not used for this version, use in warning // alias not used for this version, use in warning
if (indent == expected_indent) { if (indent == expected_indent) {
warning(_("Unexpected key: '") + key + _("' try '") + it->second.new_key + _("'")); warning(_("Unexpected key: '") + key + _("' use '") + it->second.new_key + _("'"));
do { do {
moveNext(); moveNext();
} while (indent > expected_indent); } while (indent > expected_indent);
@@ -176,6 +176,11 @@ const String& Reader::getValue() {
while (key.empty() && !input->Eof()) { while (key.empty() && !input->Eof()) {
readLine(); readLine();
} }
// did we reach the end of the file?
if (key.empty() && input->Eof()) {
line_number += 1;
indent = -1;
}
return multi_line_str; return multi_line_str;
} else { } else {
return value; return value;