X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fparser.h;h=1437190b606b89640afabd4619a62c4fe21f65c8;hb=HEAD;hp=243db1feb5fd186aa8eda14e93ad9a71bc5f113c;hpb=3b78eeb8b92dc3524d6a0456b4daf0a0f3dbf813;p=libs%2Fdatafile.git

diff --git a/source/parser.h b/source/parser.h
index 243db1f..ed7a037 100644
--- a/source/parser.h
+++ b/source/parser.h
@@ -2,6 +2,7 @@
 #define MSP_DATAFILE_PARSER_H_
 
 #include <string>
+#include <msp/core/noncopyable.h>
 #include "input.h"
 
 namespace Msp {
@@ -10,22 +11,22 @@ namespace DataFile {
 class Loader;
 class LoaderAction;
 class ParserMode;
-class Statement;
-class StatementKey;
+struct Statement;
+struct StatementKey;
 
 /**
 Frontend for loading datafiles.  Handles switching between text and binary
 formats.  A Parser evaluates into a boolean value indicating whether more
 statements may be read.
 */
-class Parser
+class Parser: private NonCopyable
 {
 private:
 	Input in;
 	std::string main_src;
 	std::string src;
-	bool good;
-	ParserMode *mode;
+	bool good = true;
+	ParserMode *mode = nullptr;
 
 public:
 	Parser(IO::Base &i, const std::string &s);
@@ -50,7 +51,7 @@ public:
 	statement's signature. */
 	bool parse_and_load(unsigned, Loader &, const LoaderAction &);
 
-	operator bool() const { return good && in; }
+	explicit operator bool() const { return good && in; }
 };
 
 } // namespace DataFile