X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstatement.h;h=cd1797c4551d7c702347f91ba6631da8d06c2c7a;hb=a2cce9e933089f483163456e9872e005c33dd678;hp=80b7b15af8da82566f3526d1494e82a3a787c2e4;hpb=29fafaa2c570b0cf92f41eeb534cfb65a841a892;p=libs%2Fdatafile.git

diff --git a/source/statement.h b/source/statement.h
index 80b7b15..cd1797c 100644
--- a/source/statement.h
+++ b/source/statement.h
@@ -7,9 +7,10 @@
 namespace Msp {
 namespace DataFile {
 
-class Statement
+struct Token;
+
+struct Statement
 {
-public:
 	typedef std::vector<Value> Arguments;
 
 	std::string keyword;
@@ -32,6 +33,8 @@ public:
 		return *this;
 	}
 
+	Statement &append_from_token(const Token &);
+
 	template<typename T>
 	Statement &operator,(const T &v)
 	{ return append(v); }
@@ -42,13 +45,23 @@ struct StatementKey
 	std::string keyword;
 	std::string signature;
 
-	StatementKey() { }
+	StatementKey() = default;
 	StatementKey(const std::string &k, const std::string &s): keyword(k), signature(s) { }
 
 	bool operator<(const StatementKey &o) const
 	{ return keyword<o.keyword || (keyword==o.keyword && signature<o.signature); }
 };
 
+struct StatementInfo
+{
+	StatementKey key;
+	unsigned args_size;
+	std::vector<unsigned> arg_offsets;
+
+	StatementInfo();
+	StatementInfo(const std::string &, const std::string &);
+};
+
 } // namespace DataFile
 } // namespace Msp