namespace Msp {
namespace DataFile {
-Statement::Statement():
- valid(false),
- control(false),
- line(0)
-{ }
-
Statement::Statement(const string &kw):
keyword(kw),
valid(true),
- control(!kw.compare(0, 2, "__")),
- line(0)
+ control(!kw.compare(0, 2, "__"))
{ }
string Statement::get_location() const
string Statement::get_signature() const
{
string result;
- for(Arguments::const_iterator i=args.begin(); i!=args.end(); ++i)
- result += i->get_signature();
+ for(const Value &a: args)
+ result += a.get_signature();
return result;
}
else if(token.str=="false")
return append(false);
else
- return append(Symbol(token.str));
+ return append(Value(Symbol(token.str)));
}
else
throw invalid_argument("Statement::append_from_token");
}
-StatementInfo::StatementInfo():
- args_size(0)
-{ }
-
StatementInfo::StatementInfo(const string &k, const string &s):
key(k, s),
args_size(0)
{
- for(string::const_iterator i=key.signature.begin(); i!=key.signature.end(); ++i)
+ for(char c: key.signature)
{
arg_offsets.push_back(args_size);
- switch(*i)
+ switch(c)
{
case IntType::signature:
args_size += sizeof(IntType::Store);