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

warn about invalid conversion to int/double/bool in Reader

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1459 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2010-07-22 13:36:05 +00:00
parent 66bf7c8521
commit 44b3d15a68
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/io/reader.cpp
+22 -7
View File
@@ -356,24 +356,39 @@ template <> void Reader::handle(String& s) {
} }
template <> void Reader::handle(int& i) { template <> void Reader::handle(int& i) {
long l = 0; long l = 0;
getValue().ToLong(&l); if (!getValue().ToLong(&l)) {
warning(_("Expected integer instead of '") + previous_value + _("'"));
}
i = l; i = l;
} }
template <> void Reader::handle(unsigned int& i) { template <> void Reader::handle(unsigned int& i) {
long l = 0; long l = 0;
getValue().ToLong(&l); if (!getValue().ToLong(&l)) {
warning(_("Expected non-negative integer instead of '") + previous_value + _("'"));
} else if (l < 0) {
warning(wxString::Format(_("Expected non-negative integer instead of %d"),(int)l));
}
i = abs(l); // abs, because it will seem strange if -1 comes out as MAX_INT i = abs(l); // abs, because it will seem strange if -1 comes out as MAX_INT
} }
template <> void Reader::handle(double& d) { template <> void Reader::handle(double& d) {
getValue().ToDouble(&d); if (!getValue().ToDouble(&d)) {
warning(_("Expected floating point number instead of '") + previous_value + _("'"));
}
} }
template <> void Reader::handle(bool& b) { template <> void Reader::handle(bool& b) {
const String& v = getValue(); const String& v = getValue();
b = (v==_("true") || v==_("1") || v==_("yes")); if (v==_("true") || v==_("1") || v==_("yes")) {
b = true;
} else if (v==_("false") || v==_("0") || v==_("no")) {
b = false;
} else {
warning(_("Expected boolean ('true' or 'false') instead of '") + v + _("'"));
}
} }
template <> void Reader::handle(tribool& b) { template <> void Reader::handle(tribool& tb) {
const String& v = getValue(); bool b;
b = (v==_("true") || v==_("1") || v==_("yes")); handle(b);
tb = b;
} }
// ----------------------------------------------------------------------------- : Handling less basic util types // ----------------------------------------------------------------------------- : Handling less basic util types