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

diff --git a/source/statement.cpp b/source/statement.cpp
index b1ff058..baa9054 100644
--- a/source/statement.cpp
+++ b/source/statement.cpp
@@ -1,5 +1,6 @@
 #include <msp/strings/format.h>
 #include "statement.h"
+#include "token.h"
 #include "type.h"
 
 using namespace std;
@@ -31,11 +32,32 @@ 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)
@@ -45,10 +67,10 @@ 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);