X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramparser.h;h=4e8e38f0fcd48fb0c5033ffae76bad2add532783;hb=a0caabaed3aeb8947133d78986bfb4ae5ae3c893;hp=0a91c500b1a24884401614d7188953a77ae809a8;hpb=6e6ee01b68056b23c6709d7f60396710dd7623b9;p=libs%2Fgl.git

diff --git a/source/programparser.h b/source/programparser.h
index 0a91c500..4e8e38f0 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"
@@ -13,18 +14,46 @@ namespace GL {
 class ProgramParser
 {
 private:
+	enum OperatorType
+	{
+		NO_OPERATOR,
+		BINARY,
+		PREFIX,
+		POSTFIX
+	};
+
+	enum Associativity
+	{
+		LEFT_TO_RIGHT,
+		RIGHT_TO_LEFT
+	};
+
+	struct Operator
+	{
+		const char token[4];
+		unsigned precedence;
+		OperatorType type;
+		Associativity assoc;
+	};
+
 	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();
@@ -43,19 +72,23 @@ private:
 	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 &);
 
 	ProgramSyntax::Node *parse_global_declaration();
 	ProgramSyntax::Node *parse_statement();
+	ProgramSyntax::Import *parse_import();
 	ProgramSyntax::Layout *parse_layout();
 	void parse_block(ProgramSyntax::Block &, bool);
-	void parse_expression(ProgramSyntax::Expression &);
+	ProgramSyntax::Expression *parse_expression(unsigned = 0);
+	ProgramSyntax::BinaryExpression *parse_binary(ProgramSyntax::Expression *, const Operator *);
+	ProgramSyntax::FunctionCall *parse_function_call(ProgramSyntax::VariableReference *);
 	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();
+	ProgramSyntax::Passthrough *parse_passthrough();
 	ProgramSyntax::Return *parse_return();
 };