From 9d34d7de2fdae05134f9b6acc455236f640e2c4a Mon Sep 17 00:00:00 2001
From: Gaith Hallak <gaithhallak@gmail.com>
Date: Mon, 30 Sep 2019 02:32:28 +0300
Subject: [PATCH] Remove trailing spaces from JSON output

---
 libsolidity/ast/ASTJsonConverter.cpp          |   3 +-
 scripts/check_style.sh                        |   2 +-
 .../recovery_ast_constructor/output           | 476 +++++++++---------
 3 files changed, 241 insertions(+), 240 deletions(-)

diff --git a/libsolidity/ast/ASTJsonConverter.cpp b/libsolidity/ast/ASTJsonConverter.cpp
index 82d47b06c..599656ebc 100644
--- a/libsolidity/ast/ASTJsonConverter.cpp
+++ b/libsolidity/ast/ASTJsonConverter.cpp
@@ -24,6 +24,7 @@
 #include <libsolidity/ast/AST.h>
 #include <libyul/AsmData.h>
 #include <libyul/AsmPrinter.h>
+#include <libdevcore/JSON.h>
 #include <libdevcore/UTF8.h>
 #include <boost/algorithm/string/join.hpp>
 
@@ -189,7 +190,7 @@ Json::Value ASTJsonConverter::inlineAssemblyIdentifierToJson(pair<yul::Identifie
 
 void ASTJsonConverter::print(ostream& _stream, ASTNode const& _node)
 {
-	_stream << toJson(_node);
+	_stream << jsonPrettyPrint(toJson(_node));
 }
 
 Json::Value&& ASTJsonConverter::toJson(ASTNode const& _node)
diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index 4e56143fa..0f9a8096e 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -6,7 +6,7 @@
 REPO_ROOT="$(dirname "$0")"/..
 cd $REPO_ROOT
 
-WHITESPACE=$(git grep -n -I -E "^.*[[:space:]]+$" | grep -v "test/libsolidity/ASTJSON\|test/libsolidity/ASTRecoveryTests\|test/compilationTests/zeppelin/LICENSE\|test/cmdlineTests/recovery_ast_constructor/output")
+WHITESPACE=$(git grep -n -I -E "^.*[[:space:]]+$" | grep -v "test/libsolidity/ASTJSON\|test/libsolidity/ASTRecoveryTests\|test/compilationTests/zeppelin/LICENSE")
 
 if [[ "$WHITESPACE" != "" ]]
 then
diff --git a/test/cmdlineTests/recovery_ast_constructor/output b/test/cmdlineTests/recovery_ast_constructor/output
index a35fe35e1..b9abae6a8 100644
--- a/test/cmdlineTests/recovery_ast_constructor/output
+++ b/test/cmdlineTests/recovery_ast_constructor/output
@@ -3,242 +3,242 @@ JSON AST:
 
 ======= recovery_ast_constructor/input.sol =======
 {
-	"attributes" : 
-	{
-		"absolutePath" : "recovery_ast_constructor/input.sol",
-		"exportedSymbols" : 
-		{
-			"Error1" : 
-			[
-				18
-			]
-		}
-	},
-	"children" : 
-	[
-		{
-			"attributes" : 
-			{
-				"literals" : 
-				[
-					"solidity",
-					">=",
-					"0.0",
-					".0"
-				]
-			},
-			"id" : 1,
-			"name" : "PragmaDirective",
-			"src" : "0:24:0"
-		},
-		{
-			"attributes" : 
-			{
-				"baseContracts" : 
-				[
-					null
-				],
-				"contractDependencies" : 
-				[
-					null
-				],
-				"contractKind" : "contract",
-				"documentation" : null,
-				"fullyImplemented" : true,
-				"linearizedBaseContracts" : 
-				[
-					18
-				],
-				"name" : "Error1",
-				"scope" : 19
-			},
-			"children" : 
-			[
-				{
-					"attributes" : 
-					{
-						"documentation" : null,
-						"implemented" : true,
-						"isConstructor" : true,
-						"kind" : "constructor",
-						"modifiers" : 
-						[
-							null
-						],
-						"name" : "",
-						"overrides" : null,
-						"scope" : 18,
-						"stateMutability" : "nonpayable",
-						"superFunction" : null,
-						"visibility" : "public"
-					},
-					"children" : 
-					[
-						{
-							"attributes" : 
-							{
-								"parameters" : 
-								[
-									null
-								]
-							},
-							"children" : [],
-							"id" : 2,
-							"name" : "ParameterList",
-							"src" : "57:2:0"
-						},
-						{
-							"attributes" : 
-							{
-								"parameters" : 
-								[
-									null
-								]
-							},
-							"children" : [],
-							"id" : 3,
-							"name" : "ParameterList",
-							"src" : "67:0:0"
-						},
-						{
-							"attributes" : 
-							{
-								"statements" : 
-								[
-									null
-								]
-							},
-							"children" : [],
-							"id" : 8,
-							"name" : "Block",
-							"src" : "67:49:0"
-						}
-					],
-					"id" : 9,
-					"name" : "FunctionDefinition",
-					"src" : "46:70:0"
-				},
-				{
-					"attributes" : 
-					{
-						"documentation" : null,
-						"implemented" : true,
-						"isConstructor" : false,
-						"kind" : "function",
-						"modifiers" : 
-						[
-							null
-						],
-						"name" : "five",
-						"overrides" : null,
-						"scope" : 18,
-						"stateMutability" : "view",
-						"superFunction" : null,
-						"visibility" : "public"
-					},
-					"children" : 
-					[
-						{
-							"attributes" : 
-							{
-								"parameters" : 
-								[
-									null
-								]
-							},
-							"children" : [],
-							"id" : 10,
-							"name" : "ParameterList",
-							"src" : "382:2:0"
-						},
-						{
-							"children" : 
-							[
-								{
-									"attributes" : 
-									{
-										"constant" : false,
-										"name" : "",
-										"overrides" : null,
-										"scope" : 17,
-										"stateVariable" : false,
-										"storageLocation" : "default",
-										"type" : "uint256",
-										"value" : null,
-										"visibility" : "internal"
-									},
-									"children" : 
-									[
-										{
-											"attributes" : 
-											{
-												"name" : "uint",
-												"type" : "uint256"
-											},
-											"id" : 11,
-											"name" : "ElementaryTypeName",
-											"src" : "405:4:0"
-										}
-									],
-									"id" : 12,
-									"name" : "VariableDeclaration",
-									"src" : "405:4:0"
-								}
-							],
-							"id" : 13,
-							"name" : "ParameterList",
-							"src" : "404:6:0"
-						},
-						{
-							"children" : 
-							[
-								{
-									"attributes" : 
-									{
-										"functionReturnParameters" : 13
-									},
-									"children" : 
-									[
-										{
-											"attributes" : 
-											{
-												"argumentTypes" : null,
-												"hexvalue" : "35",
-												"isConstant" : false,
-												"isLValue" : false,
-												"isPure" : true,
-												"lValueRequested" : false,
-												"subdenomination" : null,
-												"token" : "number",
-												"type" : "int_const 5",
-												"value" : "5"
-											},
-											"id" : 14,
-											"name" : "Literal",
-											"src" : "424:1:0"
-										}
-									],
-									"id" : 15,
-									"name" : "Return",
-									"src" : "417:8:0"
-								}
-							],
-							"id" : 16,
-							"name" : "Block",
-							"src" : "411:19:0"
-						}
-					],
-					"id" : 17,
-					"name" : "FunctionDefinition",
-					"src" : "369:61:0"
-				}
-			],
-			"id" : 18,
-			"name" : "ContractDefinition",
-			"src" : "26:406:0"
-		}
-	],
-	"id" : 19,
-	"name" : "SourceUnit",
-	"src" : "0:433:0"
+  "attributes":
+  {
+    "absolutePath": "recovery_ast_constructor/input.sol",
+    "exportedSymbols":
+    {
+      "Error1":
+      [
+        18
+      ]
+    }
+  },
+  "children":
+  [
+    {
+      "attributes":
+      {
+        "literals":
+        [
+          "solidity",
+          ">=",
+          "0.0",
+          ".0"
+        ]
+      },
+      "id": 1,
+      "name": "PragmaDirective",
+      "src": "0:24:0"
+    },
+    {
+      "attributes":
+      {
+        "baseContracts":
+        [
+          null
+        ],
+        "contractDependencies":
+        [
+          null
+        ],
+        "contractKind": "contract",
+        "documentation": null,
+        "fullyImplemented": true,
+        "linearizedBaseContracts":
+        [
+          18
+        ],
+        "name": "Error1",
+        "scope": 19
+      },
+      "children":
+      [
+        {
+          "attributes":
+          {
+            "documentation": null,
+            "implemented": true,
+            "isConstructor": true,
+            "kind": "constructor",
+            "modifiers":
+            [
+              null
+            ],
+            "name": "",
+            "overrides": null,
+            "scope": 18,
+            "stateMutability": "nonpayable",
+            "superFunction": null,
+            "visibility": "public"
+          },
+          "children":
+          [
+            {
+              "attributes":
+              {
+                "parameters":
+                [
+                  null
+                ]
+              },
+              "children": [],
+              "id": 2,
+              "name": "ParameterList",
+              "src": "57:2:0"
+            },
+            {
+              "attributes":
+              {
+                "parameters":
+                [
+                  null
+                ]
+              },
+              "children": [],
+              "id": 3,
+              "name": "ParameterList",
+              "src": "67:0:0"
+            },
+            {
+              "attributes":
+              {
+                "statements":
+                [
+                  null
+                ]
+              },
+              "children": [],
+              "id": 8,
+              "name": "Block",
+              "src": "67:49:0"
+            }
+          ],
+          "id": 9,
+          "name": "FunctionDefinition",
+          "src": "46:70:0"
+        },
+        {
+          "attributes":
+          {
+            "documentation": null,
+            "implemented": true,
+            "isConstructor": false,
+            "kind": "function",
+            "modifiers":
+            [
+              null
+            ],
+            "name": "five",
+            "overrides": null,
+            "scope": 18,
+            "stateMutability": "view",
+            "superFunction": null,
+            "visibility": "public"
+          },
+          "children":
+          [
+            {
+              "attributes":
+              {
+                "parameters":
+                [
+                  null
+                ]
+              },
+              "children": [],
+              "id": 10,
+              "name": "ParameterList",
+              "src": "382:2:0"
+            },
+            {
+              "children":
+              [
+                {
+                  "attributes":
+                  {
+                    "constant": false,
+                    "name": "",
+                    "overrides": null,
+                    "scope": 17,
+                    "stateVariable": false,
+                    "storageLocation": "default",
+                    "type": "uint256",
+                    "value": null,
+                    "visibility": "internal"
+                  },
+                  "children":
+                  [
+                    {
+                      "attributes":
+                      {
+                        "name": "uint",
+                        "type": "uint256"
+                      },
+                      "id": 11,
+                      "name": "ElementaryTypeName",
+                      "src": "405:4:0"
+                    }
+                  ],
+                  "id": 12,
+                  "name": "VariableDeclaration",
+                  "src": "405:4:0"
+                }
+              ],
+              "id": 13,
+              "name": "ParameterList",
+              "src": "404:6:0"
+            },
+            {
+              "children":
+              [
+                {
+                  "attributes":
+                  {
+                    "functionReturnParameters": 13
+                  },
+                  "children":
+                  [
+                    {
+                      "attributes":
+                      {
+                        "argumentTypes": null,
+                        "hexvalue": "35",
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "lValueRequested": false,
+                        "subdenomination": null,
+                        "token": "number",
+                        "type": "int_const 5",
+                        "value": "5"
+                      },
+                      "id": 14,
+                      "name": "Literal",
+                      "src": "424:1:0"
+                    }
+                  ],
+                  "id": 15,
+                  "name": "Return",
+                  "src": "417:8:0"
+                }
+              ],
+              "id": 16,
+              "name": "Block",
+              "src": "411:19:0"
+            }
+          ],
+          "id": 17,
+          "name": "FunctionDefinition",
+          "src": "369:61:0"
+        }
+      ],
+      "id": 18,
+      "name": "ContractDefinition",
+      "src": "26:406:0"
+    }
+  ],
+  "id": 19,
+  "name": "SourceUnit",
+  "src": "0:433:0"
 }