#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;
{
if(p.peek(0))
load_direct(p, 0);
- else
+ else if(p) // Peek may have processed an __end, so recheck goodness
{
// Parse in raw mode so we can peek immediately after a mode change
Statement st = p.parse(true);