X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.h;h=da7b0907e37460d5b7041d32e2c921dee9473563;hb=69680f4d284cdf7b16a2966250a88ab1257862f3;hp=05bcee545f4a62431ddf8c00978d766e6c670565;hpb=947bb7477205c038aa1804b84452cddd2108550a;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 05bcee54..da7b0907 100644
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -3,12 +3,13 @@
 
 #include <list>
 #include <map>
+#include <set>
 #include <string>
 #include <vector>
 #include <msp/core/refptr.h>
-#include "extension.h"
+#include "features.h"
+#include "glsl_error.h"
 #include "sourcemap.h"
-#include "uniform.h"
 
 #pragma push_macro("interface")
 #undef interface
@@ -30,7 +31,8 @@ struct Operator
 	enum Associativity
 	{
 		LEFT_TO_RIGHT,
-		RIGHT_TO_LEFT
+		RIGHT_TO_LEFT,
+		ASSOCIATIVE
 	};
 
 	char token[4];
@@ -39,6 +41,14 @@ struct Operator
 	Associativity assoc;
 
 	static const Operator operators[];
+
+	static const Operator &get_operator(const std::string &, Type);
+};
+
+enum
+{
+	BUILTIN_SOURCE = -1,
+	GENERATED_SOURCE = 0
 };
 
 struct NodeVisitor;
@@ -91,11 +101,12 @@ class NodeArray: public NodeContainer<std::vector<RefPtr<T> > >
 
 struct StructDeclaration;
 struct VariableDeclaration;
+struct InterfaceBlock;
 struct FunctionDeclaration;
 
 struct Statement: Node
 {
-	unsigned source;
+	int source;
 	unsigned line;
 
 	Statement();
@@ -107,10 +118,12 @@ struct Block: Node
 {
 	NodeList<Statement> body;
 	bool use_braces;
-	std::map<std::string, StructDeclaration *> types;
+
 	std::map<std::string, VariableDeclaration *> variables;
+	Block *parent;
 
 	Block();
+	Block(const Block &);
 
 	virtual Block *clone() const { return new Block(*this); }
 	virtual void visit(NodeVisitor &);
@@ -118,6 +131,10 @@ struct Block: Node
 
 struct Expression: Node
 {
+	const Operator *oper;
+
+	Expression();
+
 	virtual Expression *clone() const = 0;
 };
 
@@ -140,6 +157,7 @@ struct ParenthesizedExpression: Expression
 struct VariableReference: Expression
 {
 	std::string name;
+
 	VariableDeclaration *declaration;
 
 	VariableReference();
@@ -149,10 +167,24 @@ struct VariableReference: Expression
 	virtual void visit(NodeVisitor &);
 };
 
+struct InterfaceBlockReference: Expression
+{
+	std::string name;
+
+	InterfaceBlock *declaration;
+
+	InterfaceBlockReference();
+	InterfaceBlockReference(const InterfaceBlockReference &);
+
+	virtual InterfaceBlockReference *clone() const { return new InterfaceBlockReference(*this); }
+	virtual void visit(NodeVisitor &);
+};
+
 struct MemberAccess: Expression
 {
 	NodePtr<Expression> left;
 	std::string member;
+
 	VariableDeclaration *declaration;
 
 	MemberAccess();
@@ -164,11 +196,7 @@ struct MemberAccess: Expression
 
 struct UnaryExpression: Expression
 {
-	std::string oper;
 	NodePtr<Expression> expression;
-	bool prefix;
-
-	UnaryExpression();
 
 	virtual UnaryExpression *clone() const { return new UnaryExpression(*this); }
 	virtual void visit(NodeVisitor &);
@@ -177,9 +205,7 @@ struct UnaryExpression: Expression
 struct BinaryExpression: Expression
 {
 	NodePtr<Expression> left;
-	std::string oper;
 	NodePtr<Expression> right;
-	std::string after;
 
 	virtual BinaryExpression *clone() const { return new BinaryExpression(*this); }
 	virtual void visit(NodeVisitor &);
@@ -188,6 +214,7 @@ struct BinaryExpression: Expression
 struct Assignment: BinaryExpression
 {
 	bool self_referencing;
+
 	VariableDeclaration *target_declaration;
 
 	Assignment();
@@ -200,10 +227,11 @@ struct Assignment: BinaryExpression
 struct FunctionCall: Expression
 {
 	std::string name;
-	FunctionDeclaration *declaration;
 	bool constructor;
 	NodeArray<Expression> arguments;
 
+	FunctionDeclaration *declaration;
+
 	FunctionCall();
 	FunctionCall(const FunctionCall &);
 
@@ -240,9 +268,9 @@ struct Layout: Node
 {
 	struct Qualifier
 	{
-		// TODO the standard calls this name, not identifier
-		std::string identifier;
-		std::string value;
+		std::string name;
+		bool has_value;
+		int value;
 	};
 
 	std::vector<Qualifier> qualifiers;
@@ -273,22 +301,24 @@ struct StructDeclaration: Statement
 
 struct VariableDeclaration: Statement
 {
+	NodePtr<Layout> layout;
 	bool constant;
 	std::string sampling;
 	std::string interpolation;
 	std::string interface;
 	std::string precision;
 	std::string type;
-	StructDeclaration *type_declaration;
 	std::string name;
 	bool array;
 	NodePtr<Expression> array_size;
 	NodePtr<Expression> init_expression;
+
+	StructDeclaration *type_declaration;
 	VariableDeclaration *linked_declaration;
-	NodePtr<Layout> layout;
 
 	VariableDeclaration();
 	VariableDeclaration(const VariableDeclaration &);
+	~VariableDeclaration();
 
 	virtual VariableDeclaration *clone() const { return new VariableDeclaration(*this); }
 	virtual void visit(NodeVisitor &);
@@ -302,7 +332,11 @@ struct InterfaceBlock: Statement
 	std::string instance_name;
 	bool array;
 
+	InterfaceBlock *linked_block;
+
 	InterfaceBlock();
+	InterfaceBlock(const InterfaceBlock &);
+	~InterfaceBlock();
 
 	virtual InterfaceBlock *clone() const { return new InterfaceBlock(*this); }
 	virtual void visit(NodeVisitor &);
@@ -313,9 +347,10 @@ struct FunctionDeclaration: Statement
 	std::string return_type;
 	std::string name;
 	NodeArray<VariableDeclaration> parameters;
-	FunctionDeclaration *definition;
 	Block body;
 
+	FunctionDeclaration *definition;
+
 	FunctionDeclaration();
 	FunctionDeclaration(const FunctionDeclaration &);
 
@@ -335,7 +370,7 @@ struct Conditional: Statement
 
 struct Iteration: Statement
 {
-	NodePtr<Node> init_statement;
+	NodePtr<Statement> init_statement;
 	NodePtr<Expression> condition;
 	NodePtr<Expression> loop_expression;
 	Block body;
@@ -381,11 +416,12 @@ struct Stage
 	Type type;
 	Stage *previous;
 	Block content;
-	std::map<std::string, VariableDeclaration *> in_variables;
-	std::map<std::string, VariableDeclaration *> out_variables;
+	std::map<std::string, StructDeclaration *> types;
+	std::map<std::string, InterfaceBlock *> interface_blocks;
+	std::map<std::string, FunctionDeclaration *> functions;
 	std::map<std::string, unsigned> locations;
-	Version required_version;
-	std::vector<const Extension *> required_extensions;
+	Features required_features;
+	std::vector<Diagnostic> diagnostics;
 
 	Stage(Type);