X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramparser.h;h=dc94bd0044443bd01ca862584e6784a58da4fb9f;hp=927c02046fb822d17e67dcc0b8ecdfbe03bafc9f;hb=71972b08fd031e177a005eb1924a5c7a15459291;hpb=a5772e203cc30ce3b449614d03a293fd5b5985ad

diff --git a/source/programparser.h b/source/programparser.h
index 927c0204..dc94bd00 100644
--- a/source/programparser.h
+++ b/source/programparser.h
@@ -37,7 +37,14 @@ private:
 	};
 
 	std::string source;
+	std::string source_name;
+	unsigned source_index;
+	unsigned current_line;
 	std::string::const_iterator iter;
+	std::string::const_iterator source_end;
+	bool allow_preprocess;
+	bool allow_stage_change;
+	std::string last_token;
 	std::deque<std::string> next_tokens;
 	ProgramSyntax::Module *module;
 	ProgramSyntax::Stage *cur_stage;
@@ -49,19 +56,22 @@ public:
 	ProgramParser();
 	~ProgramParser();
 
-	ProgramSyntax::Module &parse(const std::string &);
-	ProgramSyntax::Module &parse(IO::Base &);
+	ProgramSyntax::Module &parse(const std::string &, const std::string &, unsigned = 0);
+	ProgramSyntax::Module &parse(IO::Base &, const std::string &, unsigned = 0);
 
 private:
 	void parse_source();
 
+	std::string format_error(const std::string &);
+	std::string format_syntax_error(const std::string &);
+
 	const std::string &peek_token(unsigned = 0);
-	std::string parse_token();
+	const std::string &parse_token();
 	std::string parse_token_();
 	std::string parse_identifier();
 	std::string parse_number();
 	std::string parse_other();
-	bool skip_comment_and_whitespace();
+	void skip_comment_and_whitespace();
 	void expect(const std::string &);
 	std::string expect_type();
 	std::string expect_identifier();
@@ -69,14 +79,20 @@ private:
 
 	static bool is_interface_qualifier(const std::string &);
 	static bool is_sampling_qualifier(const std::string &);
+	static bool is_interpolation_qualifier(const std::string &);
 	static bool is_precision_qualifier(const std::string &);
 	static bool is_qualifier(const std::string &);
 	static bool is_builtin_type(const std::string &);
 	bool is_type(const std::string &);
 	bool is_identifier(const std::string &);
 
-	RefPtr<ProgramSyntax::Node> parse_global_declaration();
-	RefPtr<ProgramSyntax::Node> parse_statement();
+	void preprocess();
+	void preprocess_pragma();
+	void preprocess_pragma_msp();
+	void preprocess_stage();
+
+	RefPtr<ProgramSyntax::Statement> parse_global_declaration();
+	RefPtr<ProgramSyntax::Statement> parse_statement();
 	RefPtr<ProgramSyntax::Import> parse_import();
 	RefPtr<ProgramSyntax::Precision> parse_precision();
 	RefPtr<ProgramSyntax::Layout> parse_layout();
@@ -89,7 +105,8 @@ private:
 	RefPtr<ProgramSyntax::FunctionDeclaration> parse_function_declaration();
 	RefPtr<ProgramSyntax::InterfaceBlock> parse_interface_block();
 	RefPtr<ProgramSyntax::Conditional> parse_conditional();
-	RefPtr<ProgramSyntax::Iteration> parse_iteration();
+	RefPtr<ProgramSyntax::Iteration> parse_for();
+	RefPtr<ProgramSyntax::Iteration> parse_while();
 	RefPtr<ProgramSyntax::Passthrough> parse_passthrough();
 	RefPtr<ProgramSyntax::Return> parse_return();
 };