X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Fstatement.cpp;h=9dfb54421a47c6f041b344cc175a6c67e232f43c;hp=3b6f7165b0ef1fa50874c255b12cd987c2563b22;hb=cd3de49e76305a50ae61696210ce10804a59cef1;hpb=3b78eeb8b92dc3524d6a0456b4daf0a0f3dbf813

diff --git a/source/statement.cpp b/source/statement.cpp
index 3b6f716..9dfb544 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;
@@ -9,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)
 { }
 
@@ -34,6 +37,27 @@ string Statement::get_signature() const
 	return result;
 }
 
+Statement &Statement::append_from_token(const Token &token)
+{
+	if(token.type==Token::INTEGER)
+		return append(lexical_cast<IntType::Store>(token.str));
+	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)