Rewrite the type system

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

diff --git a/source/statement.h b/source/statement.h
index 3c843bfeb0c74d06093f7c3051bb8ff44165bd37..e7e9861cf8f803509e6e28b199dcf3c80e3d632e 100644 (file)
--- a/source/statement.h
+++ b/source/statement.h
@@ -1,35 +1,49 @@
-/*
-This file is part of libmspparser
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
+/* $Id$
+
+This file is part of libmspdatafile
+Copyright © 2006-2008, 2010  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
-#ifndef MSP_PARSER_STATEMENT_H_
-#define MSP_PARSER_STATEMENT_H_
+
+#ifndef MSP_DATAFILE_STATEMENT_H_
+#define MSP_DATAFILE_STATEMENT_H_
 
 #include <list>
-#include <sstream>
-#include <vector>
 #include "value.h"
 
 namespace Msp {
-namespace Parser {
+namespace DataFile {
 
 class Statement
 {
 public:
+       typedef std::vector<Value> Arguments;
+
        std::string keyword;
-       ValueArray  args;
+       Arguments   args;
        bool        valid;
        std::string source;
        unsigned    line;
        std::list<Statement> sub;
 
-       Statement(): valid(false), line(0) { }
-       std::string get_location() const
-       { std::ostringstream ss; ss<<source<<':'<<line; return ss.str(); }
+       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(v);
+               return *this;
+       }
+
+       template<typename T>
+       Statement &operator,(const T &v)
+       { return append(v); }
 };
 
-} // namespace Parser
+} // namespace DataFile
 } // namespace Msp
 
 #endif