X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.h;h=30acca42b957bd42b547b642173032160fcdd0df;hb=041ba4b1acd55337239c5ce24cc310118c621206;hp=0821ee5fe97c8780f836b0ce75f562c939de8d10;hpb=2b74d276f67d07e37b56aeebc474a58ceeea3e68;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 0821ee5f..30acca42 100644
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -7,7 +7,9 @@
 #include <string>
 #include <vector>
 #include <msp/core/refptr.h>
+#include <msp/core/variant.h>
 #include "features.h"
+#include "glsl_error.h"
 #include "sourcemap.h"
 
 #pragma push_macro("interface")
@@ -46,6 +48,7 @@ struct Operator
 
 enum
 {
+	INTERNAL_SOURCE = -2,
 	BUILTIN_SOURCE = -1,
 	GENERATED_SOURCE = 0
 };
@@ -54,9 +57,11 @@ struct NodeVisitor;
 
 struct Node
 {
-protected:
-	Node() { }
-	Node(const Node &) { }
+	int source;
+	unsigned line;
+
+	Node(): source(GENERATED_SOURCE), line(1) { }
+	Node(const Node &n): source(n.source), line(n.line) { }
 private:
 	Node &operator=(const Node &);
 public:
@@ -98,18 +103,13 @@ template<typename T>
 class NodeArray: public NodeContainer<std::vector<RefPtr<T> > >
 { };
 
-struct StructDeclaration;
+struct TypeDeclaration;
 struct VariableDeclaration;
 struct InterfaceBlock;
 struct FunctionDeclaration;
 
 struct Statement: Node
 {
-	int source;
-	unsigned line;
-
-	Statement();
-
 	virtual Statement *clone() const = 0;
 };
 
@@ -132,6 +132,9 @@ struct Expression: Node
 {
 	const Operator *oper;
 
+	TypeDeclaration *type;
+	bool lvalue;
+
 	Expression();
 
 	virtual Expression *clone() const = 0;
@@ -140,6 +143,7 @@ struct Expression: Node
 struct Literal: Expression
 {
 	std::string token;
+	Variant value;
 
 	virtual Literal *clone() const { return new Literal(*this); }
 	virtual void visit(NodeVisitor &);
@@ -287,12 +291,73 @@ struct InterfaceLayout: Statement
 	virtual void visit(NodeVisitor &);
 };
 
-struct StructDeclaration: Statement
+struct TypeDeclaration: Statement
 {
 	std::string name;
+
+	virtual TypeDeclaration *clone() const = 0;
+};
+
+struct BasicTypeDeclaration: TypeDeclaration
+{
+	enum Kind
+	{
+		ALIAS,
+		VOID,
+		BOOL,
+		INT,
+		FLOAT,
+		VECTOR,
+		MATRIX,
+		ARRAY
+	};
+
+	Kind kind;
+	unsigned size;
+	std::string base;
+
+	TypeDeclaration *base_type;
+
+	BasicTypeDeclaration();
+	BasicTypeDeclaration(const BasicTypeDeclaration &);
+
+	virtual BasicTypeDeclaration *clone() const { return new BasicTypeDeclaration(*this); }
+	virtual void visit(NodeVisitor &);
+};
+
+struct ImageTypeDeclaration: TypeDeclaration
+{
+	enum Dimensions
+	{
+		ONE = 1,
+		TWO,
+		THREE,
+		CUBE
+	};
+
+	Dimensions dimensions;
+	bool array;
+	bool sampled;
+	bool shadow;
+	std::string base;
+
+	TypeDeclaration *base_type;
+
+	ImageTypeDeclaration();
+
+	virtual ImageTypeDeclaration *clone() const { return new ImageTypeDeclaration(*this); }
+	virtual void visit(NodeVisitor &);
+};
+
+struct StructDeclaration: TypeDeclaration
+{
 	Block members;
 
+	InterfaceBlock *interface_block;
+
 	StructDeclaration();
+	StructDeclaration(const StructDeclaration &);
+	~StructDeclaration();
 
 	virtual StructDeclaration *clone() const { return new StructDeclaration(*this); }
 	virtual void visit(NodeVisitor &);
@@ -312,7 +377,7 @@ struct VariableDeclaration: Statement
 	NodePtr<Expression> array_size;
 	NodePtr<Expression> init_expression;
 
-	StructDeclaration *type_declaration;
+	TypeDeclaration *type_declaration;
 	VariableDeclaration *linked_declaration;
 
 	VariableDeclaration();
@@ -327,10 +392,14 @@ struct InterfaceBlock: Statement
 {
 	std::string interface;
 	std::string name;
-	Block members;
+	NodePtr<Block> members;
 	std::string instance_name;
 	bool array;
 
+	/* An interface block's ultimate base type is always a struct.  The
+	immediate type may be either that same struct or an array of it. */
+	TypeDeclaration *type_declaration;
+	StructDeclaration *struct_declaration;
 	InterfaceBlock *linked_block;
 
 	InterfaceBlock();
@@ -349,6 +418,7 @@ struct FunctionDeclaration: Statement
 	Block body;
 
 	FunctionDeclaration *definition;
+	TypeDeclaration *return_type_declaration;
 
 	FunctionDeclaration();
 	FunctionDeclaration(const FunctionDeclaration &);
@@ -369,7 +439,7 @@ struct Conditional: Statement
 
 struct Iteration: Statement
 {
-	NodePtr<Node> init_statement;
+	NodePtr<Statement> init_statement;
 	NodePtr<Expression> condition;
 	NodePtr<Expression> loop_expression;
 	Block body;
@@ -415,11 +485,12 @@ struct Stage
 	Type type;
 	Stage *previous;
 	Block content;
-	std::map<std::string, StructDeclaration *> types;
+	std::map<std::string, TypeDeclaration *> types;
 	std::map<std::string, InterfaceBlock *> interface_blocks;
 	std::map<std::string, FunctionDeclaration *> functions;
 	std::map<std::string, unsigned> locations;
 	Features required_features;
+	std::vector<Diagnostic> diagnostics;
 
 	Stage(Type);