X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstatement.h;h=a580f379e47eb5130aa6379aa03d301433ce614b;hb=8a4fca97e2bf3a3934399123e8f7cbd591912f83;hp=6b3c54b8b7989d386fff3c3cb98ef3354f5433ad;hpb=8ff59df1f2e603557eceacbc81a8dc44de051dae;p=libs%2Fdatafile.git

diff --git a/source/statement.h b/source/statement.h
index 6b3c54b..a580f37 100644
--- a/source/statement.h
+++ b/source/statement.h
@@ -1,33 +1,65 @@
-/* $Id$
-
-This file is part of libmspdatafile
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
 #ifndef MSP_DATAFILE_STATEMENT_H_
 #define MSP_DATAFILE_STATEMENT_H_
 
 #include <list>
-#include <sstream>
-#include <vector>
 #include "value.h"
 
 namespace Msp {
 namespace DataFile {
 
-class Statement
+struct Token;
+
+struct Statement
 {
-public:
+	typedef std::vector<Value> Arguments;
+
 	std::string keyword;
-	ValueArray  args;
-	bool        valid;
+	Arguments args;
+	bool valid = false;
+	bool control = false;
 	std::string source;
-	unsigned    line;
+	unsigned line = 0;
 	std::list<Statement> sub;
 
-	Statement(): valid(false), line(0) { }
-	std::string get_location() const
-	{ std::ostringstream ss; ss<<source<<':'<<line; return ss.str(); }
+	Statement() = default;
+	Statement(const std::string &);
+	std::string get_location() const;
+	std::string get_signature() const;
+	
+	template<typename T>
+	Statement &append(const T &v)
+	{
+		args.push_back(v);
+		return *this;
+	}
+
+	Statement &append_from_token(const Token &);
+
+	template<typename T>
+	Statement &operator,(const T &v)
+	{ return append(v); }
+};
+
+struct StatementKey
+{
+	std::string keyword;
+	std::string signature;
+
+	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;
+	std::size_t args_size = 0;
+	std::vector<std::size_t> arg_offsets;
+
+	StatementInfo() = default;
+	StatementInfo(const std::string &, const std::string &);
 };
 
 } // namespace DataFile