X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstatement.h;h=6a9da0462d8fda6cecbe3d9a2c4bc775c481574f;hb=refs%2Fheads%2Fwip;hp=9aad48d953226ba0ab1b3b209d88d10460d56f39;hpb=193d36c8ce13cf2c5cd055fbd008f3003dda0a3e;p=libs%2Fdatafile.git

diff --git a/source/statement.h b/source/statement.h
index 9aad48d..6a9da04 100644
--- a/source/statement.h
+++ b/source/statement.h
@@ -2,6 +2,7 @@
 #define MSP_DATAFILE_STATEMENT_H_
 
 #include <list>
+#include "mspdatafile_api.h"
 #include "value.h"
 
 namespace Msp {
@@ -9,20 +10,19 @@ namespace DataFile {
 
 struct Token;
 
-class Statement
+struct MSPDATAFILE_API Statement
 {
-public:
 	typedef std::vector<Value> Arguments;
 
 	std::string keyword;
 	Arguments args;
-	bool valid;
-	bool control;
+	bool valid = false;
+	bool control = false;
 	std::string source;
-	unsigned line;
+	unsigned line = 0;
 	std::list<Statement> sub;
 
-	Statement();
+	Statement() = default;
 	Statement(const std::string &);
 	std::string get_location() const;
 	std::string get_signature() const;
@@ -46,7 +46,7 @@ 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
@@ -56,10 +56,10 @@ struct StatementKey
 struct StatementInfo
 {
 	StatementKey key;
-	unsigned args_size;
-	std::vector<unsigned> arg_offsets;
+	std::size_t args_size = 0;
+	std::vector<std::size_t> arg_offsets;
 
-	StatementInfo();
+	StatementInfo() = default;
 	StatementInfo(const std::string &, const std::string &);
 };