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

improved handling of aliasses and warnings

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@51 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2006-10-26 23:33:33 +00:00
parent 1459cd6d76
commit 10f52c80ac
5 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/io/reader.cpp
+19 -6
View File
@@ -52,7 +52,14 @@ void Reader::handleAppVersion() {
}
void Reader::warning(const String& msg) {
wxMessageBox((msg + _("\nOn line: ")) << line_number << _("\nIn file: ") << filename, _("Warning"), wxOK | wxICON_EXCLAMATION);
warnings += String(_("\nOn line ")) << line_number << _(": \t") << msg;
}
void Reader::showWarnings() {
if (!warnings.empty()) {
wxMessageBox(_("Warnings while reading file:\n") + filename + _("\n") + warnings, _("Warning"), wxOK | wxICON_EXCLAMATION);
warnings.clear();
}
}
bool Reader::enterBlock(const Char* name) {
@@ -118,14 +125,20 @@ void Reader::readLine() {
}
key = cannocial_name_form(trim(line.substr(indent, pos - indent)));
value = pos == String::npos ? _("") : trim_left(line.substr(pos+1));
// aliasses?
map<String,String>::const_iterator it = aliasses.find(key);
if (it != aliasses.end()) {
key = it->second;
}
}
void Reader::unknownKey() {
// aliasses?
map<String,String>::const_iterator it = aliasses.find(key);
if (it != aliasses.end()) {
if (aliasses.find(it->second) != aliasses.end()) {
// alias points to another alias, don't follow it, there is the risk of infinite loops
} else {
// try this key instead
key = it->second;
return;
}
}
if (indent == expected_indent) {
warning(_("Unexpected key: '") + key + _("'"));
do {