Change mspparser -> mspdatafile

diff --git a/Build b/Build
index 336bc2a37c55cdf4c2d761dbe093f5818447100c..75c735503b6272b8f2518143aa633cb64724b854 100644 (file)
--- 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 336cc8453c118e519b266c8a2ebc8c757385e9dc..98e2a0721c0895308f19c828d9a01eb22c9c3c3f 100644 (file)
--- 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 ba20fe3234f2987916bd00dedab1bf2dc961134f..d2d7598eda39445aa14596d421c67f1e64e27d2a 100644 (file)
--- 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 fbd186c617d1af03a239a30e262175dbf79625fa..d891439377c9d0ba440a4e8568a981d5af82deb4 100644 (file)
--- 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 143de983cb91e66c232cbd0590e0a47236e992ed..36cd83e8a800795569c5d3a05d26c330677d37ec 100644 (file)
--- 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 f7b7c003a5a48387e1a899deb54f89b583495bf8..baf718cc43d5755265345235ad7a1bc63d250f30 100644 (file)
--- 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 854c7e817d39f58876132a9bd5a482cafd64c3d5..74c3741466ae33131aa58d76551467c174f25dd6 100644 (file)
--- 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 69094b59777027e5e08056ae6e37408b372feb98..1b7f853b21d11312ec3cecaeea0a8e7b21ac7bc6 100644 (file)
--- 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 1aebf163865a98c290d5a668a55cf8ffc790b9d3..68af269a9c6b4d0575e0dedfba9ca9b5c0c2e924 100644 (file)
--- 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 &);