X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstatement.cpp;h=baa9054e0cfb2f50cbb95ee17074d55dac3b9d0e;hb=256b44a5009467171af53316141277027bcc0ba4;hp=29961a963fcfa97ce6d8461c0a384a64ce465bcd;hpb=727e3ecd534972ce93f90bc5258e7c6c811efaa8;p=libs%2Fdatafile.git

diff --git a/source/statement.cpp b/source/statement.cpp
index 29961a9..baa9054 100644
--- a/source/statement.cpp
+++ b/source/statement.cpp
@@ -1,5 +1,7 @@
 #include <msp/strings/format.h>
 #include "statement.h"
+#include "token.h"
+#include "type.h"
 
 using namespace std;
 
@@ -8,12 +10,14 @@ 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)
 { }
 
@@ -28,10 +32,64 @@ 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;
 }
 
+Statement &Statement::append_from_token(const Token &token)
+{
+	if(token.type==Token::INTEGER)
+		return append(lexical_cast<IntType::Store>(token.str, Fmt().autobase()));
+	else if(token.type==Token::FLOAT)
+		return append(lexical_cast<FloatType::Store>(token.str));
+	else if(token.type==Token::STRING)
+		return append(token.str);
+	else if(token.type==Token::IDENTIFIER)
+	{
+		if(token.str=="true")
+			return append(true);
+		else if(token.str=="false")
+			return append(false);
+		else
+			return append(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(char c: key.signature)
+	{
+		arg_offsets.push_back(args_size);
+		switch(c)
+		{
+		case IntType::signature:
+			args_size += sizeof(IntType::Store);
+			break;
+		case FloatType::signature:
+			args_size += sizeof(FloatType::Store);
+			break;
+		case BoolType::signature:
+			args_size += sizeof(BoolType::Store);
+			break;
+		case StringType::signature:
+			args_size += sizeof(StringType::Store);
+			break;
+		case SymbolType::signature:
+			args_size += sizeof(SymbolType::Store);
+			break;
+		}
+	}
+}
+
 } // namespace DataFile
 } // namespace Msp