com.c (type_for_mode): Add explicit braces to avoid ambiguous `else'.

        * com.c (type_for_mode): Add explicit braces to avoid ambiguous `else'.
        * expr.c (ffeexpr_type_combine): Likewise.
        (ffeexpr_reduce_): Likewise.
        (ffeexpr_declare_parenthesized_): Likewise.
        * src.c (ffesrc_strcmp_1ns2i): Likewise.
        (ffesrc_strcmp_2c): Likewise.
        (ffesrc_strncmp_2c): Likewise.
        * stb.c (ffestb_halt1_): Likewise.
        (ffestb_R90910_): Likewise.
        (ffestb_R9109_): Likewise.
        * stc.c (ffestc_R544_equiv_): Likewise.
        * std.c (ffestd_subr_copy_easy_): Likewise.
        (ffestd_R1001dump_): Likewise.
        (ffestd_R1001dump_1005_1_): Likewise.
        (ffestd_R1001dump_1005_2_): Likewise.
        (ffestd_R1001dump_1005_3_): Likewise.
        (ffestd_R1001dump_1005_4_): Likewise.
        (ffestd_R1001dump_1005_5_): Likewise.
        (ffestd_R1001dump_1010_2_): Likewise.
        * ste.c (ffeste_R840): Likewise.
        * sts.c (ffests_puttext): Likewise.
        * symbol.c (ffesymbol_check_token_): Likewise.
        * target.c (ffetarget_real1): Likewise.
        (ffetarget_real2): Likewise.

From-SVN: r17884

1 files changed, 44 insertions, 34 deletions

diff --git a/gcc/f/expr.c b/gcc/f/expr.c
index 8f41f3d..4d618db 100644
--- a/gcc/f/expr.c
+++ b/gcc/f/expr.c
@@ -8761,10 +8761,12 @@ ffeexpr_type_combine (ffeinfoBasictype *xnbt, ffeinfoKindtype *xnkt,
   else
     {				/* The normal stuff. */
       if (nbt == lbt)
-	if (nbt == rbt)
-	  nkt = ffeinfo_kindtype_max (nbt, lkt, rkt);
-	else
-	  nkt = lkt;
+	{
+	  if (nbt == rbt)
+	    nkt = ffeinfo_kindtype_max (nbt, lkt, rkt);
+	  else
+	    nkt = lkt;
+	}
       else if (nbt == rbt)
 	nkt = rkt;
       else
@@ -10022,26 +10024,30 @@ ffeexpr_reduce_ ()
 	      && (left_operand->previous->type != FFEEXPR_exprtypeOPERAND_)
 	      && (left_operand->previous->u.operator.op
 		  == FFEEXPR_operatorSUBTRACT_))
-	    if (left_operand->previous->type == FFEEXPR_exprtypeUNARY_)
-	      ffetarget_integer_bad_magical_precedence (left_operand->token,
-					      left_operand->previous->token,
-							operator->token);
-	    else
-	      ffetarget_integer_bad_magical_precedence_binary
-		(left_operand->token,
-		 left_operand->previous->token,
-		 operator->token);
+	    {
+	      if (left_operand->previous->type == FFEEXPR_exprtypeUNARY_)
+		ffetarget_integer_bad_magical_precedence (left_operand->token,
+							  left_operand->previous->token,
+							  operator->token);
+	      else
+		ffetarget_integer_bad_magical_precedence_binary
+		  (left_operand->token,
+		   left_operand->previous->token,
+		   operator->token);
+	    }
 	  else
 	    ffetarget_integer_bad_magical (left_operand->token);
 	}
       if ((ffebld_op (expr) == FFEBLD_opCONTER)
 	  && (ffebld_conter_orig (expr) == NULL)
 	  && ffebld_constant_is_magical (constnode = ffebld_conter (expr)))
-	if (submag)
-	  ffetarget_integer_bad_magical_binary (operand->token,
-						operator->token);
-	else
-	  ffetarget_integer_bad_magical (operand->token);
+	{
+	  if (submag)
+	    ffetarget_integer_bad_magical_binary (operand->token,
+						  operator->token);
+	  else
+	    ffetarget_integer_bad_magical (operand->token);
+	}
       ffeexpr_stack_->exprstack = left_operand->previous;	/* Pops binary-op
 								   operands off stack. */
       ffeexpr_expr_kill_ (left_operand);
@@ -17901,13 +17907,15 @@ ffeexpr_declare_parenthesized_ (ffelexToken t, bool maybe_intrin,
 
 	case FFEINFO_kindENTITY:
 	  if (ffesymbol_rank (s) == 0)
-	    if (ffesymbol_basictype (s) == FFEINFO_basictypeCHARACTER)
-	      *paren_type = FFEEXPR_parentypeSUBSTRING_;
-	    else
-	      {
-		bad = TRUE;
-		*paren_type = FFEEXPR_parentypeANY_;
-	      }
+	    {
+	      if (ffesymbol_basictype (s) == FFEINFO_basictypeCHARACTER)
+		*paren_type = FFEEXPR_parentypeSUBSTRING_;
+	      else
+		{
+		  bad = TRUE;
+		  *paren_type = FFEEXPR_parentypeANY_;
+		}
+	    }
 	  else
 	    *paren_type = FFEEXPR_parentypeARRAY_;
 	  break;
@@ -18028,15 +18036,17 @@ ffeexpr_declare_parenthesized_ (ffelexToken t, bool maybe_intrin,
 
 	case FFEINFO_kindENTITY:
 	  if (ffesymbol_rank (s) == 0)
-	    if (ffeexpr_stack_->context == FFEEXPR_contextEQUIVALENCE)
-	      *paren_type = FFEEXPR_parentypeEQUIVALENCE_;
-	    else if (ffesymbol_basictype (s) == FFEINFO_basictypeCHARACTER)
-	      *paren_type = FFEEXPR_parentypeSUBSTRING_;
-	    else
-	      {
-		bad = TRUE;
-		*paren_type = FFEEXPR_parentypeANY_;
-	      }
+	    {
+	      if (ffeexpr_stack_->context == FFEEXPR_contextEQUIVALENCE)
+		*paren_type = FFEEXPR_parentypeEQUIVALENCE_;
+	      else if (ffesymbol_basictype (s) == FFEINFO_basictypeCHARACTER)
+		*paren_type = FFEEXPR_parentypeSUBSTRING_;
+	      else
+		{
+		  bad = TRUE;
+		  *paren_type = FFEEXPR_parentypeANY_;
+		}
+	    }
 	  else
 	    *paren_type = FFEEXPR_parentypeARRAY_;
 	  break;