X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fparser.cpp;h=0c3a5e35a57a35033024989aa96076b06bd141cd;hb=3a1fe83;hp=d2261126a652d109deba3c4193713568dc317616;hpb=e8542d921a07b7391d558cb3349a68f26675f797;p=libs%2Fgl.git

diff --git a/source/glsl/parser.cpp b/source/glsl/parser.cpp
index d2261126..0c3a5e35 100644
--- a/source/glsl/parser.cpp
+++ b/source/glsl/parser.cpp
@@ -434,8 +434,9 @@ void Parser::parse_block(Block &block, bool require_braces, RefPtr<T> (Parser::*
 		tokenizer.expect("}");
 }
 
-RefPtr<Expression> Parser::parse_expression(unsigned precedence)
+RefPtr<Expression> Parser::parse_expression(const Operator *outer_oper)
 {
+	unsigned outer_precedence = (outer_oper ? outer_oper->precedence+(outer_oper->assoc==Operator::RIGHT_TO_LEFT) : 20);
 	RefPtr<Expression> left;
 	VariableReference *left_var = 0;
 	while(1)
@@ -447,8 +448,8 @@ RefPtr<Expression> Parser::parse_expression(unsigned precedence)
 			if(token==i->token && (!left || i->type!=Operator::PREFIX) && (left || i->type!=Operator::POSTFIX))
 				oper = i;
 
-		bool lower_precedence = (oper && oper->type!=Operator::PREFIX && precedence && oper->precedence>=precedence);
-		if(token==";" || token==")" || token=="]" || token=="," || lower_precedence)
+		bool lower_precedence = (oper && oper->type!=Operator::PREFIX && oper->precedence>=outer_precedence);
+		if(token==";" || token==")" || token=="]" || token=="," || token==":" || lower_precedence)
 		{
 			if(left)
 				return left;
@@ -482,6 +483,8 @@ RefPtr<Expression> Parser::parse_expression(unsigned precedence)
 			}
 			else if(oper && oper->type==Operator::BINARY)
 				left = parse_binary(left, *oper);
+			else if(oper && oper->type==Operator::TERNARY)
+				left = parse_ternary(left, *oper);
 			else
 				throw parse_error(tokenizer.get_location(), token, "an operator");
 			left_var = 0;
@@ -510,7 +513,7 @@ RefPtr<Expression> Parser::parse_expression(unsigned precedence)
 				RefPtr<UnaryExpression> unary = create_node<UnaryExpression>();
 				unary->oper = oper;
 				tokenizer.parse_token();
-				unary->expression = parse_expression(oper->precedence);
+				unary->expression = parse_expression(oper);
 				left = unary;
 			}
 			else
@@ -552,10 +555,22 @@ RefPtr<BinaryExpression> Parser::parse_binary(const RefPtr<Expression> &left, co
 		tokenizer.expect("]");
 	}
 	else
-		binary->right = parse_expression(oper.precedence+(oper.assoc==Operator::RIGHT_TO_LEFT));
+		binary->right = parse_expression(&oper);
 	return binary;
 }
 
+RefPtr<TernaryExpression> Parser::parse_ternary(const RefPtr<Expression> &cond, const Operator &oper)
+{
+	RefPtr<TernaryExpression> ternary = create_node<TernaryExpression>();
+	ternary->condition = cond;
+	ternary->oper = &oper;
+	tokenizer.expect("?");
+	ternary->true_expr = parse_expression(&oper);
+	tokenizer.expect(":");
+	ternary->false_expr = parse_expression(&oper);
+	return ternary;
+}
+
 RefPtr<FunctionCall> Parser::parse_function_call(const VariableReference &var)
 {
 	RefPtr<FunctionCall> call = create_node<FunctionCall>();
@@ -776,7 +791,8 @@ RefPtr<InterfaceBlock> Parser::parse_interface_block()
 		throw parse_error(tokenizer.get_location(), iface->interface, "an interface qualifier");
 
 	iface->name = expect_identifier();
-	parse_block(iface->members, true, &Parser::parse_variable_declaration_with_layout);
+	iface->members = new Block;
+	parse_block(*iface->members, true, &Parser::parse_variable_declaration_with_layout);
 	if(!check(";"))
 	{
 		iface->instance_name = expect_identifier();