Turn Statement into a struct

[libs/datafile.git] / source / statement.h

diff --git a/source/statement.h b/source/statement.h
index 1df34381b38630b97494764e5e6c2fd581c0723a..3aa60045399dcff715bfcecf07db14fe942b4716 100644 (file)
--- a/source/statement.h
+++ b/source/statement.h
@@ -7,14 +7,16 @@
 namespace Msp {
 namespace DataFile {
 
-class Statement
+struct Token;
+
+struct Statement
 {
-public:
        typedef std::vector<Value> Arguments;
 
        std::string keyword;
        Arguments args;
        bool valid;
+       bool control;
        std::string source;
        unsigned line;
        std::list<Statement> sub;
@@ -31,6 +33,8 @@ public:
                return *this;
        }
 
+       Statement &append_from_token(const Token &);
+
        template<typename T>
        Statement &operator,(const T &v)
        { return append(v); }
@@ -48,6 +52,16 @@ struct StatementKey
        { 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