Rename to datafile

diff --git a/Build b/Build
index 5c826b0d1ff913074d084f6b33e0a69ec9200ef7..36621950cda7c0c62ed7d6fad928636db64efd04 100644 (file)
--- a/Build
+++ b/Build
@@ -1,14 +1,16 @@
-package "mspparser"
+/* $Id$ */
+
+package "mspdatafile"
 {
        version "0.2";
-       description "Mikkosoft Productions datafile parser";
+       description "Mikkosoft Productions datafile library";
 
        require "mspcore";
 
-       library "mspparser"
+       library "mspdatafile"
        {
                source "source";
                install true;
-               install_headers "msp/parser";
+               install_headers "msp/datafile";
        };
 };

diff --git a/source/constant.h b/source/constant.h
index 0ff3e32a222283c69080b2b5d36b131a500626bc..6f68bf02906e5b1d566396413a9538f98e497354 100644 (file)
--- a/source/constant.h
+++ b/source/constant.h
@@ -1,10 +1,11 @@
-/*
-This file is part of libmspparser
+/* $Id$
+
+This file is part of libmspdatafile
 Copyright © 2006  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
-#ifndef MSP_PARSER_CONSTANT_H_
-#define MSP_PARSER_CONSTANT_H_
+#ifndef MSP_DATAFILE_CONSTANT_H_
+#define MSP_DATAFILE_CONSTANT_H_
 
 class Constant
 {

diff --git a/source/error.h b/source/error.h
index f8f7abd84c13fd9bb3d9c318306dd81fe8550d45..11bccd88a2459ed1433d4ec70119245df095fe12 100644 (file)
--- a/source/error.h
+++ b/source/error.h
@@ -1,10 +1,16 @@
-#ifndef MSP_PARSER_ERROR_H_
-#define MSP_PARSER_ERROR_H_
+/* $Id$
+
+This file is part of libmspdatafile
+Copyright © 2006  Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+#ifndef MSP_DATAFILE_ERROR_H_
+#define MSP_DATAFILE_ERROR_H_
 
 #include <msp/core/error.h>
 
 namespace Msp {
-namespace Parser {
+namespace DataFile {
 
 class TypeError: public Exception
 {
@@ -24,7 +30,7 @@ private:
        unsigned    line;
 };
 
-} // namespace Parser
+} // namespace DataFile
 } // namespace Msp
 
 #endif

diff --git a/source/input.cpp b/source/input.cpp
index 0f23bb29b9797bff09fc738dc52be6e7aeddf8e7..c421f01b977c36797d95c41d60f3787f4bdf3ac4 100644 (file)
--- a/source/input.cpp
+++ b/source/input.cpp
@@ -1,12 +1,13 @@
-/*
-This file is part of libmspparser
+/* $Id$
+
+This file is part of libmspdatafile
 Copyright © 2006  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 #include "input.h"
 
 namespace Msp {
-namespace Parser {
+namespace DataFile {
 
 Input::Input(std::istream &i):
        in(i),
@@ -33,5 +34,5 @@ int Input::peek()
        return next;
 }
 
-} // namespace Parser
+} // namespace DataFile
 } // namespace Msp

diff --git a/source/input.h b/source/input.h
index f5cd3ed24c605797aa0223f5d922cc1ea87f2d01..e03dea1e839714e23416b8fed7fea7cb68f8ed97 100644 (file)
--- a/source/input.h
+++ b/source/input.h
@@ -1,15 +1,16 @@
-/*
-This file is part of libmspparser
+/* $Id$
+
+This file is part of libmspdatafile
 Copyright © 2006  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
-#ifndef MSP_PARSER_INPUT_H_
-#define MSP_PARSER_INPUT_H_
+#ifndef MSP_DATAFILE_INPUT_H_
+#define MSP_DATAFILE_INPUT_H_
 
 #include <istream>
 
 namespace Msp {
-namespace Parser {
+namespace DataFile {
 
 class Input
 {   
@@ -25,7 +26,7 @@ private:
        int next;
 };  
 
-} // namespace Parser
+} // namespace DataFile
 } // namespace Msp
 
 #endif

diff --git a/source/loader.h b/source/loader.h
index 39a50d0b7fe4a56b88a28ec1be68c82e78ed0d5e..48d4f9b4757842a7fcdf983d12badb15895d7499 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -1,10 +1,11 @@
-/*
-This file is part of libmspparser
+/* $Id$
+
+This file is part of libmspdatafile
 Copyright © 2006  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
-#ifndef MSP_PARSER_LOADER_H_
-#define MSP_PARSER_LOADER_H_
+#ifndef MSP_DATAFILE_LOADER_H_
+#define MSP_DATAFILE_LOADER_H_
 
 #include <fstream>
 #include <map>
@@ -14,7 +15,7 @@ Distributed under the LGPL
 #include "value.h"
 
 namespace Msp {
-namespace Parser {
+namespace DataFile {
 
 class Loader;
 class Statement;
@@ -218,7 +219,7 @@ void load(T &obj, const std::string &fn)
        loader.load(parser);
 }
 
-} // namespace Parser
+} // namespace DataFile
 } // namespace Msp
 
 #endif

diff --git a/source/parser.cpp b/source/parser.cpp
index c47969bb2f3f30c5e194f534fbae6ff72884a3ad..8fccec2f94c208d93f966ec88f4279eeb133b081 100644 (file)
--- a/source/parser.cpp
+++ b/source/parser.cpp
@@ -1,5 +1,6 @@
-/*
-This file is part of libmspparser
+/* $Id$
+
+This file is part of libmspdatafile
 Copyright © 2006  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
@@ -13,7 +14,7 @@ Distributed under the LGPL
 using namespace std;
 
 namespace Msp {
-namespace Parser {
+namespace DataFile {
 
 Parser::Parser(istream &i, const string &s):
        in(i),
@@ -375,5 +376,5 @@ void Parser::parse_error(int c, int state)
        throw ParseError(ss.str(), src, in.get_line_number());
 }
 
-} // namespace Parser
+} // namespace DataFile
 } // namespace Msp

diff --git a/source/parser.h b/source/parser.h
index 9b847c6675d7d397904b190355767c7b807c525f..e127c5b3653fbfd02e77bbec7c344e5061ed113e 100644 (file)
--- a/source/parser.h
+++ b/source/parser.h
@@ -1,17 +1,18 @@
-/*
-This file is part of libmspparser
+/* $Id$
+
+This file is part of libmspdatafile
 Copyright © 2006  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
-#ifndef MSP_PARSER_PARSER_H_
-#define MSP_PARSER_PARSER_H_
+#ifndef MSP_DATAFILE_PARSER_H_
+#define MSP_DATAFILE_PARSER_H_
 
 #include <istream>
 #include <string>
 #include "input.h"
 
 namespace Msp {
-namespace Parser {
+namespace DataFile {
 
 class Statement;
 struct Token;
@@ -36,7 +37,7 @@ private:
        void  parse_error(int, int);
 };
 
-} // namespace Parser
+} // namespace DataFile
 } // namespace Msp
 
 #endif

diff --git a/source/statement.h b/source/statement.h
index 3c843bfeb0c74d06093f7c3051bb8ff44165bd37..6b3c54b8b7989d386fff3c3cb98ef3354f5433ad 100644 (file)
--- a/source/statement.h
+++ b/source/statement.h
@@ -1,10 +1,11 @@
-/*
-This file is part of libmspparser
+/* $Id$
+
+This file is part of libmspdatafile
 Copyright © 2006  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>
@@ -12,7 +13,7 @@ Distributed under the LGPL
 #include "value.h"
 
 namespace Msp {
-namespace Parser {
+namespace DataFile {
 
 class Statement
 {
@@ -29,7 +30,7 @@ public:
        { std::ostringstream ss; ss<<source<<':'<<line; return ss.str(); }
 };
 
-} // namespace Parser
+} // namespace DataFile
 } // namespace Msp
 
 #endif

diff --git a/source/token.h b/source/token.h
index 4e25f46f27d56cf06e0617d25fde6b23865e238f..ae4961947e6e3730359d5c8de4dbc761347469d5 100644 (file)
--- a/source/token.h
+++ b/source/token.h
@@ -1,13 +1,14 @@
-/*
-This file is part of libmspparser
+/* $Id$
+
+This file is part of libmspdatafile
 Copyright © 2006  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
-#ifndef MSP_PARSER_TOKEN_H_
-#define MSP_PARSER_TOKEN_H_
+#ifndef MSP_DATAFILE_TOKEN_H_
+#define MSP_DATAFILE_TOKEN_H_
 
 namespace Msp {
-namespace Parser {
+namespace DataFile {
 
 struct Token
 {
@@ -27,7 +28,7 @@ struct Token
        Token(Type t, const std::string &s): type(t), str(s) { }
 };
 
-} // namespace Parser
+} // namespace DataFile
 } // namespace Msp
 
 #endif

diff --git a/source/value.h b/source/value.h
index 5fc3540f763ee9a2a8d4de12f623d5b2f77eccb3..5ebbb5e1e52a101f475e7914089ed21b6febf051 100644 (file)
--- a/source/value.h
+++ b/source/value.h
@@ -1,10 +1,11 @@
-/*
-This file is part of libmspparser
+/* $Id$
+
+This file is part of libmspdatafile
 Copyright © 2006  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
-#ifndef MSP_PARSER_VALUE_H_
-#define MSP_PARSER_VALUE_H_
+#ifndef MSP_DATAFILE_VALUE_H_
+#define MSP_DATAFILE_VALUE_H_
 
 #include <sstream>
 #include <string>
@@ -12,7 +13,7 @@ Distributed under the LGPL
 #include "error.h"
 
 namespace Msp {
-namespace Parser {
+namespace DataFile {
 
 class Value
 {
@@ -87,7 +88,7 @@ inline const std::string &Value::get<const std::string&>() const
        return data;
 }
 
-} // namespace Parser
+} // namespace DataFile
 } // namespace Msp
 
 #endif