Fix incorrect removal of braces of an 'if' statement that is followed by

and 'else' and have a nested 'if' before the 'else'.
madscientist · Nov 20, 2010 · bda365f · bda365f
1 parent 2d1498c
commit bda365f
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/src/braces.cpp b/src/braces.cpp
@@ -291,6 +291,23 @@ static bool can_remove_braces(chunk_t *bopen)
       return(false);
    }
 
+   if ((pc->type == CT_BRACE_CLOSE) && (pc->parent_type == CT_IF))
+   {
+      chunk_t *next = chunk_get_next_ncnl(pc, CNAV_PREPROC);
+
+      prev = chunk_get_prev_ncnl(pc, CNAV_PREPROC);
+
+      if ((next != NULL) && (next->type == CT_ELSE) &&
+          ((prev->type == CT_BRACE_CLOSE) || (prev->type == CT_VBRACE_CLOSE)) &&
+          (prev->parent_type == CT_IF))
+      {
+         LOG_FMT(LBRDEL, " - bailed on '%s'[%s] on line %d due to 'if' and 'else' sequence\n",
+                 get_token_name(pc->type), get_token_name(pc->parent_type),
+                 pc->orig_line);
+         return(false);
+      }
+   }
+
    LOG_FMT(LBRDEL, " - end on '%s' on line %d. if_count=%d semi_count=%d\n",
            get_token_name(pc->type), pc->orig_line, if_count, semi_count);
 

diff --git a/tests/input/c/if_chain.c b/tests/input/c/if_chain.c
@@ -68,3 +68,15 @@ void bar(void)
 #endif /* ifdef SOME_DEFINE */
 			}
 }
+
+void funct(int v1, int v2, int v3)
+{
+    if ( v1 )
+    {
+	if ( v2 ) f1();
+    }
+    else
+    {
+	if ( v3 ) f2();
+    }
+}
diff --git a/tests/output/c/00054-if_chain.c b/tests/output/c/00054-if_chain.c
@@ -68,3 +68,12 @@ void bar(void)
 #endif /* ifdef SOME_DEFINE */
 	}
 }
+
+void funct(int v1, int v2, int v3)
+{
+	if (v1) {
+		if (v2) f1();
+	} else {
+		if (v3) f2();
+	}
+}