X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.h;h=f7c8ed29cedc09229be11f5ce774d78f67107ee3;hb=d8bdf61007978e2c3670a22a58e2f105e8347537;hp=3976af56aa77c97b2a8f430daa89514004209628;hpb=cc3f4aaaf8d2b34347f69b026c10f82797059aa4;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 3976af56..f7c8ed29 100644
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -27,7 +27,8 @@ struct Operator
 		NO_OPERATOR,
 		BINARY,
 		PREFIX,
-		POSTFIX
+		POSTFIX,
+		TERNARY
 	};
 
 	enum Associativity
@@ -38,7 +39,8 @@ struct Operator
 	};
 
 	char token[4];
-	unsigned precedence;
+	char token2[2];
+	UInt8 precedence;
 	Type type;
 	Associativity assoc;
 
@@ -94,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>
@@ -150,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;
@@ -259,6 +256,16 @@ struct Assignment: BinaryExpression
 	virtual void visit(NodeVisitor &);
 };
 
+struct TernaryExpression: Expression
+{
+	NodePtr<Expression> condition;
+	NodePtr<Expression> true_expr;
+	NodePtr<Expression> false_expr;
+
+	virtual TernaryExpression *clone() const { return new TernaryExpression(*this); }
+	virtual void visit(NodeVisitor &);
+};
+
 struct FunctionCall: Expression
 {
 	std::string name;
@@ -423,7 +430,7 @@ struct VariableDeclaration: Statement
 struct InterfaceBlock: Statement
 {
 	std::string interface;
-	std::string name;
+	std::string block_name;
 	NodePtr<Block> members;
 	std::string instance_name;
 	bool array;
@@ -447,8 +454,11 @@ struct FunctionDeclaration: Statement
 	std::string return_type;
 	std::string name;
 	NodeArray<VariableDeclaration> parameters;
+	bool virtua;
+	bool overrd;
 	Block body;
 
+	std::string signature;
 	FunctionDeclaration *definition;
 	TypeDeclaration *return_type_declaration;
 
@@ -538,6 +548,8 @@ struct Module
 	Module();
 };
 
+std::string get_unused_variable_name(const Block &, const std::string &);
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp