Cosmetic changes

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

diff --git a/source/statement.h b/source/statement.h
index 1df34381b38630b97494764e5e6c2fd581c0723a..a580f379e47eb5130aa6379aa03d301433ce614b 100644 (file)
--- a/source/statement.h
+++ b/source/statement.h
@@ -7,19 +7,21 @@
 namespace Msp {
 namespace DataFile {
 
-class Statement
+struct Token;
+
+struct Statement
 {
-public:
        typedef std::vector<Value> Arguments;
 
        std::string keyword;
        Arguments args;
-       bool valid;
+       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;
@@ -31,6 +33,8 @@ public:
                return *this;
        }
 
+       Statement &append_from_token(const Token &);
+
        template<typename T>
        Statement &operator,(const T &v)
        { return append(v); }
@@ -41,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;
+       std::size_t args_size = 0;
+       std::vector<std::size_t> arg_offsets;
+
+       StatementInfo() = default;
+       StatementInfo(const std::string &, const std::string &);
+};
+
 } // namespace DataFile
 } // namespace Msp