X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramsyntax.h;h=590429519118614f6a59a83796da97f50693ff9c;hp=b0ad02b394c480708d1b871173b37cff3c3df6fd;hb=56beca9d8b4f7b4edac81411d31e24df88e84ac3;hpb=53953f28255e782ed640a9e8d2d42c9b218943ad

diff --git a/source/programsyntax.h b/source/programsyntax.h
index b0ad02b3..59042951 100644
--- a/source/programsyntax.h
+++ b/source/programsyntax.h
@@ -7,6 +7,10 @@
 #include <vector>
 #include <msp/core/refptr.h>
 #include "extension.h"
+#include "uniform.h"
+
+#pragma push_macro("interface")
+#undef interface
 
 namespace Msp {
 namespace GL {
@@ -60,9 +64,19 @@ struct StructDeclaration;
 struct VariableDeclaration;
 struct FunctionDeclaration;
 
+struct Statement: Node
+{
+	unsigned source;
+	unsigned line;
+
+	Statement();
+
+	virtual Statement *clone() const = 0;
+};
+
 struct Block: Node
 {
-	NodeList<Node> body;
+	NodeList<Statement> body;
 	bool use_braces;
 	std::map<std::string, StructDeclaration *> types;
 	std::map<std::string, VariableDeclaration *> variables;
@@ -162,7 +176,7 @@ struct FunctionCall: Expression
 	virtual void visit(NodeVisitor &);
 };
 
-struct ExpressionStatement: Node
+struct ExpressionStatement: Statement
 {
 	NodePtr<Expression> expression;
 
@@ -170,7 +184,7 @@ struct ExpressionStatement: Node
 	virtual void visit(NodeVisitor &);
 };
 
-struct Import: Node
+struct Import: Statement
 {
 	std::string module;
 
@@ -178,7 +192,7 @@ struct Import: Node
 	virtual void visit(NodeVisitor &);
 };
 
-struct Precision: Node
+struct Precision: Statement
 {
 	std::string precision;
 	std::string type;
@@ -202,7 +216,7 @@ struct Layout: Node
 	virtual void visit(NodeVisitor &);
 };
 
-struct InterfaceLayout: Node
+struct InterfaceLayout: Statement
 {
 	std::string interface;
 	Layout layout;
@@ -211,7 +225,7 @@ struct InterfaceLayout: Node
 	virtual void visit(NodeVisitor &);
 };
 
-struct StructDeclaration: Node
+struct StructDeclaration: Statement
 {
 	std::string name;
 	Block members;
@@ -222,10 +236,11 @@ struct StructDeclaration: Node
 	virtual void visit(NodeVisitor &);
 };
 
-struct VariableDeclaration: Node
+struct VariableDeclaration: Statement
 {
 	bool constant;
 	std::string sampling;
+	std::string interpolation;
 	std::string interface;
 	std::string precision;
 	std::string type;
@@ -243,7 +258,7 @@ struct VariableDeclaration: Node
 	virtual void visit(NodeVisitor &);
 };
 
-struct InterfaceBlock: Node
+struct InterfaceBlock: Statement
 {
 	std::string interface;
 	std::string name;
@@ -257,7 +272,7 @@ struct InterfaceBlock: Node
 	virtual void visit(NodeVisitor &);
 };
 
-struct FunctionDeclaration: Node
+struct FunctionDeclaration: Statement
 {
 	std::string return_type;
 	std::string name;
@@ -272,7 +287,7 @@ struct FunctionDeclaration: Node
 	virtual void visit(NodeVisitor &);
 };
 
-struct Conditional: Node
+struct Conditional: Statement
 {
 	NodePtr<Expression> condition;
 	Block body;
@@ -282,7 +297,7 @@ struct Conditional: Node
 	virtual void visit(NodeVisitor &);
 };
 
-struct Iteration: Node
+struct Iteration: Statement
 {
 	NodePtr<Node> init_statement;
 	NodePtr<Expression> condition;
@@ -293,7 +308,7 @@ struct Iteration: Node
 	virtual void visit(NodeVisitor &);
 };
 
-struct Passthrough: Node
+struct Passthrough: Statement
 {
 	NodePtr<Expression> subscript;
 
@@ -301,7 +316,7 @@ struct Passthrough: Node
 	virtual void visit(NodeVisitor &);
 };
 
-struct Return: Node
+struct Return: Statement
 {
 	NodePtr<Expression> expression;
 
@@ -309,7 +324,7 @@ struct Return: Node
 	virtual void visit(NodeVisitor &);
 };
 
-struct Jump: Node
+struct Jump: Statement
 {
 	std::string keyword;
 
@@ -384,6 +399,7 @@ struct Stage
 	std::map<std::string, VariableDeclaration *> out_variables;
 	std::map<std::string, unsigned> locations;
 	Version required_version;
+	std::vector<const Extension *> required_extensions;
 
 	Stage(StageType);
 };
@@ -400,4 +416,6 @@ struct Module
 } // namespace GL
 } // namespace Msp
 
+#pragma pop_macro("interface")
+
 #endif