cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7507 from ghallak/develop_060

Browse Source 
Remove trailing spaces from JSON output
This commit is contained in:
chriseth 2019-10-02 18:58:59 +02:00 committed by GitHub
commit f5050952f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
53 changed files with 8134 additions and 8133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libsolidity/ast/ASTJsonConverter.cpp
View File

@ -24,6 +24,7 @@
#include <libsolidity/ast/AST.h> #include <libsolidity/ast/AST.h>
#include <libyul/AsmData.h> #include <libyul/AsmData.h>
#include <libyul/AsmPrinter.h> #include <libyul/AsmPrinter.h>
#include <libdevcore/JSON.h>
#include <libdevcore/UTF8.h> #include <libdevcore/UTF8.h>
#include <boost/algorithm/string/join.hpp> #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) void ASTJsonConverter::print(ostream& _stream, ASTNode const& _node)
{ {
_stream << toJson(_node); _stream << jsonPrettyPrint(toJson(_node));
} }
Json::Value&& ASTJsonConverter::toJson(ASTNode const& _node) Json::Value&& ASTJsonConverter::toJson(ASTNode const& _node)

2
scripts/check_style.sh
View File

@ -6,7 +6,7 @@
REPO_ROOT="$(dirname "$0")"/.. REPO_ROOT="$(dirname "$0")"/..
cd $REPO_ROOT 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" != "" ]] if [[ "$WHITESPACE" != "" ]]
then then