From bb5c048950a011f181cb3235ed2b0b2677869171 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Thu, 23 Aug 2007 17:14:32 +0000
Subject: [PATCH] Change mspparser -> mspdatafile

---
 Build              | 2 +-
 source/builder.cpp | 4 ++--
 source/builder.h   | 4 ++--
 source/buildinfo.h | 4 ++--
 source/component.h | 4 ++--
 source/condition.h | 4 ++--
 source/config.cpp  | 2 +-
 source/config.h    | 4 ++--
 source/package.h   | 7 +++----
 9 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/Build b/Build
index 336bc2a..75c7355 100644
--- a/Build
+++ b/Build
@@ -10,7 +10,7 @@ package "builder"
 
 	require "mspcore";
 	require "mspstrings";
-	require "mspparser";
+	require "mspdatafile";
 	require "msppath";
 	require "sigc++-2.0";
 
diff --git a/source/builder.cpp b/source/builder.cpp
index 336cc84..98e2a07 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -10,7 +10,7 @@ Distributed under the LGPL
 #include <set>
 #include <msp/core/error.h>
 #include <msp/core/getopt.h>
-#include <msp/parser/parser.h>
+#include <msp/datafile/parser.h>
 #include <msp/path/utils.h>
 #include <msp/strings/utils.h>
 #include <msp/time/units.h>
@@ -486,7 +486,7 @@ int Builder::load_build_file(const Path::Path &fn)
 	if(!in)
 		return -1;
 
-	Parser::Parser parser(in, fn.str());
+	DataFile::Parser parser(in, fn.str());
 	Loader loader(*this, fn.subpath(0, fn.size()-1));
 	loader.load(parser);
 
diff --git a/source/builder.h b/source/builder.h
index ba20fe3..d2d7598 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -12,7 +12,7 @@ Distributed under the LGPL
 #include <map>
 #include <string>
 #include <msp/core/application.h>
-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.h>
 #include <msp/path/path.h>
 #include "config.h"
 #include "misc.h"
@@ -48,7 +48,7 @@ public:
 
 	static void usage(const char *, const char *, bool);
 private:
-	class Loader: public Msp::Parser::Loader
+	class Loader: public Msp::DataFile::Loader
 	{
 	public:
 		Loader(Builder &, const Msp::Path::Path &);
diff --git a/source/buildinfo.h b/source/buildinfo.h
index fbd186c..d891439 100644
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -10,7 +10,7 @@ Distributed under the LGPL
 
 #include <list>
 #include <string>
-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.h>
 #include "misc.h"
 
 /**
@@ -20,7 +20,7 @@ form.  Allows combining with other BuildInfos to support package dependencies.
 class BuildInfo
 {
 public:
-	class Loader: public Msp::Parser::Loader
+	class Loader: public Msp::DataFile::Loader
 	{
 	public:
 		Loader(BuildInfo &);
diff --git a/source/component.h b/source/component.h
index 143de98..36cd83e 100644
--- a/source/component.h
+++ b/source/component.h
@@ -9,7 +9,7 @@ Distributed under the LGPL
 #define COMPONENT_H_
 
 #include <string>
-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.h>
 #include <msp/path/path.h>
 #include "buildinfo.h"
 #include "misc.h"
@@ -27,7 +27,7 @@ class Component
 {
 public:
 	/// Loads a Component from file.  Used from Package::Loader.
-	class Loader: public Msp::Parser::Loader
+	class Loader: public Msp::DataFile::Loader
 	{
 	public:
 		Loader(Component &);
diff --git a/source/condition.h b/source/condition.h
index f7b7c00..baf718c 100644
--- a/source/condition.h
+++ b/source/condition.h
@@ -8,7 +8,7 @@ Distributed under the LGPL
 #ifndef CONDITION_H_
 #define CONDITION_H_
 
-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.h>
 #include "buildinfo.h"
 #include "misc.h"
 #include "packageref.h"
@@ -18,7 +18,7 @@ class Config;
 class Condition
 {
 public:
-	class Loader: public Msp::Parser::Loader
+	class Loader: public Msp::DataFile::Loader
 	{
 	public:
 		Loader(Condition &);
diff --git a/source/config.cpp b/source/config.cpp
index 854c7e8..74c3741 100644
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -214,7 +214,7 @@ void Config::load()
 	Path::stat(fn, st);
 	mtime=Time::TimeStamp::from_unixtime(st.st_mtime);
 
-	Parser::Parser parser(in, fn.str());
+	DataFile::Parser parser(in, fn.str());
 	Loader loader(*this);
 	loader.load(parser);
 }
diff --git a/source/config.h b/source/config.h
index 69094b5..1b7f853 100644
--- a/source/config.h
+++ b/source/config.h
@@ -10,7 +10,7 @@ Distributed under the LGPL
 
 #include <map>
 #include <string>
-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.h>
 #include <msp/path/path.h>
 #include <msp/time/timestamp.h>
 #include "misc.h"
@@ -50,7 +50,7 @@ public:
 	void finish();
 	void save() const;
 private:
-	class Loader: public Msp::Parser::Loader
+	class Loader: public Msp::DataFile::Loader
 	{
 	public:
 		Loader(Config &);
diff --git a/source/package.h b/source/package.h
index 1aebf16..68af269 100644
--- a/source/package.h
+++ b/source/package.h
@@ -10,7 +10,7 @@ Distributed under the LGPL
 
 #include <list>
 #include <string>
-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.h>
 #include "buildinfo.h"
 #include "component.h"
 #include "condition.h"
@@ -26,8 +26,7 @@ typedef std::list<Package *> PackageList;
 /**
 A package is a distributable piece of software.  They consist of one or more
 Components and may depend on other packages.  Packages also have configuration
-to determine where files are installed and which features to include (features
-NYI).
+to determine where files are installed and which features to include.
 */
 class Package
 {
@@ -41,7 +40,7 @@ public:
 	};
 
 	/// Loads a package from a file.
-	class Loader: public Msp::Parser::Loader
+	class Loader: public Msp::DataFile::Loader
 	{
 	public:
 		Loader(Package &);
-- 
2.45.2