X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fparser.cpp;h=7b034a4c671f1d854a06cfabcaad83d94859aa88;hb=911c6c4acc8218bc40d93917207f9dc32e9f2596;hp=b4631daf6d1c4e5b3cafa638400bd94e9d157074;hpb=1476e64621ecbd7b17b00ae2c958322fd39918de;p=libs%2Fgl.git

diff --git a/source/glsl/parser.cpp b/source/glsl/parser.cpp
index b4631daf..7b034a4c 100644
--- a/source/glsl/parser.cpp
+++ b/source/glsl/parser.cpp
@@ -294,6 +294,8 @@ RefPtr<Statement> Parser::parse_global_declaration()
 	}
 	else if(is_qualifier(token))
 		return parse_variable_declaration();
+	else if(token=="virtual")
+		return parse_function_declaration();
 	else if(is_type(token))
 	{
 		if(tokenizer.peek_token(2)=="(")
@@ -449,7 +451,7 @@ RefPtr<Expression> Parser::parse_expression(const Operator *outer_oper)
 				oper = i;
 
 		bool lower_precedence = (oper && oper->type!=Operator::PREFIX && oper->precedence>=outer_precedence);
-		if(token==";" || token==")" || token=="]" || token=="," || lower_precedence)
+		if(token==";" || token==")" || token=="]" || token=="," || token==":" || lower_precedence)
 		{
 			if(left)
 				return left;
@@ -483,6 +485,8 @@ RefPtr<Expression> Parser::parse_expression(const Operator *outer_oper)
 			}
 			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;
@@ -547,16 +551,28 @@ RefPtr<BinaryExpression> Parser::parse_binary(const RefPtr<Expression> &left, co
 	binary->left = left;
 	binary->oper = &oper;
 	tokenizer.expect(oper.token);
-	if(oper.token[0]=='[')
+	if(oper.token2[0])
 	{
 		binary->right = parse_expression();
-		tokenizer.expect("]");
+		tokenizer.expect(oper.token2);
 	}
 	else
 		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>();
@@ -736,6 +752,7 @@ RefPtr<FunctionDeclaration> Parser::parse_function_declaration()
 {
 	RefPtr<FunctionDeclaration> func = create_node<FunctionDeclaration>();
 
+	func->virtua = check("virtual");
 	func->return_type = expect_type();
 	func->name = expect_identifier();
 	tokenizer.expect("(");
@@ -754,6 +771,8 @@ RefPtr<FunctionDeclaration> Parser::parse_function_declaration()
 	}
 	tokenizer.expect(")");
 
+	func->overrd = check("override");
+
 	string token = tokenizer.peek_token();
 	if(token=="{")
 	{