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 #7900 from ethereum/replaceSuperFunctionAnnotation

Browse Source 
Replace ``superFunction`` with ``baseFunctions`` in AST annotations and ASTJSON.
This commit is contained in:
chriseth 2019-12-05 09:21:48 +01:00 committed by GitHub
commit 6230d8f515
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
60 changed files with 690 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -22,6 +22,7 @@ Breaking changes:
* Natspec JSON Interface: Properly support multiple ``@return`` statements in ``@dev`` documentation and enforce named return parameters to be mentioned documentation. * Natspec JSON Interface: Properly support multiple ``@return`` statements in ``@dev`` documentation and enforce named return parameters to be mentioned documentation.
* Source mappings: Add "modifier depth" as a fifth field in the source mappings. * Source mappings: Add "modifier depth" as a fifth field in the source mappings.
* AST: Inline assembly is exported as structured JSON instead of plain string. * AST: Inline assembly is exported as structured JSON instead of plain string.
* JSON AST: Replace ``superFunction`` attribute by ``baseFunctions``.
* General: ``private`` cannot be used together with ``virtual``. * General: ``private`` cannot be used together with ``virtual``.
* Inheritance: State variable shadowing is now disallowed. * Inheritance: State variable shadowing is now disallowed.

3
libsolidity/analysis/ContractLevelChecker.cpp
View File

@ -290,8 +290,7 @@ bool ContractLevelChecker::checkFunctionOverride(FunctionDefinition const& _func
success = false; success = false;
} }
if (!_function.annotation().superFunction) _function.annotation().baseFunctions.emplace(&_super);
_function.annotation().superFunction = &_super;
if (_function.visibility() != _super.visibility()) if (_function.visibility() != _super.visibility())
{ {

2
libsolidity/analysis/ViewPureChecker.cpp
View File

@ -171,7 +171,7 @@ void ViewPureChecker::endVisit(FunctionDefinition const& _funDef)
!_funDef.isConstructor() && !_funDef.isConstructor() &&
!_funDef.isFallback() && !_funDef.isFallback() &&
!_funDef.isReceive() && !_funDef.isReceive() &&
!_funDef.annotation().superFunction !_funDef.overrides()
) )
m_errorReporter.warning( m_errorReporter.warning(
_funDef.location(), _funDef.location(),

5
libsolidity/ast/ASTAnnotations.h
View File

@ -106,9 +106,8 @@ struct ContractDefinitionAnnotation: TypeDeclarationAnnotation, DocumentedAnnota
struct FunctionDefinitionAnnotation: ASTAnnotation, DocumentedAnnotation struct FunctionDefinitionAnnotation: ASTAnnotation, DocumentedAnnotation
{ {
/// The function this function overrides, if any. This is always the closest /// The set of functions this function overrides.
/// in the linearized inheritance hierarchy. std::set<FunctionDefinition const*> baseFunctions;
FunctionDefinition const* superFunction = nullptr;
/// Pointer to the contract this function is defined in /// Pointer to the contract this function is defined in
ContractDefinition const* contract = nullptr; ContractDefinition const* contract = nullptr;
}; };

3
libsolidity/ast/ASTJsonConverter.cpp
View File

@ -344,7 +344,6 @@ bool ASTJsonConverter::visit(FunctionDefinition const& _node)
make_pair("documentation", _node.documentation() ? Json::Value(*_node.documentation()) : Json::nullValue), make_pair("documentation", _node.documentation() ? Json::Value(*_node.documentation()) : Json::nullValue),
make_pair("kind", TokenTraits::toString(_node.kind())), make_pair("kind", TokenTraits::toString(_node.kind())),
make_pair("stateMutability", stateMutabilityToString(_node.stateMutability())), make_pair("stateMutability", stateMutabilityToString(_node.stateMutability())),
make_pair("superFunction", idOrNull(_node.annotation().superFunction)),
make_pair("visibility", Declaration::visibilityToString(_node.visibility())), make_pair("visibility", Declaration::visibilityToString(_node.visibility())),
make_pair("overrides", _node.overrides() ? toJson(_node.overrides()->overrides()) : Json::nullValue), make_pair("overrides", _node.overrides() ? toJson(_node.overrides()->overrides()) : Json::nullValue),
make_pair("parameters", toJson(_node.parameterList())), make_pair("parameters", toJson(_node.parameterList())),
@ -354,6 +353,8 @@ bool ASTJsonConverter::visit(FunctionDefinition const& _node)
make_pair("implemented", _node.isImplemented()), make_pair("implemented", _node.isImplemented()),
make_pair("scope", idOrNull(_node.scope())) make_pair("scope", idOrNull(_node.scope()))
}; };
if (!_node.annotation().baseFunctions.empty())
attributes.emplace_back(make_pair("baseFunctions", getContainerIds(_node.annotation().baseFunctions, true)));
if (m_legacy) if (m_legacy)
attributes.emplace_back("isConstructor", _node.isConstructor()); attributes.emplace_back("isConstructor", _node.isConstructor());
setJsonNode(_node, "FunctionDefinition", std::move(attributes)); setJsonNode(_node, "FunctionDefinition", std::move(attributes));

1
test/libsolidity/ASTJSON/abstract_contract.json
View File

@ -60,7 +60,6 @@
"scope": 5, "scope": 5,
"src": "23:25:1", "src": "23:25:1",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],

1
test/libsolidity/ASTJSON/abstract_contract_legacy.json
View File

@ -51,7 +51,6 @@
"overrides": null, "overrides": null,
"scope": 5, "scope": 5,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/address_payable.json
View File

@ -557,7 +557,6 @@
"scope": 39, "scope": 39,
"src": "67:189:1", "src": "67:189:1",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],

1
test/libsolidity/ASTJSON/address_payable_legacy.json
View File

@ -104,7 +104,6 @@
"overrides": null, "overrides": null,
"scope": 39, "scope": 39,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/assembly/call.json
View File

@ -156,7 +156,6 @@
"scope": 6, "scope": 6,
"src": "17:79:1", "src": "17:79:1",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],

1
test/libsolidity/ASTJSON/assembly/call_legacy.json
View File

@ -51,7 +51,6 @@
"overrides": null, "overrides": null,
"scope": 6, "scope": 6,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/assembly/function.json
View File

@ -143,7 +143,6 @@
"scope": 6, "scope": 6,
"src": "17:93:1", "src": "17:93:1",
"stateMutability": "view", "stateMutability": "view",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],

1
test/libsolidity/ASTJSON/assembly/function_legacy.json
View File

@ -51,7 +51,6 @@
"overrides": null, "overrides": null,
"scope": 6, "scope": 6,
"stateMutability": "view", "stateMutability": "view",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/assembly/leave.json
View File

@ -93,7 +93,6 @@
"scope": 6, "scope": 6,
"src": "17:71:1", "src": "17:71:1",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],

1
test/libsolidity/ASTJSON/assembly/leave_legacy.json
View File

@ -51,7 +51,6 @@
"overrides": null, "overrides": null,
"scope": 6, "scope": 6,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/assembly/loop.json
View File

@ -156,7 +156,6 @@
"scope": 6, "scope": 6,
"src": "17:99:1", "src": "17:99:1",
"stateMutability": "view", "stateMutability": "view",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],

1
test/libsolidity/ASTJSON/assembly/loop_legacy.json
View File

@ -51,7 +51,6 @@
"overrides": null, "overrides": null,
"scope": 6, "scope": 6,
"stateMutability": "view", "stateMutability": "view",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/assembly/slot_offset.json
View File

@ -224,7 +224,6 @@
"scope": 11, "scope": 11,
"src": "51:95:1", "src": "51:95:1",
"stateMutability": "pure", "stateMutability": "pure",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],

1
test/libsolidity/ASTJSON/assembly/slot_offset_legacy.json
View File

@ -128,7 +128,6 @@
"overrides": null, "overrides": null,
"scope": 11, "scope": 11,
"stateMutability": "pure", "stateMutability": "pure",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/assembly/stringlit.json
View File

@ -97,7 +97,6 @@
"scope": 6, "scope": 6,
"src": "17:63:1", "src": "17:63:1",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],

1
test/libsolidity/ASTJSON/assembly/stringlit_legacy.json
View File

@ -51,7 +51,6 @@
"overrides": null, "overrides": null,
"scope": 6, "scope": 6,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/assembly/switch.json
View File

@ -189,7 +189,6 @@
"scope": 6, "scope": 6,
"src": "17:179:1", "src": "17:179:1",
"stateMutability": "pure", "stateMutability": "pure",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],

1
test/libsolidity/ASTJSON/assembly/switch_legacy.json
View File

@ -51,7 +51,6 @@
"overrides": null, "overrides": null,
"scope": 6, "scope": 6,
"stateMutability": "pure", "stateMutability": "pure",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/assembly/var_access.json
View File

@ -148,7 +148,6 @@
"scope": 9, "scope": 9,
"src": "17:76:1", "src": "17:76:1",
"stateMutability": "pure", "stateMutability": "pure",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],

1
test/libsolidity/ASTJSON/assembly/var_access_legacy.json
View File

@ -51,7 +51,6 @@
"overrides": null, "overrides": null,
"scope": 9, "scope": 9,
"stateMutability": "pure", "stateMutability": "pure",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/constructor.json
View File

@ -60,7 +60,6 @@
"scope": 5, "scope": 5,
"src": "14:25:1", "src": "14:25:1",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],

1
test/libsolidity/ASTJSON/constructor_legacy.json
View File

@ -51,7 +51,6 @@
"overrides": null, "overrides": null,
"scope": 5, "scope": 5,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/documentation.json
View File

@ -172,7 +172,6 @@
"scope": 15, "scope": 15,
"src": "134:23:3", "src": "134:23:3",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],

1
test/libsolidity/ASTJSON/documentation_legacy.json
View File

@ -118,7 +118,6 @@
"overrides": null, "overrides": null,
"scope": 15, "scope": 15,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/fallback.json
View File

@ -60,7 +60,6 @@
"scope": 5, "scope": 5,
"src": "15:33:1", "src": "15:33:1",
"stateMutability": "payable", "stateMutability": "payable",
"superFunction": null,
"visibility": "external" "visibility": "external"
} }
], ],

2
test/libsolidity/ASTJSON/fallback_and_reveice_ether.json
View File

@ -60,7 +60,6 @@
"scope": 9, "scope": 9,
"src": "15:32:1", "src": "15:32:1",
"stateMutability": "payable", "stateMutability": "payable",
"superFunction": null,
"visibility": "external" "visibility": "external"
}, },
{ {
@ -96,7 +95,6 @@
"scope": 9, "scope": 9,
"src": "50:33:1", "src": "50:33:1",
"stateMutability": "payable", "stateMutability": "payable",
"superFunction": null,
"visibility": "external" "visibility": "external"
} }
], ],

2
test/libsolidity/ASTJSON/fallback_and_reveice_ether_legacy.json
View File

@ -51,7 +51,6 @@
"overrides": null, "overrides": null,
"scope": 9, "scope": 9,
"stateMutability": "payable", "stateMutability": "payable",
"superFunction": null,
"visibility": "external" "visibility": "external"
}, },
"children": "children":
@ -115,7 +114,6 @@
"overrides": null, "overrides": null,
"scope": 9, "scope": 9,
"stateMutability": "payable", "stateMutability": "payable",
"superFunction": null,
"visibility": "external" "visibility": "external"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/fallback_legacy.json
View File

@ -51,7 +51,6 @@
"overrides": null, "overrides": null,
"scope": 5, "scope": 5,
"stateMutability": "payable", "stateMutability": "payable",
"superFunction": null,
"visibility": "external" "visibility": "external"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/fallback_payable.json
View File

@ -60,7 +60,6 @@
"scope": 5, "scope": 5,
"src": "14:22:1", "src": "14:22:1",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "external" "visibility": "external"
} }
], ],

1
test/libsolidity/ASTJSON/fallback_payable_legacy.json
View File

@ -51,7 +51,6 @@
"overrides": null, "overrides": null,
"scope": 5, "scope": 5,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "external" "visibility": "external"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/function_type.json
View File

@ -218,7 +218,6 @@
"scope": 17, "scope": 17,
"src": "13:109:1", "src": "13:109:1",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],

1
test/libsolidity/ASTJSON/function_type_legacy.json
View File

@ -51,7 +51,6 @@
"overrides": null, "overrides": null,
"scope": 17, "scope": 17,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/long_type_name_binary_operation.json
View File

@ -166,7 +166,6 @@
"scope": 11, "scope": 11,
"src": "13:39:1", "src": "13:39:1",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],

1
test/libsolidity/ASTJSON/long_type_name_binary_operation_legacy.json
View File

@ -51,7 +51,6 @@
"overrides": null, "overrides": null,
"scope": 11, "scope": 11,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/long_type_name_identifier.json
View File

@ -173,7 +173,6 @@
"scope": 15, "scope": 15,
"src": "23:45:1", "src": "23:45:1",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],

1
test/libsolidity/ASTJSON/long_type_name_identifier_legacy.json
View File

@ -94,7 +94,6 @@
"overrides": null, "overrides": null,
"scope": 15, "scope": 15,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/modifier_definition.json
View File

@ -165,7 +165,6 @@
"scope": 14, "scope": 14,
"src": "39:27:1", "src": "39:27:1",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],

1
test/libsolidity/ASTJSON/modifier_definition_legacy.json
View File

@ -112,7 +112,6 @@
"overrides": null, "overrides": null,
"scope": 14, "scope": 14,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/modifier_invocation.json
View File

@ -165,7 +165,6 @@
"scope": 14, "scope": 14,
"src": "39:27:1", "src": "39:27:1",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],

1
test/libsolidity/ASTJSON/modifier_invocation_legacy.json
View File

@ -112,7 +112,6 @@
"overrides": null, "overrides": null,
"scope": 14, "scope": 14,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/non_utf8.json
View File

@ -113,7 +113,6 @@
"scope": 8, "scope": 8,
"src": "13:40:1", "src": "13:40:1",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],

1
test/libsolidity/ASTJSON/non_utf8_legacy.json
View File

@ -51,7 +51,6 @@
"overrides": null, "overrides": null,
"scope": 8, "scope": 8,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

17
test/libsolidity/ASTJSON/override.json
View File

@ -68,7 +68,6 @@
"scope": 5, "scope": 5,
"src": "14:24:1", "src": "14:24:1",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],
@ -144,10 +143,13 @@
"scope": 16, "scope": 16,
"src": "60:22:1", "src": "60:22:1",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
{ {
"baseFunctions":
[
4
],
"body": "body":
{ {
"id": 14, "id": 14,
@ -180,7 +182,6 @@
"scope": 16, "scope": 16,
"src": "84:33:1", "src": "84:33:1",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": 4,
"visibility": "public" "visibility": "public"
} }
], ],
@ -232,6 +233,10 @@
"nodes": "nodes":
[ [
{ {
"baseFunctions":
[
10
],
"body": "body":
{ {
"id": 22, "id": 22,
@ -264,10 +269,13 @@
"scope": 31, "scope": 31,
"src": "139:34:1", "src": "139:34:1",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": 10,
"visibility": "public" "visibility": "public"
}, },
{ {
"baseFunctions":
[
15
],
"body": "body":
{ {
"id": 29, "id": 29,
@ -328,7 +336,6 @@
"scope": 31, "scope": 31,
"src": "175:39:1", "src": "175:39:1",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": 15,
"visibility": "public" "visibility": "public"
} }
], ],

17
test/libsolidity/ASTJSON/override_legacy.json
View File

@ -59,7 +59,6 @@
"overrides": null, "overrides": null,
"scope": 5, "scope": 5,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":
@ -174,7 +173,6 @@
"overrides": null, "overrides": null,
"scope": 16, "scope": 16,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":
@ -213,6 +211,10 @@
{ {
"attributes": "attributes":
{ {
"baseFunctions":
[
4
],
"documentation": null, "documentation": null,
"implemented": true, "implemented": true,
"isConstructor": false, "isConstructor": false,
@ -228,7 +230,6 @@
], ],
"scope": 16, "scope": 16,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": 4,
"visibility": "public" "visibility": "public"
}, },
"children": "children":
@ -332,6 +333,10 @@
{ {
"attributes": "attributes":
{ {
"baseFunctions":
[
10
],
"documentation": null, "documentation": null,
"implemented": true, "implemented": true,
"isConstructor": false, "isConstructor": false,
@ -347,7 +352,6 @@
], ],
"scope": 31, "scope": 31,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": 10,
"visibility": "public" "visibility": "public"
}, },
"children": "children":
@ -399,6 +403,10 @@
{ {
"attributes": "attributes":
{ {
"baseFunctions":
[
15
],
"documentation": null, "documentation": null,
"implemented": true, "implemented": true,
"isConstructor": false, "isConstructor": false,
@ -410,7 +418,6 @@
"name": "faa", "name": "faa",
"scope": 31, "scope": 31,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": 15,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/receive_ether.json
View File

@ -60,7 +60,6 @@
"scope": 5, "scope": 5,
"src": "15:32:1", "src": "15:32:1",
"stateMutability": "payable", "stateMutability": "payable",
"superFunction": null,
"visibility": "external" "visibility": "external"
} }
], ],

1
test/libsolidity/ASTJSON/receive_ether_legacy.json
View File

@ -51,7 +51,6 @@
"overrides": null, "overrides": null,
"scope": 5, "scope": 5,
"stateMutability": "payable", "stateMutability": "payable",
"superFunction": null,
"visibility": "external" "visibility": "external"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/short_type_name.json
View File

@ -117,7 +117,6 @@
"scope": 11, "scope": 11,
"src": "13:40:1", "src": "13:40:1",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],

1
test/libsolidity/ASTJSON/short_type_name_legacy.json
View File

@ -51,7 +51,6 @@
"overrides": null, "overrides": null,
"scope": 11, "scope": 11,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/short_type_name_ref.json
View File

@ -129,7 +129,6 @@
"scope": 12, "scope": 12,
"src": "13:45:1", "src": "13:45:1",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],

1
test/libsolidity/ASTJSON/short_type_name_ref_legacy.json
View File

@ -51,7 +51,6 @@
"overrides": null, "overrides": null,
"scope": 12, "scope": 12,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

1
test/libsolidity/ASTJSON/source_location.json
View File

@ -151,7 +151,6 @@
"scope": 11, "scope": 11,
"src": "13:32:1", "src": "13:32:1",
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
} }
], ],

1
test/libsolidity/ASTJSON/source_location_legacy.json
View File

@ -51,7 +51,6 @@
"overrides": null, "overrides": null,
"scope": 11, "scope": 11,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"superFunction": null,
"visibility": "public" "visibility": "public"
}, },
"children": "children":

270
test/libsolidity/ASTJSON/two_base_functions.json Normal file
View File

@ -0,0 +1,270 @@
{
"absolutePath": "a",
"exportedSymbols":
{
"A":
[
5
],
"B":
[
10
],
"C":
[
22
]
},
"id": 23,
"nodeType": "SourceUnit",
"nodes":
[
{
"abstract": false,
"baseContracts": [],
"contractDependencies": [],
"contractKind": "contract",
"documentation": null,
"fullyImplemented": true,
"id": 5,
"linearizedBaseContracts":
[
5
],
"name": "A",
"nodeType": "ContractDefinition",
"nodes":
[
{
"body":
{
"id": 3,
"nodeType": "Block",
"src": "45:2:1",
"statements": []
},
"documentation": null,
"id": 4,
"implemented": true,
"kind": "function",
"modifiers": [],
"name": "f",
"nodeType": "FunctionDefinition",
"overrides": null,
"parameters":
{
"id": 1,
"nodeType": "ParameterList",
"parameters": [],
"src": "27:2:1"
},
"returnParameters":
{
"id": 2,
"nodeType": "ParameterList",
"parameters": [],
"src": "45:0:1"
},
"scope": 5,
"src": "17:30:1",
"stateMutability": "nonpayable",
"visibility": "public"
}
],
"scope": 23,
"src": "0:49:1"
},
{
"abstract": false,
"baseContracts": [],
"contractDependencies": [],
"contractKind": "contract",
"documentation": null,
"fullyImplemented": true,
"id": 10,
"linearizedBaseContracts":
[
10
],
"name": "B",
"nodeType": "ContractDefinition",
"nodes":
[
{
"body":
{
"id": 8,
"nodeType": "Block",
"src": "95:2:1",
"statements": []
},
"documentation": null,
"id": 9,
"implemented": true,
"kind": "function",
"modifiers": [],
"name": "f",
"nodeType": "FunctionDefinition",
"overrides": null,
"parameters":
{
"id": 6,
"nodeType": "ParameterList",
"parameters": [],
"src": "77:2:1"
},
"returnParameters":
{
"id": 7,
"nodeType": "ParameterList",
"parameters": [],
"src": "95:0:1"
},
"scope": 10,
"src": "67:30:1",
"stateMutability": "nonpayable",
"visibility": "public"
}
],
"scope": 23,
"src": "50:49:1"
},
{
"abstract": false,
"baseContracts":
[
{
"arguments": null,
"baseName":
{
"contractScope": null,
"id": 11,
"name": "A",
"nodeType": "UserDefinedTypeName",
"referencedDeclaration": 5,
"src": "114:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_A_$5",
"typeString": "contract A"
}
},
"id": 12,
"nodeType": "InheritanceSpecifier",
"src": "114:1:1"
},
{
"arguments": null,
"baseName":
{
"contractScope": null,
"id": 13,
"name": "B",
"nodeType": "UserDefinedTypeName",
"referencedDeclaration": 10,
"src": "117:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_B_$10",
"typeString": "contract B"
}
},
"id": 14,
"nodeType": "InheritanceSpecifier",
"src": "117:1:1"
}
],
"contractDependencies":
[
5,
10
],
"contractKind": "contract",
"documentation": null,
"fullyImplemented": true,
"id": 22,
"linearizedBaseContracts":
[
22,
10,
5
],
"name": "C",
"nodeType": "ContractDefinition",
"nodes":
[
{
"baseFunctions":
[
4,
9
],
"body":
{
"id": 20,
"nodeType": "Block",
"src": "160:2:1",
"statements": []
},
"documentation": null,
"id": 21,
"implemented": true,
"kind": "function",
"modifiers": [],
"name": "f",
"nodeType": "FunctionDefinition",
"overrides":
[
{
"contractScope": null,
"id": 16,
"name": "A",
"nodeType": "UserDefinedTypeName",
"referencedDeclaration": 5,
"src": "154:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_A_$5",
"typeString": "contract A"
}
},
{
"contractScope": null,
"id": 17,
"name": "B",
"nodeType": "UserDefinedTypeName",
"referencedDeclaration": 10,
"src": "157:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_B_$10",
"typeString": "contract B"
}
}
],
"parameters":
{
"id": 15,
"nodeType": "ParameterList",
"parameters": [],
"src": "135:2:1"
},
"returnParameters":
{
"id": 19,
"nodeType": "ParameterList",
"parameters": [],
"src": "160:0:1"
},
"scope": 22,
"src": "125:37:1",
"stateMutability": "nonpayable",
"visibility": "public"
}
],
"scope": 23,
"src": "100:64:1"
}
],
"src": "0:165:1"
}

11
test/libsolidity/ASTJSON/two_base_functions.sol Normal file
View File

@ -0,0 +1,11 @@
contract A {
function f() public virtual {}
}
contract B {
function f() public virtual {}
}
contract C is A, B {
function f() public override(A, B) {}
}
// ----

378
test/libsolidity/ASTJSON/two_base_functions_legacy.json Normal file
View File

@ -0,0 +1,378 @@
{
"attributes":
{
"absolutePath": "a",
"exportedSymbols":
{
"A":
[
5
],
"B":
[
10
],
"C":
[
22
]
}
},
"children":
[
{
"attributes":
{
"abstract": false,
"baseContracts":
[
null
],
"contractDependencies":
[
null
],
"contractKind": "contract",
"documentation": null,
"fullyImplemented": true,
"linearizedBaseContracts":
[
5
],
"name": "A",
"scope": 23
},
"children":
[
{
"attributes":
{
"documentation": null,
"implemented": true,
"isConstructor": false,
"kind": "function",
"modifiers":
[
null
],
"name": "f",
"overrides": null,
"scope": 5,
"stateMutability": "nonpayable",
"visibility": "public"
},
"children":
[
{
"attributes":
{
"parameters":
[
null
]
},
"children": [],
"id": 1,
"name": "ParameterList",
"src": "27:2:1"
},
{
"attributes":
{
"parameters":
[
null
]
},
"children": [],
"id": 2,
"name": "ParameterList",
"src": "45:0:1"
},
{
"attributes":
{
"statements":
[
null
]
},
"children": [],
"id": 3,
"name": "Block",
"src": "45:2:1"
}
],
"id": 4,
"name": "FunctionDefinition",
"src": "17:30:1"
}
],
"id": 5,
"name": "ContractDefinition",
"src": "0:49:1"
},
{
"attributes":
{
"abstract": false,
"baseContracts":
[
null
],
"contractDependencies":
[
null
],
"contractKind": "contract",
"documentation": null,
"fullyImplemented": true,
"linearizedBaseContracts":
[
10
],
"name": "B",
"scope": 23
},
"children":
[
{
"attributes":
{
"documentation": null,
"implemented": true,
"isConstructor": false,
"kind": "function",
"modifiers":
[
null
],
"name": "f",
"overrides": null,
"scope": 10,
"stateMutability": "nonpayable",
"visibility": "public"
},
"children":
[
{
"attributes":
{
"parameters":
[
null
]
},
"children": [],
"id": 6,
"name": "ParameterList",
"src": "77:2:1"
},
{
"attributes":
{
"parameters":
[
null
]
},
"children": [],
"id": 7,
"name": "ParameterList",
"src": "95:0:1"
},
{
"attributes":
{
"statements":
[
null
]
},
"children": [],
"id": 8,
"name": "Block",
"src": "95:2:1"
}
],
"id": 9,
"name": "FunctionDefinition",
"src": "67:30:1"
}
],
"id": 10,
"name": "ContractDefinition",
"src": "50:49:1"
},
{
"attributes":
{
"abstract": false,
"contractDependencies":
[
5,
10
],
"contractKind": "contract",
"documentation": null,
"fullyImplemented": true,
"linearizedBaseContracts":
[
22,
10,
5
],
"name": "C",
"scope": 23
},
"children":
[
{
"attributes":
{
"arguments": null
},
"children":
[
{
"attributes":
{
"contractScope": null,
"name": "A",
"referencedDeclaration": 5,
"type": "contract A"
},
"id": 11,
"name": "UserDefinedTypeName",
"src": "114:1:1"
}
],
"id": 12,
"name": "InheritanceSpecifier",
"src": "114:1:1"
},
{
"attributes":
{
"arguments": null
},
"children":
[
{
"attributes":
{
"contractScope": null,
"name": "B",
"referencedDeclaration": 10,
"type": "contract B"
},
"id": 13,
"name": "UserDefinedTypeName",
"src": "117:1:1"
}
],
"id": 14,
"name": "InheritanceSpecifier",
"src": "117:1:1"
},
{
"attributes":
{
"baseFunctions":
[
4,
9
],
"documentation": null,
"implemented": true,
"isConstructor": false,
"kind": "function",
"modifiers":
[
null
],
"name": "f",
"scope": 22,
"stateMutability": "nonpayable",
"visibility": "public"
},
"children":
[
{
"attributes":
{
"contractScope": null,
"name": "A",
"referencedDeclaration": 5,
"type": "contract A"
},
"id": 16,
"name": "UserDefinedTypeName",
"src": "154:1:1"
},
{
"attributes":
{
"contractScope": null,
"name": "B",
"referencedDeclaration": 10,
"type": "contract B"
},
"id": 17,
"name": "UserDefinedTypeName",
"src": "157:1:1"
},
{
"attributes":
{
"parameters":
[
null
]
},
"children": [],
"id": 15,
"name": "ParameterList",
"src": "135:2:1"
},
{
"attributes":
{
"parameters":
[
null
]
},
"children": [],
"id": 19,
"name": "ParameterList",
"src": "160:0:1"
},
{
"attributes":
{
"statements":
[
null
]
},
"children": [],
"id": 20,
"name": "Block",
"src": "160:2:1"
}
],
"id": 21,
"name": "FunctionDefinition",
"src": "125:37:1"
}
],
"id": 22,
"name": "ContractDefinition",
"src": "100:64:1"
}
],
"id": 23,
"name": "SourceUnit",
"src": "0:165:1"
}