X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fparser.h;h=376ccc6cd77fa996d02aeff1aa0baf59aea6167b;hb=69680f4d284cdf7b16a2966250a88ab1257862f3;hp=58b14b502f5bf550e1285098a651662fcf653bbe;hpb=9d798ac368bfd236a7632a3a15e51bd1112ea63d;p=libs%2Fgl.git

diff --git a/source/glsl/parser.h b/source/glsl/parser.h
index 58b14b50..376ccc6c 100644
--- a/source/glsl/parser.h
+++ b/source/glsl/parser.h
@@ -16,28 +16,33 @@ class Parser
 {
 private:
 	std::string source;
-	unsigned source_index;
+	int base_index;
+	int source_index;
 	Tokenizer tokenizer;
 	Preprocessor preprocessor;
 	bool allow_stage_change;
 	Module *module;
 	Stage *cur_stage;
 	std::set<std::string> declared_types;
+	std::vector<std::string> errors;
 
 public:
 	Parser();
 	~Parser();
 
-	Module &parse(const std::string &, const std::string &, unsigned = 0);
-	Module &parse(IO::Base &, const std::string &, unsigned = 0);
+	Module &parse(const std::string &, const std::string &, int);
+	Module &parse(IO::Base &, const std::string &, int);
 
 private:
-	void parse_source(const std::string &, unsigned);
+	void parse_source(const std::string &, int);
 	void set_required_version(const Version &);
+	void source_reference(unsigned, const std::string &);
 	void stage_change(Stage::Type);
+	void line_change(int, unsigned);
 
 	std::string expect_type();
 	std::string expect_identifier();
+	int expect_integer();
 	bool check(const std::string &);
 
 	static bool is_interface_qualifier(const std::string &);
@@ -56,16 +61,20 @@ private:
 	void preprocess_stage();
 
 	RefPtr<Statement> parse_global_declaration();
+	template<typename T>
+	RefPtr<T> parse_with_recovery(RefPtr<T> (Parser::*)());
 	RefPtr<Statement> parse_statement();
 	RefPtr<Import> parse_import();
 	RefPtr<Precision> parse_precision();
 	RefPtr<Layout> parse_layout();
-	void parse_block(Block &, bool);
+	template<typename T>
+	void parse_block(Block &, bool, RefPtr<T> (Parser::*)());
 	RefPtr<Expression> parse_expression(unsigned = 0);
-	RefPtr<BinaryExpression> parse_binary(const RefPtr<Expression> &, const Operator *);
+	RefPtr<BinaryExpression> parse_binary(const RefPtr<Expression> &, const Operator &);
 	RefPtr<FunctionCall> parse_function_call(const VariableReference &);
 	RefPtr<StructDeclaration> parse_struct_declaration();
 	RefPtr<VariableDeclaration> parse_variable_declaration();
+	RefPtr<VariableDeclaration> parse_variable_declaration_with_layout();
 	RefPtr<FunctionDeclaration> parse_function_declaration();
 	RefPtr<InterfaceBlock> parse_interface_block();
 	RefPtr<Conditional> parse_conditional();