made parsing exceptions a little more informative

[l2e.git] / src / loader / Parser.h

diff --git a/src/loader/Parser.h b/src/loader/Parser.h
index 923a42439bdb828b99bb57bee2a7d19077708880..b4f1b8d270b17ff93a02e2388bec310d0609743c 100644 (file)
--- a/src/loader/Parser.h
+++ b/src/loader/Parser.h
@@ -11,6 +11,7 @@
 #include "ParsedSource.h"
 #include "Tokenizer.h"
 
+#include <fstream>
 #include <iosfwd>
 #include <stdexcept>
 #include <string>
@@ -25,7 +26,8 @@ class PropertyList;
 class Parser {
 
 public:
-       Parser(std::istream &in, ParsedSource &product) : tok(in), product(product) { }
+       Parser(const char *file, ParsedSource &product)
+       : file(file), in(file), tok(in), product(product) { }
        ~Parser() { }
 private:
        Parser(const Parser &);
@@ -35,12 +37,19 @@ public:
        void Parse();
 
 public:
-       class ParseError: public std::runtime_error {
+       class Error: public std::runtime_error {
        public:
-               explicit ParseError(const std::string &msg) : std::runtime_error(msg) { };
+               Error(const char *file, int line, const std::string &msg)
+               : std::runtime_error(msg), file(file), line(line) { };
+               const char *File() const { return file; }
+               int Line() const { return line; }
+       private:
+               const char *file;
+               int line;
        };
 
 private:
+       Tokenizer::Token GetToken();
        void ParseStatement();
        void ParseExportDirective();
        void ParseIncludeDirective();
@@ -65,6 +74,8 @@ private:
        bool BeginOfPropertyList(const Tokenizer::Token &) const;
 
 private:
+       const char *file;
+       std::ifstream in;
        Tokenizer tok;
        ParsedSource &product;