M4-10-2 fix compilation

Author: mbaluda

cpp/common/test/rules/ifelseterminationconstruct/IfElseTerminationConstruct.expected

@@ -1,3 +1,3 @@
-| test.cpp:21:5:25:5 | if (...) ...  | The $@ construct does not terminate with else statement. | test.cpp:21:5:25:5 | if (...) ...  | `if...else` |
-| test.cpp:41:7:45:7 | if (...) ...  | The $@ construct does not terminate with else statement. | test.cpp:41:7:45:7 | if (...) ...  | `if...else` |
-| test.cpp:55:5:65:5 | if (...) ...  | The $@ construct does not terminate with else statement. | test.cpp:55:5:65:5 | if (...) ...  | `if...else` |
+| test.cpp:21:3:25:3 | if (...) ...  | The $@ construct does not terminate with else statement. | test.cpp:21:3:25:3 | if (...) ...  | `if...else` |
+| test.cpp:41:5:45:5 | if (...) ...  | The $@ construct does not terminate with else statement. | test.cpp:41:5:45:5 | if (...) ...  | `if...else` |
+| test.cpp:55:3:65:3 | if (...) ...  | The $@ construct does not terminate with else statement. | test.cpp:55:3:65:3 | if (...) ...  | `if...else` |

cpp/common/test/rules/ifelseterminationconstruct/test.cpp

@@ -10,58 +10,57 @@ void test_ifelse_valid(int expression) {
   } else {
     k = j * j;
   }
-  void test_ifelse_mix_validity(int expression) {
-    int i = 4;
-    int j = 7;
-    int k;
-
-    if (expression > 0) { // GOOD
-      k = i * i;
-    }
-    if (expression > 10) { // BAD
-      k = i + j;
-    } else if (expression < 0) {
-      k = i * 2;
-    }
+}
+void test_ifelse_mix_validity(int expression) {
+  int i = 4;
+  int j = 7;
+  int k;
+  if (expression > 0) { // GOOD
+    k = i * i;
   }
+  if (expression > 10) { // BAD
+    k = i + j;
+  } else if (expression < 0) {
+    k = i * 2;
+  }
+}
 
-  void test_ifelse_nested_invalid(int expression) {
-    int i = 5;
-    int j = 7;
-    int k;
+void test_ifelse_nested_invalid(int expression) {
+  int i = 5;
+  int j = 7;
+  int k;
 
-    if (expression > 0) { // GOOD
-      k = i * i * i;
-    } else {
-      k = i * j;
-    }
-    if (expression > 10) { // GOOD
-      k = i;
-    } else if (expression < 0) {
-      if (expression < -10) { // BAD
-        k = 5 + j;
-      } else if (expression < -20) {
-        k = i * 3;
-      }
-    } else {
-      k = 3;
+  if (expression > 0) { // GOOD
+    k = i * i * i;
+  } else {
+    k = i * j;
+  }
+  if (expression > 10) { // GOOD
+    k = i;
+  } else if (expression < 0) {
+    if (expression < -10) { // BAD
+      k = 5 + j;
+    } else if (expression < -20) {
+      k = i * 3;
     }
+  } else {
+    k = 3;
   }
+}
 
-  void test_ifelse_nested_valid(int expression) {
-    int i = 3;
-    int j = 1;
-    int k;
-    if (expression > 10) { // BAD
-      k = i + j;
-    } else if (expression < 0) {
-      if (i > 3) { // GOOD
-        k = j;
-      } else if (i < 10) {
-        k = i % 3;
-      } else {
-        i = i % 2;
-      }
+void test_ifelse_nested_valid(int expression) {
+  int i = 3;
+  int j = 1;
+  int k;
+  if (expression > 10) { // BAD
+    k = i + j;
+  } else if (expression < 0) {
+    if (i > 3) { // GOOD
+      k = j;
+    } else if (i < 10) {
+      k = i % 3;
+    } else {
+      i = i % 2;
     }
   }
 }