Move token-to-argument conversion to Statement

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

diff --git a/source/statement.h b/source/statement.h
index b26f2c88efc2f709d5853eb97cc265b1155d823a..9aad48d953226ba0ab1b3b209d88d10460d56f39 100644 (file)
--- a/source/statement.h
+++ b/source/statement.h
@@ -7,16 +7,19 @@
 namespace Msp {
 namespace DataFile {
 
+struct Token;
+
 class Statement
 {
 public:
        typedef std::vector<Value> Arguments;
 
        std::string keyword;
-       Arguments   args;
-       bool        valid;
+       Arguments args;
+       bool valid;
+       bool control;
        std::string source;
-       unsigned    line;
+       unsigned line;
        std::list<Statement> sub;
 
        Statement();
@@ -31,11 +34,35 @@ public:
                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() { }
+       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