X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=1502d2ed4242732a62b3fcc7794ddde4318de69f;hb=4ccdad496797f05c13ddb2723c52e42eb9023496;hp=e824a7c381b8fc01581d47f77033feda2255fa7c;hpb=a4a8e838f3168905ade6204763b1bfe287524f1f;p=cparser

diff --git a/parser.c b/parser.c
index e824a7c..1502d2e 100644
--- a/parser.c
+++ b/parser.c
@@ -6855,19 +6855,18 @@ static expression_t *parse_array_expression(unsigned precedence,
 				orig_type_left, orig_type_inside);
 		}
 		return_type             = type_error_type;
-		array_access->array_ref = create_invalid_expression();
+		array_access->array_ref = left;
+		array_access->index     = inside;
 	}
 
+	expression->base.type = automatic_type_conversion(return_type);
+
 	rem_anchor_token(']');
-	if (token.type != ']') {
+	if (token.type == ']') {
+		next_token();
+	} else {
 		parse_error_expected("Problem while parsing array access", ']', NULL);
-		return expression;
 	}
-	next_token();
-
-	return_type           = automatic_type_conversion(return_type);
-	expression->base.type = return_type;
-
 	return expression;
 }
 
@@ -7598,6 +7597,9 @@ static type_t *semantic_arithmetic(type_t *type_left, type_t *type_right)
 {
 	/* TODO: handle complex + imaginary types */
 
+	type_left  = get_unqualified_type(type_left);
+	type_right = get_unqualified_type(type_right);
+
 	/* § 6.3.1.8 Usual arithmetic conversions */
 	if (type_left == type_long_double || type_right == type_long_double) {
 		return type_long_double;
@@ -7684,10 +7686,15 @@ static void semantic_binexpr_arithmetic(binary_expression_t *expression)
 
 static void warn_div_by_zero(binary_expression_t const *const expression)
 {
-	if (warning.div_by_zero                       &&
-	    is_type_integer(expression->base.type)    &&
-	    is_constant_expression(expression->right) &&
-	    fold_constant(expression->right) == 0) {
+	if (!warning.div_by_zero ||
+	    !is_type_integer(expression->base.type))
+		return;
+
+	expression_t const *const right = expression->right;
+	/* The type of the right operand can be different for /= */
+	if (is_type_integer(right->base.type) &&
+	    is_constant_expression(right)     &&
+	    fold_constant(right) == 0) {
 		warningf(&expression->base.source_position, "division by zero");
 	}
 }
@@ -9475,13 +9482,18 @@ static statement_t *intern_parse_statement(void)
 		} else if (is_typedef_symbol(token.v.symbol)) {
 			statement = parse_declaration_statement();
 		} else switch (la1_type) {
+			case '*':
+				if (get_declaration(token.v.symbol, NAMESPACE_NORMAL) != NULL)
+					goto expression_statment;
+				/* FALLTHROUGH */
+
 			DECLARATION_START
 			case T_IDENTIFIER:
-			case '*':
 				statement = parse_declaration_statement();
 				break;
 
 			default:
+expression_statment:
 				statement = parse_expression_statement();
 				break;
 		}