enhance test_trailing_whitespace to test_check_style: several format rules for if/for are introduced

.circleci/config.yml

@@ -179,14 +179,14 @@ jobs:
           name: Check spelling
           command: ~/.local/bin/codespell -S "*.enc,.git" -I ./scripts/codespell_whitelist.txt
 
-  test_trailing_whitespace:
+  test_check_style:
     docker:
       - image: buildpack-deps:artful
     steps:
       - checkout
       - run:
           name: Check for trailing whitespace
-          command: ./scripts/detect_trailing_whitespace.sh
+          command: ./scripts/check_style.sh
 
   test_buglist:
     docker:
@@ -278,7 +278,7 @@ workflows:
   build_all:
     jobs:
       - test_check_spelling: *build_on_tags
-      - test_trailing_whitespace: *build_on_tags
+      - test_check_style: *build_on_tags
       - test_buglist: *build_on_tags
       - build_emscripten: *build_on_tags
       - test_emscripten_solcjs:

scripts/check_style.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+REPO_ROOT="$(dirname "$0")"/..
+
+(
+cd $REPO_ROOT
+WHITESPACE=$(git grep -n -I -E "^.*[[:space:]]+$" | grep -v "test/libsolidity/ASTJSON\|test/compilationTests/zeppelin/LICENSE")
+
+if [[ "$WHITESPACE" != "" ]]
+then
+	echo "Error: Trailing whitespace found:" >&2
+	echo "$WHITESPACE" >&2
+	exit 1
+fi
+)
+
+(
+cd $REPO_ROOT
+FORMATERROR=$(
+(
+git grep -nIE "\<(if|for)\(" -- '*.h' '*.cpp'
+git grep -nIE "\<if\>\s*\(.*\)\s*\{\s*$" -- '*.h' '*.cpp'
+) | egrep -v "^[a-zA-Z\./]*:[0-9]*:\s*\/(\/|\*)" | egrep -v "^test/"
+)
+
+if [[ "$FORMATERROR" != "" ]]
+then
+	echo "Error: Format error for if/for:" >&2
+	echo "$FORMATERROR" >&2
+	exit 1
+fi
+)

scripts/detect_trailing_whitespace.sh

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-REPO_ROOT="$(dirname "$0")"/..
-
-(
-cd $REPO_ROOT
-WHITESPACE=$(git grep -n -I -E "^.*[[:space:]]+$" | grep -v "test/libsolidity/ASTJSON\|test/compilationTests/zeppelin/LICENSE")
-
-if [[ "$WHITESPACE" != "" ]]
-then
-	echo "Error: Trailing whitespace found:" >&2
-	echo "$WHITESPACE" >&2
-	exit 1
-fi
-)