X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramparser.h;h=72817e7ede06f8fe9607a2c17d8d99a503ea6c8e;hp=be6da197481aa3d264c7516427b55859e40e04d9;hb=ca52c492bd4f2fa1a1db3a85e50eaf7c43474830;hpb=eb6a546dcffc1b67f0a23d8b075fbdc86a2872a0

diff --git a/source/programparser.h b/source/programparser.h
index be6da197..72817e7e 100644
--- a/source/programparser.h
+++ b/source/programparser.h
@@ -40,6 +40,9 @@ private:
 	std::string source_name;
 	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;
@@ -67,7 +70,7 @@ private:
 	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();
@@ -75,14 +78,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();
@@ -95,7 +104,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();
 };