X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.h;h=6129421133b0d02ccb416758cf105758a956b01d;hb=22d5405729048ee2677a1e45e309e6328de64a26;hp=39bc8264e1b8d30ead80ad19ad78f9232a6cd3ae;hpb=a1ba04add302e7712d127b46d8d11386987a0aea;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 39bc8264..61294211 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;
 
@@ -150,14 +152,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 +253,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;
@@ -447,6 +451,8 @@ struct FunctionDeclaration: Statement
 	std::string return_type;
 	std::string name;
 	NodeArray<VariableDeclaration> parameters;
+	bool virtua;
+	bool overrd;
 	Block body;
 
 	std::string signature;
@@ -539,6 +545,8 @@ struct Module
 	Module();
 };
 
+std::string get_unused_variable_name(const Block &, const std::string &);
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp