From db9be2e7aa3a56e43b725ad7725fe6b424e4933e Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Mon, 29 Mar 2010 16:25:56 -0700 Subject: [PATCH] Apply implicit conversions to ?: operator --- ast_to_hir.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ast_to_hir.cpp b/ast_to_hir.cpp index 3450d38..dfb2e40 100644 --- a/ast_to_hir.cpp +++ b/ast_to_hir.cpp @@ -794,18 +794,18 @@ ast_expression::hir(exec_list *instructions, * resulting matching type is the type of the entire * expression." */ - /* FINISHME: Apply implicit conversions */ - if (op[1]->type == op[2]->type) { - tmp->type = op[1]->type; - } else { + if ((!apply_implicit_conversion(op[1]->type, & op[2], state) + && !apply_implicit_conversion(op[2]->type, & op[1], state)) + || (op[1]->type != op[2]->type)) { YYLTYPE loc = this->subexpressions[1]->get_location(); _mesa_glsl_error(& loc, state, "Second and third operands of ?: " "operator must have matching types."); error_emitted = true; + } else { + tmp->type = op[1]->type; } - result = new ir_dereference(tmp); type = tmp->type; break; -- 2.7.4