X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramparser.h;h=4c2d7b7ea5bc1049ddacede49a9f6a1cb280d3e7;hb=a29cc14162e911b36d18d1d1896216697c7dc0c1;hp=4bd6b70e99e1b9e2064eb9de9416a253ae5286bc;hpb=73ce62f3b9c2bbfc1e655a9df343389a733dc795;p=libs%2Fgl.git

diff --git a/source/programparser.h b/source/programparser.h
index 4bd6b70e..4c2d7b7e 100644
--- a/source/programparser.h
+++ b/source/programparser.h
@@ -3,6 +3,7 @@
 
 #include <deque>
 #include <map>
+#include <set>
 #include <string>
 #include <msp/io/base.h>
 #include "programsyntax.h"
@@ -38,17 +39,21 @@ private:
 	std::string source;
 	std::string::const_iterator iter;
 	std::deque<std::string> next_tokens;
-	ProgramSyntax::Module main_module;
-	ProgramSyntax::Module *cur_module;
+	ProgramSyntax::Module *module;
+	ProgramSyntax::Stage *cur_stage;
+	std::set<std::string> declared_types;
 
 	static Operator operators[];
 
 public:
+	ProgramParser();
+	~ProgramParser();
+
 	ProgramSyntax::Module &parse(const std::string &);
 	ProgramSyntax::Module &parse(IO::Base &);
 
 private:
-	void parse_source(ProgramSyntax::Module &);
+	void parse_source();
 
 	const std::string &peek_token(unsigned = 0);
 	std::string parse_token();
@@ -83,6 +88,7 @@ private:
 	ProgramSyntax::InterfaceBlock *parse_interface_block();
 	ProgramSyntax::Conditional *parse_conditional();
 	ProgramSyntax::Iteration *parse_iteration();
+	ProgramSyntax::Passthrough *parse_passthrough();
 	ProgramSyntax::Return *parse_return();
 };