X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramsyntax.h;h=6a03f40fab67b2f4b02d17de5873587edf1d3e88;hp=14e5d8e786cb679e36c448cf5ca68b1dfe387fd3;hb=94ee5852b42b05559069596e205dc2f000e6153f;hpb=79c49c6b6155857ed0ebe85eb07a996788a6190b

diff --git a/source/programsyntax.h b/source/programsyntax.h
index 14e5d8e7..6a03f40f 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 {
@@ -178,10 +182,20 @@ struct Import: Node
 	virtual void visit(NodeVisitor &);
 };
 
+struct Precision: Node
+{
+	std::string precision;
+	std::string type;
+
+	virtual Precision *clone() const { return new Precision(*this); }
+	virtual void visit(NodeVisitor &);
+};
+
 struct Layout: Node
 {
 	struct Qualifier
 	{
+		// TODO the standard calls this name, not identifier
 		std::string identifier;
 		std::string value;
 	};
@@ -216,7 +230,9 @@ struct VariableDeclaration: Node
 {
 	bool constant;
 	std::string sampling;
+	std::string interpolation;
 	std::string interface;
+	std::string precision;
 	std::string type;
 	StructDeclaration *type_declaration;
 	std::string name;
@@ -298,6 +314,14 @@ struct Return: Node
 	virtual void visit(NodeVisitor &);
 };
 
+struct Jump: Node
+{
+	std::string keyword;
+
+	virtual Jump *clone() const { return new Jump(*this); }
+	virtual void visit(NodeVisitor &);
+};
+
 struct NodeVisitor
 {
 	virtual ~NodeVisitor() { }
@@ -313,6 +337,7 @@ struct NodeVisitor
 	virtual void visit(FunctionCall &) { }
 	virtual void visit(ExpressionStatement &) { }
 	virtual void visit(Import &) { }
+	virtual void visit(Precision &) { }
 	virtual void visit(Layout &) { }
 	virtual void visit(InterfaceLayout &) { }
 	virtual void visit(StructDeclaration &) { }
@@ -323,10 +348,12 @@ struct NodeVisitor
 	virtual void visit(Iteration &) { }
 	virtual void visit(Passthrough &) { }
 	virtual void visit(Return &) { }
+	virtual void visit(Jump &) { }
 };
 
 struct TraversingVisitor: NodeVisitor
 {
+	using NodeVisitor::visit;
 	virtual void visit(Block &);
 	virtual void visit(ParenthesizedExpression &);
 	virtual void visit(MemberAccess &);
@@ -378,4 +405,6 @@ struct Module
 } // namespace GL
 } // namespace Msp
 
+#pragma pop_macro("interface")
+
 #endif