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 #7279 from ethereum/consistent-json-order

Browse Source 
Make sure json output array order is consistent
This commit is contained in:
chriseth 2019-08-19 21:51:59 +02:00 committed by GitHub
commit 34fbaf018d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 549 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libsolidity/ast/ASTJsonConverter.cpp
View File

@ -27,6 +27,9 @@
#include <libdevcore/UTF8.h> #include <libdevcore/UTF8.h>
#include <boost/algorithm/string/join.hpp> #include <boost/algorithm/string/join.hpp>
#include <vector>
#include <algorithm>
using namespace std; using namespace std;
using namespace langutil; using namespace langutil;
@ -259,7 +262,7 @@ bool ASTJsonConverter::visit(ContractDefinition const& _node)
make_pair("fullyImplemented", _node.annotation().unimplementedFunctions.empty()), make_pair("fullyImplemented", _node.annotation().unimplementedFunctions.empty()),
make_pair("linearizedBaseContracts", getContainerIds(_node.annotation().linearizedBaseContracts)), make_pair("linearizedBaseContracts", getContainerIds(_node.annotation().linearizedBaseContracts)),
make_pair("baseContracts", toJson(_node.baseContracts())), make_pair("baseContracts", toJson(_node.baseContracts())),
make_pair("contractDependencies", getContainerIds(_node.annotation().contractDependencies)), make_pair("contractDependencies", getContainerIds(_node.annotation().contractDependencies, true)),
make_pair("nodes", toJson(_node.subNodes())), make_pair("nodes", toJson(_node.subNodes())),
make_pair("scope", idOrNull(_node.scope())) make_pair("scope", idOrNull(_node.scope()))
}); });

20
libsolidity/ast/ASTJsonConverter.h
View File

@ -29,6 +29,8 @@
#include <json/json.h> #include <json/json.h>
#include <ostream> #include <ostream>
#include <stack> #include <stack>
#include <vector>
#include <algorithm>
namespace langutil namespace langutil
{ {
@ -148,15 +150,23 @@ private:
return _node.id(); return _node.id();
} }
template<class Container> template<class Container>
static Json::Value getContainerIds(Container const& container) static Json::Value getContainerIds(Container const& _container, bool _order = false)
{ {
Json::Value tmp(Json::arrayValue); std::vector<int> tmp;
for (auto const& element: container)
for (auto const& element: _container)
{ {
solAssert(element, ""); solAssert(element, "");
tmp.append(nodeId(*element)); tmp.push_back(nodeId(*element));
} }
return tmp; if (_order)
std::sort(tmp.begin(), tmp.end());
Json::Value json(Json::arrayValue);
for (int val: tmp)
json.append(val);
return json;
} }
static Json::Value typePointerToJson(TypePointer _tp, bool _short = false); static Json::Value typePointerToJson(TypePointer _tp, bool _short = false);
static Json::Value typePointerToJson(boost::optional<FuncCallArguments> const& _tps); static Json::Value typePointerToJson(boost::optional<FuncCallArguments> const& _tps);

233
test/libsolidity/ASTJSON/contract_dep_order.json Normal file
View File

@ -0,0 +1,233 @@
{
"absolutePath" : "a",
"exportedSymbols" :
{
"A" :
[
1
],
"B" :
[
4
],
"C" :
[
7
],
"D" :
[
10
],
"E" :
[
13
]
},
"id" : 14,
"nodeType" : "SourceUnit",
"nodes" :
[
{
"baseContracts" : [],
"contractDependencies" : [],
"contractKind" : "contract",
"documentation" : null,
"fullyImplemented" : true,
"id" : 1,
"linearizedBaseContracts" :
[
1
],
"name" : "A",
"nodeType" : "ContractDefinition",
"nodes" : [],
"scope" : 14,
"src" : "0:14:1"
},
{
"baseContracts" :
[
{
"arguments" : null,
"baseName" :
{
"contractScope" : null,
"id" : 2,
"name" : "A",
"nodeType" : "UserDefinedTypeName",
"referencedDeclaration" : 1,
"src" : "29:1:1",
"typeDescriptions" :
{
"typeIdentifier" : "t_contract$_A_$1",
"typeString" : "contract A"
}
},
"id" : 3,
"nodeType" : "InheritanceSpecifier",
"src" : "29:1:1"
}
],
"contractDependencies" :
[
1
],
"contractKind" : "contract",
"documentation" : null,
"fullyImplemented" : true,
"id" : 4,
"linearizedBaseContracts" :
[
4,
1
],
"name" : "B",
"nodeType" : "ContractDefinition",
"nodes" : [],
"scope" : 14,
"src" : "15:19:1"
},
{
"baseContracts" :
[
{
"arguments" : null,
"baseName" :
{
"contractScope" : null,
"id" : 5,
"name" : "B",
"nodeType" : "UserDefinedTypeName",
"referencedDeclaration" : 4,
"src" : "49:1:1",
"typeDescriptions" :
{
"typeIdentifier" : "t_contract$_B_$4",
"typeString" : "contract B"
}
},
"id" : 6,
"nodeType" : "InheritanceSpecifier",
"src" : "49:1:1"
}
],
"contractDependencies" :
[
1,
4
],
"contractKind" : "contract",
"documentation" : null,
"fullyImplemented" : true,
"id" : 7,
"linearizedBaseContracts" :
[
7,
4,
1
],
"name" : "C",
"nodeType" : "ContractDefinition",
"nodes" : [],
"scope" : 14,
"src" : "35:19:1"
},
{
"baseContracts" :
[
{
"arguments" : null,
"baseName" :
{
"contractScope" : null,
"id" : 8,
"name" : "C",
"nodeType" : "UserDefinedTypeName",
"referencedDeclaration" : 7,
"src" : "69:1:1",
"typeDescriptions" :
{
"typeIdentifier" : "t_contract$_C_$7",
"typeString" : "contract C"
}
},
"id" : 9,
"nodeType" : "InheritanceSpecifier",
"src" : "69:1:1"
}
],
"contractDependencies" :
[
1,
4,
7
],
"contractKind" : "contract",
"documentation" : null,
"fullyImplemented" : true,
"id" : 10,
"linearizedBaseContracts" :
[
10,
7,
4,
1
],
"name" : "D",
"nodeType" : "ContractDefinition",
"nodes" : [],
"scope" : 14,
"src" : "55:19:1"
},
{
"baseContracts" :
[
{
"arguments" : null,
"baseName" :
{
"contractScope" : null,
"id" : 11,
"name" : "D",
"nodeType" : "UserDefinedTypeName",
"referencedDeclaration" : 10,
"src" : "89:1:1",
"typeDescriptions" :
{
"typeIdentifier" : "t_contract$_D_$10",
"typeString" : "contract D"
}
},
"id" : 12,
"nodeType" : "InheritanceSpecifier",
"src" : "89:1:1"
}
],
"contractDependencies" :
[
1,
4,
7,
10
],
"contractKind" : "contract",
"documentation" : null,
"fullyImplemented" : true,
"id" : 13,
"linearizedBaseContracts" :
[
13,
10,
7,
4,
1
],
"name" : "E",
"nodeType" : "ContractDefinition",
"nodes" : [],
"scope" : 14,
"src" : "75:19:1"
}
],
"src" : "0:95:1"
}

7
test/libsolidity/ASTJSON/contract_dep_order.sol Normal file
View File

@ -0,0 +1,7 @@
contract A { }
contract B is A { }
contract C is B { }
contract D is C { }
contract E is D { }
// ----

288
test/libsolidity/ASTJSON/contract_dep_order_legacy.json Normal file
View File

@ -0,0 +1,288 @@
{
"attributes" :
{
"absolutePath" : "a",
"exportedSymbols" :
{
"A" :
[
1
],
"B" :
[
4
],
"C" :
[
7
],
"D" :
[
10
],
"E" :
[
13
]
}
},
"children" :
[
{
"attributes" :
{
"baseContracts" :
[
null
],
"contractDependencies" :
[
null
],
"contractKind" : "contract",
"documentation" : null,
"fullyImplemented" : true,
"linearizedBaseContracts" :
[
1
],
"name" : "A",
"nodes" :
[
null
],
"scope" : 14
},
"id" : 1,
"name" : "ContractDefinition",
"src" : "0:14:1"
},
{
"attributes" :
{
"contractDependencies" :
[
1
],
"contractKind" : "contract",
"documentation" : null,
"fullyImplemented" : true,
"linearizedBaseContracts" :
[
4,
1
],
"name" : "B",
"nodes" :
[
null
],
"scope" : 14
},
"children" :
[
{
"attributes" :
{
"arguments" : null
},
"children" :
[
{
"attributes" :
{
"contractScope" : null,
"name" : "A",
"referencedDeclaration" : 1,
"type" : "contract A"
},
"id" : 2,
"name" : "UserDefinedTypeName",
"src" : "29:1:1"
}
],
"id" : 3,
"name" : "InheritanceSpecifier",
"src" : "29:1:1"
}
],
"id" : 4,
"name" : "ContractDefinition",
"src" : "15:19:1"
},
{
"attributes" :
{
"contractDependencies" :
[
1,
4
],
"contractKind" : "contract",
"documentation" : null,
"fullyImplemented" : true,
"linearizedBaseContracts" :
[
7,
4,
1
],
"name" : "C",
"nodes" :
[
null
],
"scope" : 14
},
"children" :
[
{
"attributes" :
{
"arguments" : null
},
"children" :
[
{
"attributes" :
{
"contractScope" : null,
"name" : "B",
"referencedDeclaration" : 4,
"type" : "contract B"
},
"id" : 5,
"name" : "UserDefinedTypeName",
"src" : "49:1:1"
}
],
"id" : 6,
"name" : "InheritanceSpecifier",
"src" : "49:1:1"
}
],
"id" : 7,
"name" : "ContractDefinition",
"src" : "35:19:1"
},
{
"attributes" :
{
"contractDependencies" :
[
1,
4,
7
],
"contractKind" : "contract",
"documentation" : null,
"fullyImplemented" : true,
"linearizedBaseContracts" :
[
10,
7,
4,
1
],
"name" : "D",
"nodes" :
[
null
],
"scope" : 14
},
"children" :
[
{
"attributes" :
{
"arguments" : null
},
"children" :
[
{
"attributes" :
{
"contractScope" : null,
"name" : "C",
"referencedDeclaration" : 7,
"type" : "contract C"
},
"id" : 8,
"name" : "UserDefinedTypeName",
"src" : "69:1:1"
}
],
"id" : 9,
"name" : "InheritanceSpecifier",
"src" : "69:1:1"
}
],
"id" : 10,
"name" : "ContractDefinition",
"src" : "55:19:1"
},
{
"attributes" :
{
"contractDependencies" :
[
1,
4,
7,
10
],
"contractKind" : "contract",
"documentation" : null,
"fullyImplemented" : true,
"linearizedBaseContracts" :
[
13,
10,
7,
4,
1
],
"name" : "E",
"nodes" :
[
null
],
"scope" : 14
},
"children" :
[
{
"attributes" :
{
"arguments" : null
},
"children" :
[
{
"attributes" :
{
"contractScope" : null,
"name" : "D",
"referencedDeclaration" : 10,
"type" : "contract D"
},
"id" : 11,
"name" : "UserDefinedTypeName",
"src" : "89:1:1"
}
],
"id" : 12,
"name" : "InheritanceSpecifier",
"src" : "89:1:1"
}
],
"id" : 13,
"name" : "ContractDefinition",
"src" : "75:19:1"
}
],
"id" : 14,
"name" : "SourceUnit",
"src" : "0:95:1"
}

2
test/libsolidity/ASTJSON/inheritance_specifier.sol
View File

@ -1 +1,3 @@
contract C1 {} contract C2 is C1 {} contract C1 {} contract C2 is C1 {}
// ----