added exceptions to meminfomanager

develop
mizipzor 2010-02-28 21:44:14 +01:00
parent c13e37adf6
commit 160992ec9c
2 changed files with 148 additions and 69 deletions

@ -108,7 +108,96 @@ namespace DFHack
virtual const char* what() const throw() virtual const char* what() const throw()
{ {
return "memory definition missing"; std::stringstream s;
s << "memory definition missing: type " << type << " key " << key;
return s.str().c_str();
}
};
// Syntax errors and whatnot, the xml cant be read
class DFHACK_EXPORT MemoryXmlParse : public std::exception
{
public:
MemoryXmlParse(const char* _desc, int _id, int _row, int _col) :
desc(_desc), id(_id), row(_row), col(_col) {}
const std::string desc;
const int id;
const int row;
const int col;
virtual const char* what() const throw()
{
std::stringstream s;
s << "error " << id << ": " << desc << ", at row " << row << " col " << col;
return s.str().c_str();
}
};
class DFHACK_EXPORT MemoryXmlBadAttribute : public std::exception
{
public:
MemoryXmlBadAttribute(const char* _attr) : attr(_attr) {}
std::string attr;
virtual const char* what() const throw()
{
std::stringstream s;
s << "attribute is either missing or invalid: " << attr;
return s.str().c_str();
}
};
class DFHACK_EXPORT MemoryXmlNoRoot : public std::exception
{
public:
MemoryXmlNoRoot() {}
virtual const char* what() const throw()
{
return "no pElem found";
}
};
class DFHACK_EXPORT MemoryXmlNoDFExtractor : public std::exception
{
public:
MemoryXmlNoDFExtractor(const char* _name) : name(_name) {}
std::string name;
virtual const char* what() const throw()
{
std::stringstream s;
s << "DFExtractor != " << name;
return s.str().c_str();
}
};
class DFHACK_EXPORT MemoryXmlUnderspecifiedEntry : public std::exception
{
public:
MemoryXmlUnderspecifiedEntry() {}
virtual const char* what() const throw()
{
return "underspecified MemInfo entry, each entry needs to set both the name attribute and have a value";
}
};
class DFHACK_EXPORT MemoryXmlUnknownType : public std::exception
{
public:
MemoryXmlUnknownType(const char* _type) : type(_type) {}
std::string type;
virtual const char* what() const throw()
{
std::stringstream s;
s << "unknown MemInfo type: " << type;
return s.str().c_str();
} }
}; };
} }

@ -102,13 +102,11 @@ void MemInfoManager::ParseEntry (TiXmlElement* entry, memory_info* mem, map <str
ParseEntry(knownEntries[base], mem, knownEntries); ParseEntry(knownEntries[base], mem, knownEntries);
} }
// mandatory attributes missing? if (!cstr_version)
if(!(cstr_version && cstr_os)) throw Error::MemoryXmlBadAttribute("version");
{ if (!cstr_os)
cerr << "Bad entry in memory.xml detected, version or os attribute is missing."; throw Error::MemoryXmlBadAttribute("os");
// skip if we don't have valid attributes
return;
}
string os = cstr_os; string os = cstr_os;
mem->setVersion(cstr_version); mem->setVersion(cstr_version);
mem->setOS(cstr_os); mem->setOS(cstr_os);
@ -139,8 +137,7 @@ void MemInfoManager::ParseEntry (TiXmlElement* entry, memory_info* mem, map <str
} }
else else
{ {
cerr << "unknown operating system " << os << endl; throw Error::MemoryXmlBadAttribute("os");
return;
} }
// process additional entries // process additional entries
@ -160,10 +157,9 @@ void MemInfoManager::ParseEntry (TiXmlElement* entry, memory_info* mem, map <str
ParseVTable(pMemEntry, mem); ParseVTable(pMemEntry, mem);
continue; continue;
} }
if( !(cstr_name && cstr_value)) if(!(cstr_name && cstr_value))
{ {
cerr << "underspecified MemInfo entry" << endl; throw Error::MemoryXmlUnderspecifiedEntry();
continue;
} }
name = cstr_name; name = cstr_name;
value = cstr_value; value = cstr_value;
@ -205,7 +201,7 @@ void MemInfoManager::ParseEntry (TiXmlElement* entry, memory_info* mem, map <str
} }
else else
{ {
cerr << "Unknown MemInfo type: " << type << endl; throw Error::MemoryXmlUnknownType(type.c_str());
} }
} // for } // for
} // method } // method
@ -220,30 +216,32 @@ MemInfoManager::MemInfoManager(string path_to_xml)
bool MemInfoManager::loadFile(string path_to_xml) bool MemInfoManager::loadFile(string path_to_xml)
{ {
TiXmlDocument doc( path_to_xml.c_str() ); TiXmlDocument doc( path_to_xml.c_str() );
bool loadOkay = doc.LoadFile(); //bool loadOkay = doc.LoadFile();
if (!doc.LoadFile())
{
error = true;
throw Error::MemoryXmlParse(doc.ErrorDesc(), doc.ErrorId(), doc.ErrorRow(), doc.ErrorCol());
}
TiXmlHandle hDoc(&doc); TiXmlHandle hDoc(&doc);
TiXmlElement* pElem; TiXmlElement* pElem;
TiXmlHandle hRoot(0); TiXmlHandle hRoot(0);
memory_info mem; memory_info mem;
if ( loadOkay )
{
// block: name // block: name
{ {
pElem=hDoc.FirstChildElement().Element(); pElem=hDoc.FirstChildElement().Element();
// should always have a valid root but handle gracefully if it does // should always have a valid root but handle gracefully if it does
if (!pElem) if (!pElem)
{ {
cerr << "no pElem found" << endl; error = true;
return false; throw Error::MemoryXmlNoRoot();
} }
string m_name=pElem->Value(); string m_name=pElem->Value();
if(m_name != "DFExtractor") if(m_name != "DFExtractor")
{ {
cerr << "DFExtractor != " << m_name << endl; error = true;
return false; throw Error::MemoryXmlNoDFExtractor(m_name.c_str());
} }
//cout << "got DFExtractor XML!" << endl;
// save this for later // save this for later
hRoot=TiXmlHandle(pElem); hRoot=TiXmlHandle(pElem);
} }
@ -279,12 +277,4 @@ bool MemInfoManager::loadFile(string path_to_xml)
} }
error = false; error = false;
return true; return true;
}
else
{
// load failed
cerr << "Can't load memory offsets from memory.xml" << endl;
error = true;
return false;
}
} }