diff options
| author | liangdzou <liang.d.zou@gmail.com> | 2018-09-20 18:01:51 +0800 |
|---|---|---|
| committer | liangdzou <liang.d.zou@gmail.com> | 2018-09-20 21:31:16 +0800 |
| commit | 982d883a8819ec633dc227b47b57f4c24d676b03 (patch) | |
| tree | e49d347e9998216e57d3c21fc00a5b0bb6a1886d | |
| parent | 5a473ab6824512512b8642af66759abb34cf3a23 (diff) | |
| download | dexon-solidity-982d883a8819ec633dc227b47b57f4c24d676b03.tar.gz dexon-solidity-982d883a8819ec633dc227b47b57f4c24d676b03.tar.zst dexon-solidity-982d883a8819ec633dc227b47b57f4c24d676b03.zip | |
enhance test_trailing_whitespace to test_check_style: several format rules for if/for are introduced
| -rw-r--r-- | .circleci/config.yml | 6 | ||||
| -rwxr-xr-x | scripts/check_style.sh | 32 | ||||
| -rwxr-xr-x | scripts/detect_trailing_whitespace.sh | 15 |
3 files changed, 35 insertions, 18 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e3d8c0a..8766883d 100644 --- a/.circleci/config.yml +++ b/.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: diff --git a/scripts/check_style.sh b/scripts/check_style.sh new file mode 100755 index 00000000..a8557a54 --- /dev/null +++ b/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 +) diff --git a/scripts/detect_trailing_whitespace.sh b/scripts/detect_trailing_whitespace.sh deleted file mode 100755 index 1a136a10..00000000 --- a/scripts/detect_trailing_whitespace.sh +++ /dev/null @@ -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 -) |