Skip to content

W
wine-cw
Commit 17ee7300 authored by Gerald Pfeifer's avatar Gerald Pfeifer Committed by Alexandre Julliard
Browse files
Options

widl: Avoid duplicate assignments in resolve_expression.

parent 18bb9da5
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 7 deletions
tools/widl/expr.c
View file @ 17ee7300
...@@ -513,27 +513,22 @@ static struct expression_type resolve_expression(const struct expr_loc *expr_loc ...@@ -513,27 +513,22 @@ static struct expression_type resolve_expression(const struct expr_loc *expr_loc
case EXPR_HEXNUM: case EXPR_HEXNUM:
case EXPR_NUM: case EXPR_NUM:
case EXPR_TRUEFALSE: case EXPR_TRUEFALSE:
result.is_variable = FALSE;
result.is_temporary = FALSE; result.is_temporary = FALSE;
result.type = type_new_int(TYPE_BASIC_INT, 0); result.type = type_new_int(TYPE_BASIC_INT, 0);
break; break;
case EXPR_STRLIT: case EXPR_STRLIT:
result.is_variable = FALSE;
result.is_temporary = TRUE; result.is_temporary = TRUE;
result.type = type_new_pointer(RPC_FC_UP, type_new_int(TYPE_BASIC_CHAR, 0), NULL); result.type = type_new_pointer(RPC_FC_UP, type_new_int(TYPE_BASIC_CHAR, 0), NULL);
break; break;
case EXPR_WSTRLIT: case EXPR_WSTRLIT:
result.is_variable = FALSE;
result.is_temporary = TRUE; result.is_temporary = TRUE;
result.type = type_new_pointer(RPC_FC_UP, type_new_int(TYPE_BASIC_WCHAR, 0), NULL); result.type = type_new_pointer(RPC_FC_UP, type_new_int(TYPE_BASIC_WCHAR, 0), NULL);
break; break;
case EXPR_CHARCONST: case EXPR_CHARCONST:
result.is_variable = FALSE;
result.is_temporary = TRUE; result.is_temporary = TRUE;
result.type = type_new_int(TYPE_BASIC_CHAR, 0); result.type = type_new_int(TYPE_BASIC_CHAR, 0);
break; break;
case EXPR_DOUBLE: case EXPR_DOUBLE:
result.is_variable = FALSE;
result.is_temporary = TRUE; result.is_temporary = TRUE;
result.type = type_new_basic(TYPE_BASIC_DOUBLE); result.type = type_new_basic(TYPE_BASIC_DOUBLE);
break; break;
...@@ -596,7 +591,6 @@ static struct expression_type resolve_expression(const struct expr_loc *expr_loc ...@@ -596,7 +591,6 @@ static struct expression_type resolve_expression(const struct expr_loc *expr_loc
result.type = e->u.tref; result.type = e->u.tref;
break; break;
case EXPR_SIZEOF: case EXPR_SIZEOF:
result.is_variable = FALSE;
result.is_temporary = FALSE; result.is_temporary = FALSE;
result.type = type_new_int(TYPE_BASIC_INT, 0); result.type = type_new_int(TYPE_BASIC_INT, 0);
break; break;
...@@ -634,7 +628,6 @@ static struct expression_type resolve_expression(const struct expr_loc *expr_loc ...@@ -634,7 +628,6 @@ static struct expression_type resolve_expression(const struct expr_loc *expr_loc
result_right = resolve_expression(expr_loc, cont_type, e->u.ext); result_right = resolve_expression(expr_loc, cont_type, e->u.ext);
check_scalar_type(expr_loc, cont_type, result_left.type); check_scalar_type(expr_loc, cont_type, result_left.type);
check_scalar_type(expr_loc, cont_type, result_right.type); check_scalar_type(expr_loc, cont_type, result_right.type);
result.is_variable = FALSE;
result.is_temporary = FALSE; result.is_temporary = FALSE;
result.type = type_new_int(TYPE_BASIC_INT, 0); result.type = type_new_int(TYPE_BASIC_INT, 0);
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment