Cosmetic changes

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

diff --git a/source/statement.h b/source/statement.h
index efc097bd7e11b4c100627fbd9dcf8a5776433cc0..a580f379e47eb5130aa6379aa03d301433ce614b 100644 (file)
--- a/source/statement.h
+++ b/source/statement.h
@@ -1,9 +1,3 @@
-/* $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_
 
@@ -13,32 +7,61 @@ Distributed under the LGPL
 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) { }
-       Statement(const std::string &kw): keyword(kw), valid(true), line(0) { }
+       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(Value(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
 } // namespace Msp