Restructure control statement processing

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

diff --git a/source/statement.h b/source/statement.h
index efc097bd7e11b4c100627fbd9dcf8a5776433cc0..80b7b15af8da82566f3526d1494e82a3a787c2e4 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_
 
@@ -16,21 +10,25 @@ namespace DataFile {
 class Statement
 {
 public:
+       typedef std::vector<Value> Arguments;
+
        std::string keyword;
-       ValueArray  args;
-       bool        valid;
+       Arguments args;
+       bool valid;
+       bool control;
        std::string source;
-       unsigned    line;
+       unsigned line;
        std::list<Statement> sub;
 
-       Statement(): valid(false), line(0) { }
-       Statement(const std::string &kw): keyword(kw), valid(true), line(0) { }
+       Statement();
+       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;
        }
 
@@ -39,6 +37,18 @@ public:
        { 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); }
+};
+
 } // namespace DataFile
 } // namespace Msp