X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramparser.h;h=e246251676bdd4b7b453b0c884c55c2da8ae4122;hb=f9b23e69b63cbbeed8eeb605c0dc491002a4c23b;hp=1ca1a44c564d7aa8e6e65ed5f37e465b6a3f2340;hpb=fd103d76d7546f7e22aefc18c090a844fc67409f;p=libs%2Fgl.git

diff --git a/source/programparser.h b/source/programparser.h
index 1ca1a44c..e2462516 100644
--- a/source/programparser.h
+++ b/source/programparser.h
@@ -39,19 +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();
@@ -82,7 +84,6 @@ private:
 	ProgramSyntax::StructDeclaration *parse_struct_declaration();
 	ProgramSyntax::VariableDeclaration *parse_variable_declaration();
 	ProgramSyntax::FunctionDeclaration *parse_function_declaration();
-	void parse_function_parameter_list(ProgramSyntax::FunctionDeclaration &);
 	ProgramSyntax::InterfaceBlock *parse_interface_block();
 	ProgramSyntax::Conditional *parse_conditional();
 	ProgramSyntax::Iteration *parse_iteration();