From 1cd96b2dc482ed484e87de7c26a4af54aca45e1d Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 4 Sep 2018 17:17:07 +0200
Subject: Trailing whitespace detection script and circleci job.

---
 .circleci/config.yml                  | 10 ++++++++++
 scripts/detect_trailing_whitespace.sh | 17 +++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100755 scripts/detect_trailing_whitespace.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4514626b..aec8be18 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -179,6 +179,15 @@ jobs:
           name: Check spelling
           command: ~/.local/bin/codespell -S "*.enc,.git" -I ./scripts/codespell_whitelist.txt
 
+  test_trailing_whitespace:
+    docker:
+      - image: buildpack-deps:artful
+    steps:
+      - checkout
+      - run:
+          name: Check for trailing whitespace
+          command: ./scripts/detect_trailing_whitespace.sh
+
   test_buglist:
       docker:
         - image: circleci/node
@@ -263,6 +272,7 @@ workflows:
   build_all:
     jobs:
       - test_check_spelling: *build_on_tags
+      - test_trailing_whitespace: *build_on_tags
       - test_buglist: *build_on_tags
       - build_emscripten: *build_on_tags
       - test_emscripten_solcjs:
diff --git a/scripts/detect_trailing_whitespace.sh b/scripts/detect_trailing_whitespace.sh
new file mode 100755
index 00000000..78e69584
--- /dev/null
+++ b/scripts/detect_trailing_whitespace.sh
@@ -0,0 +1,17 @@
+#!/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
+else
+	exit 0
+fi
+)
-- 
cgit v1.2.3


From 1ae6ec9038d83a82d5e8b57a8c6138dd4970d422 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 4 Sep 2018 17:28:52 +0200
Subject: Remove trailing whitespace.

---
 libsolidity/codegen/ExpressionCompiler.cpp | 2 +-
 scripts/detect_trailing_whitespace.sh      | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 3e8b7337..a13b3e6c 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -1827,7 +1827,7 @@ void ExpressionCompiler::appendExternalFunctionCall(
 	auto funKind = _functionType.kind();
 
 	solAssert(funKind != FunctionType::Kind::BareStaticCall || m_context.evmVersion().hasStaticCall(), "");
-	
+
 	bool returnSuccessConditionAndReturndata = funKind == FunctionType::Kind::BareCall || funKind == FunctionType::Kind::BareCallCode || funKind == FunctionType::Kind::BareDelegateCall || funKind == FunctionType::Kind::BareStaticCall;
 	bool isCallCode = funKind == FunctionType::Kind::BareCallCode;
 	bool isDelegateCall = funKind == FunctionType::Kind::BareDelegateCall || funKind == FunctionType::Kind::DelegateCall;
diff --git a/scripts/detect_trailing_whitespace.sh b/scripts/detect_trailing_whitespace.sh
index 78e69584..1a136a10 100755
--- a/scripts/detect_trailing_whitespace.sh
+++ b/scripts/detect_trailing_whitespace.sh
@@ -9,9 +9,7 @@ WHITESPACE=$(git grep -n -I -E "^.*[[:space:]]+$" | grep -v "test/libsolidity/AS
 if [[ "$WHITESPACE" != "" ]]
 then
 	echo "Error: Trailing whitespace found:" >&2
-	echo "\"$WHITESPACE\"" >&2
+	echo "$WHITESPACE" >&2
 	exit 1
-else
-	exit 0
 fi
 )
-- 
cgit v1.2.3