X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FParser.h;h=ebfeafaacf0f9c081a0c60512818647ff0311350;hb=09e8cfd4d7b2d187fed0870ebdb2e9e3f77fe4b9;hp=b4f1b8d270b17ff93a02e2388bec310d0609743c;hpb=8d3decb97c252bc7b0ba4b9b5def0b04dfcb8e00;p=l2e.git diff --git a/src/loader/Parser.h b/src/loader/Parser.h index b4f1b8d..ebfeafa 100644 --- a/src/loader/Parser.h +++ b/src/loader/Parser.h @@ -26,8 +26,7 @@ class PropertyList; class Parser { public: - Parser(const char *file, ParsedSource &product) - : file(file), in(file), tok(in), product(product) { } + Parser(const std::string &file, ParsedSource &product); ~Parser() { } private: Parser(const Parser &); @@ -39,12 +38,13 @@ public: public: class Error: public std::runtime_error { public: - Error(const char *file, int line, const std::string &msg) + Error(const std::string &file, int line, const std::string &msg) : std::runtime_error(msg), file(file), line(line) { }; - const char *File() const { return file; } + ~Error() throw() { } + const std::string &File() const { return file; } int Line() const { return line; } private: - const char *file; + std::string file; int line; }; @@ -74,7 +74,8 @@ private: bool BeginOfPropertyList(const Tokenizer::Token &) const; private: - const char *file; + std::string file; + std::string dirname; std::ifstream in; Tokenizer tok; ParsedSource &product;