#include <msp/core/raii.h>
#include <msp/strings/format.h>
-#include "dataerror.h"
+#include "except.h"
#include "loader.h"
#include "type.h"
else if(act_sig.size()==2 && act_sig[1]=='*')
{
for(string::const_iterator i=st_sig.begin(); i!=st_sig.end(); ++i)
- if(*i!=act_sig[0])
+ if(!signature_match(*i, act_sig[0]))
return false;
return true;
namespace Msp {
namespace DataFile {
-class unknown_keyword: public runtime_error
-{
-public:
- unknown_keyword(const std::string &k):
- runtime_error(k)
- { }
-
- virtual ~unknown_keyword() throw() { }
-};
-
-
-class invalid_signature: public runtime_error
-{
-public:
- invalid_signature(const std::string &k, const std::string &s):
- runtime_error(format("%s %s", k, s))
- { }
-
- virtual ~invalid_signature() throw() { }
-};
-
-
Loader::Loader():
cur_st(0),
direct(false),