X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.h;h=597a48e4b39bf47f8e78c9b781006238a071a167;hb=8f5f54a9e165dae424e5b0bb8e488c3d01849bf6;hp=81fd6b4f6390050e0312aee3b2d04983e55217e4;hpb=6dcf74922f46b086ad394c19fd6ce083a635b290;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 81fd6b4f..597a48e4 100644
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -39,7 +39,8 @@ struct Operator
 	};
 
 	char token[4];
-	unsigned precedence;
+	char token2[2];
+	UInt8 precedence;
 	Type type;
 	Associativity assoc;
 
@@ -95,6 +96,9 @@ class NodeContainer: public C
 public:
 	NodeContainer() { }
 	NodeContainer(const NodeContainer &);
+
+	void push_back_nocopy(const typename C::value_type &v)
+	{ C::push_back(0); C::back() = v; }
 };
 
 template<typename T>
@@ -151,14 +155,6 @@ struct Literal: Expression
 	virtual void visit(NodeVisitor &);
 };
 
-struct ParenthesizedExpression: Expression
-{
-	NodePtr<Expression> expression;
-
-	virtual ParenthesizedExpression *clone() const { return new ParenthesizedExpression(*this); }
-	virtual void visit(NodeVisitor &);
-};
-
 struct VariableReference: Expression
 {
 	std::string name;
@@ -433,8 +429,9 @@ struct VariableDeclaration: Statement
 
 struct InterfaceBlock: Statement
 {
+	NodePtr<Layout> layout;
 	std::string interface;
-	std::string name;
+	std::string block_name;
 	NodePtr<Block> members;
 	std::string instance_name;
 	bool array;
@@ -552,6 +549,11 @@ struct Module
 	Module();
 };
 
+std::string get_unused_variable_name(const Block &, const std::string &);
+
+bool is_same_type(const TypeDeclaration &, const TypeDeclaration &);
+int get_layout_value(const Layout &, const std::string &, int = -1);
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp