From 8ff59df1f2e603557eceacbc81a8dc44de051dae Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Tue, 21 Aug 2007 14:11:23 +0000 Subject: [PATCH] Rename to datafile --- Build | 10 ++++++---- source/constant.h | 9 +++++---- source/error.h | 14 ++++++++++---- source/input.cpp | 9 +++++---- source/input.h | 13 +++++++------ source/loader.h | 13 +++++++------ source/parser.cpp | 9 +++++---- source/parser.h | 13 +++++++------ source/statement.h | 13 +++++++------ source/token.h | 13 +++++++------ source/value.h | 13 +++++++------ 11 files changed, 73 insertions(+), 56 deletions(-) diff --git a/Build b/Build index 5c826b0..3662195 100644 --- 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 0ff3e32..6f68bf0 100644 --- 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 f8f7abd..11bccd8 100644 --- 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 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 0f23bb2..c421f01 100644 --- 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 f5cd3ed..e03dea1 100644 --- 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 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 39a50d0..48d4f9b 100644 --- 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 #include @@ -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 c47969b..8fccec2 100644 --- 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 9b847c6..e127c5b 100644 --- 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 #include #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 3c843bf..6b3c54b 100644 --- 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 #include @@ -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< #include @@ -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 return data; } -} // namespace Parser +} // namespace DataFile } // namespace Msp #endif -- 2.43.0