X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FParser.h;h=a1c98c83f188a9b5c19c9e20803adc91ec43d5a5;hb=0911d263c10cca314305799d5b839ee9653cac0b;hp=923a42439bdb828b99bb57bee2a7d19077708880;hpb=af9e0b57dac45dc5591f16fb34236b1356cda8a2;p=l2e.git

diff --git a/src/loader/Parser.h b/src/loader/Parser.h
index 923a424..a1c98c8 100644
--- a/src/loader/Parser.h
+++ b/src/loader/Parser.h
@@ -1,31 +1,28 @@
-/*
- * Parser.h
- *
- *  Created on: Aug 26, 2012
- *      Author: holy
- */
-
 #ifndef LOADER_PARSER_H_
 #define LOADER_PARSER_H_
 
-#include "ParsedSource.h"
+namespace loader {
+	class Definition;
+	class Declaration;
+	class Literal;
+	class ParsedSource;
+	class PropertyList;
+	class Value;
+}
+
 #include "Tokenizer.h"
 
+#include <fstream>
 #include <iosfwd>
 #include <stdexcept>
 #include <string>
 
 namespace loader {
 
-class Declaration;
-class Definition;
-class Literal;
-class PropertyList;
-
 class Parser {
 
 public:
-	Parser(std::istream &in, ParsedSource &product) : tok(in), product(product) { }
+	Parser(const std::string &file, ParsedSource &product);
 	~Parser() { }
 private:
 	Parser(const Parser &);
@@ -35,12 +32,20 @@ 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 std::string &file, int line, const std::string &msg)
+		: std::runtime_error(msg), file(file), line(line) { };
+		~Error() throw() { }
+		const std::string &File() const { return file; }
+		int Line() const { return line; }
+	private:
+		std::string file;
+		int line;
 	};
 
 private:
+	Tokenizer::Token GetToken();
 	void ParseStatement();
 	void ParseExportDirective();
 	void ParseIncludeDirective();
@@ -57,14 +62,20 @@ private:
 	Literal *ParseArray();
 	Literal *ParseColor();
 	Literal *ParseVector();
+	Literal *ParseScript();
 
 private:
 	void AssertTokenType(Tokenizer::Token::Type actual, Tokenizer::Token::Type expected);
 	void AssertTokenType(Tokenizer::Token::Type actual, Tokenizer::Token::Type expected, const std::string &msg);
 	bool BeginningOfLiteral(const Tokenizer::Token &) const;
+	bool BeginningOfPrimitiveLiteral(const Tokenizer::Token &) const;
 	bool BeginOfPropertyList(const Tokenizer::Token &) const;
+	bool BeginningOfScriptLiteral(const Tokenizer::Token &) const;
 
 private:
+	std::string file;
+	std::string dirname;
+	std::ifstream in;
 	Tokenizer tok;
 	ParsedSource &product;
 
@@ -72,4 +83,4 @@ private:
 
 }
 
-#endif /* LOADER_PARSER_H_ */
+#endif