cerc-io/solidity
16
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

Export all events.

Browse Source 
Update tests.

Additional tests

Revert changes to the Natspec
This commit is contained in:
chriseth 2021-02-23 14:13:52 +01:00 committed by Matheus Aguiar
parent 1af6ca772d
commit 1e63615206
139 changed files with 2697 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Changelog.md
View File

@ -8,6 +8,7 @@ Compiler Features:
* EVM: Support for the EVM Version "Shanghai".
* NatSpec: Add support for NatSpec documentation in ``enum`` definitions.
* NatSpec: Add support for NatSpec documentation in ``struct`` definitions.
* NatSpec: Include NatSpec from events that are emitted by a contract but defined outside of it in userdoc and devdoc output.
* Optimizer: Re-implement simplified version of UnusedAssignEliminator and UnusedStoreEliminator. It can correctly remove some unused assignments in deeply nested loops that were ignored by the old version.
* Parser: Unary plus is no longer recognized as a unary operator in the AST and triggers an error at the parsing stage (rather than later during the analysis).
* SMTChecker: Properties that are proved safe are now reported explicitly at the end of the analysis. By default, only the number of safe properties is shown. The CLI option ``--model-checker-show-proved-safe`` and the JSON option ``settings.modelChecker.showProvedSafe`` can be enabled to show the full list of safe properties.
@ -16,6 +17,7 @@ Compiler Features:
Bugfixes:
* ABI: Include events in the ABI that are emitted by a contract but defined outside of it.
* Antlr Grammar: Fix discrepancy with the parser, which allowed octal numbers.
* Antlr Grammar: Fix of a discrepancy with the parser, which allowed numbers followed by an identifier with no whitespace.
* Antlr Grammar: Stricter rules for function definitions. The grammar will no longer accept as valid free functions having specifiers which are exclusive to contract functions.
@ -23,13 +25,14 @@ Bugfixes:
AST Changes:
* AST: add the ``internalFunctionID`` field to the AST nodes of functions that may be called via the internal dispatch. These IDs are always generated, but they are only used in via-IR code generation.
* AST: Add the ``internalFunctionID`` field to the AST nodes of functions that may be called via the internal dispatch. These IDs are always generated, but they are only used in via-IR code generation.
* AST: Add the ``usedEvents`` field to ``ContractDefinition`` which contains the AST IDs of all events emitted by the contract as well as all events defined and inherited by the contract.
### 0.8.19 (2023-02-22)
Language Features:
* Allow defining custom operators for user-defined value types via ``using {f as +} for T global`` syntax.
* Allow defining custom operators for user-defined value types via ``using {f as +} for T global`` syntax.
Compiler Features:

21
libsolidity/ast/AST.cpp
View File

@ -220,9 +220,9 @@ vector<EventDefinition const*> const& ContractDefinition::definedInterfaceEvents
/// NOTE: this requires the "internal" version of an Event,
/// though here internal strictly refers to visibility,
/// and not to function encoding (jump vs. call)
auto const& function = e->functionType(true);
solAssert(function, "");
string eventSignature = function->externalSignature();
FunctionType const* functionType = e->functionType(true);
solAssert(functionType, "");
string eventSignature = functionType->externalSignature();
if (eventsSeen.count(eventSignature) == 0)
{
eventsSeen.insert(eventSignature);
@ -243,6 +243,21 @@ vector<EventDefinition const*> const ContractDefinition::usedInterfaceEvents() c
);
}
vector<EventDefinition const*> ContractDefinition::interfaceEvents(bool _requireCallGraph) const
{
set<EventDefinition const*, CompareByID> result;
for (ContractDefinition const* contract: annotation().linearizedBaseContracts)
result += contract->events();
solAssert(annotation().creationCallGraph.set() == annotation().deployedCallGraph.set());
if (_requireCallGraph)
solAssert(annotation().creationCallGraph.set());
if (annotation().creationCallGraph.set())
result += usedInterfaceEvents();
// We could filter out all events that do not have an external interface
// if _requireCallGraph is false.
return util::convertContainer<vector<EventDefinition const*>>(std::move(result));
}
vector<ErrorDefinition const*> ContractDefinition::interfaceErrors(bool _requireCallGraph) const
{
set<ErrorDefinition const*, CompareByID> result;

4
libsolidity/ast/AST.h
View File

@ -522,6 +522,10 @@ public:
std::vector<EventDefinition const*> events() const { return filteredNodes<EventDefinition>(m_subNodes); }
std::vector<EventDefinition const*> const& definedInterfaceEvents() const;
std::vector<EventDefinition const*> const usedInterfaceEvents() const;
/// @return all events defined in this contract and its base contracts and all events
/// that are emitted during the execution of the contract.
/// @param _requireCallGraph if false, do not fail if the call graph has not been computed yet.
std::vector<EventDefinition const*> interfaceEvents(bool _requireCallGraph = true) const;
/// @returns all errors defined in this contract or any base contract
/// and all errors referenced during execution.
/// @param _requireCallGraph if false, do not fail if the call graph has not been computed yet.

2
libsolidity/ast/ASTJsonExporter.cpp
View File

@ -286,6 +286,8 @@ bool ASTJsonExporter::visit(ContractDefinition const& _node)
make_pair("abstract", _node.abstract()),
make_pair("baseContracts", toJson(_node.baseContracts())),
make_pair("contractDependencies", getContainerIds(_node.annotation().contractDependencies | ranges::views::keys)),
// Do not require call graph because the AST is also created for incorrect sources.
make_pair("usedEvents", getContainerIds(_node.interfaceEvents(false))),
make_pair("usedErrors", getContainerIds(_node.interfaceErrors(false))),
make_pair("nodes", toJson(_node.subNodes())),
make_pair("scope", idOrNull(_node.scope()))

2
libsolidity/interface/ABI.cpp
View File

@ -101,7 +101,7 @@ Json::Value ABI::generate(ContractDefinition const& _contractDef)
method["stateMutability"] = stateMutabilityToString(externalFunctionType->stateMutability());
abi.emplace(std::move(method));
}
for (auto const& it: _contractDef.definedInterfaceEvents())
for (auto const& it: _contractDef.interfaceEvents())
{
Json::Value event{Json::objectValue};
event["type"] = "event";

53
libsolidity/interface/Natspec.cpp
View File

@ -78,8 +78,16 @@ Json::Value Natspec::userDocumentation(ContractDefinition const& _contractDef)
doc["methods"][it.second->externalSignature()]["notice"] = value;
}
for (auto const& event: _contractDef.definedInterfaceEvents())
for (auto const& event: uniqueInterfaceEvents(_contractDef))
{
ContractDefinition const* eventOrigin = event->annotation().contract;
solAssert(eventOrigin);
solAssert(
*eventOrigin == _contractDef ||
(!eventOrigin->isLibrary() && _contractDef.derivesFrom(*eventOrigin)) ||
(eventOrigin->isLibrary() && !_contractDef.derivesFrom(*eventOrigin))
);
string value = extractDoc(event->annotation().docTags, "notice");
if (!value.empty())
doc["events"][event->functionType(true)->externalSignature()]["notice"] = value;
@ -168,10 +176,18 @@ Json::Value Natspec::devDocumentation(ContractDefinition const& _contractDef)
));
}
for (auto const& event: _contractDef.definedInterfaceEvents())
for (auto const& event: uniqueInterfaceEvents(_contractDef))
if (auto devDoc = devDocumentation(event->annotation().docTags); !devDoc.empty())
{
ContractDefinition const* eventOrigin = event->annotation().contract;
solAssert(eventOrigin);
solAssert(
*eventOrigin == _contractDef ||
(!eventOrigin->isLibrary() && _contractDef.derivesFrom(*eventOrigin)) ||
(eventOrigin->isLibrary() && !_contractDef.derivesFrom(*eventOrigin))
);
doc["events"][event->functionType(true)->externalSignature()] = devDoc;
}
for (auto const& error: _contractDef.interfaceErrors())
if (auto devDoc = devDocumentation(error->annotation().docTags); !devDoc.empty())
doc["errors"][error->functionType(true)->externalSignature()].append(devDoc);
@ -255,3 +271,34 @@ Json::Value Natspec::devDocumentation(std::multimap<std::string, DocTag> const&
return json;
}
vector<EventDefinition const*> Natspec::uniqueInterfaceEvents(ContractDefinition const& _contract)
{
auto eventSignature = [](EventDefinition const* _event) -> string {
FunctionType const* functionType = _event->functionType(true);
solAssert(functionType, "");
return functionType->externalSignature();
};
auto compareBySignature =
[&](EventDefinition const* _lhs, EventDefinition const* _rhs) -> bool {
return eventSignature(_lhs) < eventSignature(_rhs);
};
set<EventDefinition const*, decltype(compareBySignature)> uniqueEvents{compareBySignature};
// Insert events defined in the contract first so that in case of a conflict
// they're the ones that get selected.
uniqueEvents += _contract.definedInterfaceEvents();
set<EventDefinition const*, decltype(compareBySignature)> filteredUsedEvents{compareBySignature};
set<string> usedSignatures;
for (EventDefinition const* event: _contract.usedInterfaceEvents())
{
auto&& [eventIt, eventInserted] = filteredUsedEvents.insert(event);
auto&& [signatureIt, signatureInserted] = usedSignatures.insert(eventSignature(event));
if (!signatureInserted)
filteredUsedEvents.erase(eventIt);
}
uniqueEvents += filteredUsedEvents;
return util::convertContainer<vector<EventDefinition const*>>(std::move(uniqueEvents));
}

7
libsolidity/interface/Natspec.h
View File

@ -72,6 +72,13 @@ private:
/// @return A JSON representation
/// of a method's return notice documentation
static Json::Value extractReturnParameterDocs(std::multimap<std::string, DocTag> const& _tags, std::vector<std::string> const& _returnParameterNames);
/// Temporary function until https://github.com/ethereum/solidity/issues/11114 is implemented.
/// @return all events defined in the contract and its base contracts and all events
/// that are emitted during the execution of the contract, but allowing only unique signatures.
/// In case of conflict between a library event and a contract one, selects the latter
/// In case of conflict between two library events, none is selected
static std::vector<EventDefinition const*> uniqueInterfaceEvents(ContractDefinition const& _contract);
};
}

2
test/cmdlineTests/ast_compact_json_no_pretty_json/output
View File

@ -2,4 +2,4 @@ JSON AST (compact format):
======= ast_compact_json_no_pretty_json/input.sol =======
{"absolutePath":"ast_compact_json_no_pretty_json/input.sol","exportedSymbols":{"C":[2]},"id":3,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:0"},{"abstract":false,"baseContracts":[],"canonicalName":"C","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"id":2,"linearizedBaseContracts":[2],"name":"C","nameLocation":"69:1:0","nodeType":"ContractDefinition","nodes":[],"scope":3,"src":"60:13:0","usedErrors":[]}],"src":"36:38:0"}
{"absolutePath":"ast_compact_json_no_pretty_json/input.sol","exportedSymbols":{"C":[2]},"id":3,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:0"},{"abstract":false,"baseContracts":[],"canonicalName":"C","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"id":2,"linearizedBaseContracts":[2],"name":"C","nameLocation":"69:1:0","nodeType":"ContractDefinition","nodes":[],"scope":3,"src":"60:13:0","usedErrors":[],"usedEvents":[]}],"src":"36:38:0"}

3
test/cmdlineTests/ast_compact_json_with_base_path/output
View File

@ -45,7 +45,8 @@ JSON AST (compact format):
"nodes": [],
"scope": 6,
"src": "60:13:0",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "36:38:0"

3
test/cmdlineTests/combined_json_with_base_path/output
View File

@ -56,7 +56,8 @@
"nodes": [],
"scope": 6,
"src": "60:13:0",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "36:38:0"

1
test/cmdlineTests/events_in_abi/args Normal file
View File

@ -0,0 +1 @@
--abi --pretty-json --json-indent 4

16
test/cmdlineTests/events_in_abi/input.sol Normal file
View File

@ -0,0 +1,16 @@
// SPDX-License-Identifier: GPL-3.0
pragma solidity >=0.0;
library L {
event e1(uint b);
}
function f() {
emit L.e1(5);
}
contract C {
event e1(uint indexed a);
function g() public {
f();
}
}

59
test/cmdlineTests/events_in_abi/output Normal file
View File

@ -0,0 +1,59 @@
======= events_in_abi/input.sol:C =======
Contract JSON ABI
[
{
"anonymous": false,
"inputs":
[
{
"indexed": false,
"internalType": "uint256",
"name": "b",
"type": "uint256"
}
],
"name": "e1",
"type": "event"
},
{
"anonymous": false,
"inputs":
[
{
"indexed": true,
"internalType": "uint256",
"name": "a",
"type": "uint256"
}
],
"name": "e1",
"type": "event"
},
{
"inputs": [],
"name": "g",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
}
]
======= events_in_abi/input.sol:L =======
Contract JSON ABI
[
{
"anonymous": false,
"inputs":
[
{
"indexed": false,
"internalType": "uint256",
"name": "b",
"type": "uint256"
}
],
"name": "e1",
"type": "event"
}
]

3
test/cmdlineTests/recovery_ast_constructor/output
View File

@ -180,7 +180,8 @@ JSON AST (compact format):
],
"scope": 19,
"src": "62:399:0",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "36:426:0"

3
test/cmdlineTests/recovery_standard_json/output.json
View File

@ -90,7 +90,8 @@
"nodes": [],
"scope": 4,
"src": "59:35:0",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "36:84:0"

3
test/cmdlineTests/standard_only_ast_requested/output.json
View File

@ -85,7 +85,8 @@
],
"scope": 7,
"src": "59:42:0",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "36:65:0"

71
test/libsolidity/ABIJson/event_emited_in_base_contract.sol Normal file
View File

@ -0,0 +1,71 @@
library L { event E(uint8); }
contract B {
constructor() {
emit L.E(0);
}
}
contract C is B {}
// ----
// :B
// [
// {
// "inputs": [],
// "stateMutability": "nonpayable",
// "type": "constructor"
// },
// {
// "anonymous": false,
// "inputs":
// [
// {
// "indexed": false,
// "internalType": "uint8",
// "name": "",
// "type": "uint8"
// }
// ],
// "name": "E",
// "type": "event"
// }
// ]
//
//
// :C
// [
// {
// "anonymous": false,
// "inputs":
// [
// {
// "indexed": false,
// "internalType": "uint8",
// "name": "",
// "type": "uint8"
// }
// ],
// "name": "E",
// "type": "event"
// }
// ]
//
//
// :L
// [
// {
// "anonymous": false,
// "inputs":
// [
// {
// "indexed": false,
// "internalType": "uint8",
// "name": "",
// "type": "uint8"
// }
// ],
// "name": "E",
// "type": "event"
// }
// ]

42
test/libsolidity/ABIJson/event_from_aggregated_contract_not_emmited.sol Normal file
View File

@ -0,0 +1,42 @@
contract C {
event e();
function f() public {
emit e();
}
}
contract D {
C c;
constructor() {
c = new C();
c.f();
}
}
// ----
// :C
// [
// {
// "anonymous": false,
// "inputs": [],
// "name": "e",
// "type": "event"
// },
// {
// "inputs": [],
// "name": "f",
// "outputs": [],
// "stateMutability": "nonpayable",
// "type": "function"
// }
// ]
//
//
// :D
// [
// {
// "inputs": [],
// "stateMutability": "nonpayable",
// "type": "constructor"
// }
// ]

62
test/libsolidity/ABIJson/event_inheritance.sol Normal file
View File

@ -0,0 +1,62 @@
interface B {
event EB();
}
contract C is B {
event EC();
}
contract D is C {
event ED();
}
// ----
// :B
// [
// {
// "anonymous": false,
// "inputs": [],
// "name": "EB",
// "type": "event"
// }
// ]
//
//
// :C
// [
// {
// "anonymous": false,
// "inputs": [],
// "name": "EB",
// "type": "event"
// },
// {
// "anonymous": false,
// "inputs": [],
// "name": "EC",
// "type": "event"
// }
// ]
//
//
// :D
// [
// {
// "anonymous": false,
// "inputs": [],
// "name": "EB",
// "type": "event"
// },
// {
// "anonymous": false,
// "inputs": [],
// "name": "EC",
// "type": "event"
// },
// {
// "anonymous": false,
// "inputs": [],
// "name": "ED",
// "type": "event"
// }
// ]

88
test/libsolidity/ABIJson/events_indirect.sol Normal file
View File

@ -0,0 +1,88 @@
library L {
event e1(uint b);
event e2();
event e2(uint a);
event e3() anonymous;
}
contract test {
function f() public {
emit L.e1(1);
emit L.e3();
}
}
// ----
// :L
// [
// {
// "anonymous": false,
// "inputs":
// [
// {
// "indexed": false,
// "internalType": "uint256",
// "name": "b",
// "type": "uint256"
// }
// ],
// "name": "e1",
// "type": "event"
// },
// {
// "anonymous": false,
// "inputs": [],
// "name": "e2",
// "type": "event"
// },
// {
// "anonymous": false,
// "inputs":
// [
// {
// "indexed": false,
// "internalType": "uint256",
// "name": "a",
// "type": "uint256"
// }
// ],
// "name": "e2",
// "type": "event"
// },
// {
// "anonymous": true,
// "inputs": [],
// "name": "e3",
// "type": "event"
// }
// ]
//
//
// :test
// [
// {
// "anonymous": false,
// "inputs":
// [
// {
// "indexed": false,
// "internalType": "uint256",
// "name": "b",
// "type": "uint256"
// }
// ],
// "name": "e1",
// "type": "event"
// },
// {
// "anonymous": true,
// "inputs": [],
// "name": "e3",
// "type": "event"
// },
// {
// "inputs": [],
// "name": "f",
// "outputs": [],
// "stateMutability": "nonpayable",
// "type": "function"
// }
// ]

45
test/libsolidity/ABIJson/events_repetitions.sol Normal file
View File

@ -0,0 +1,45 @@
library L {
event e();
}
contract C {
constructor() {
emit L.e();
}
function f() public {
emit L.e();
}
}
// ----
// :C
// [
// {
// "inputs": [],
// "stateMutability": "nonpayable",
// "type": "constructor"
// },
// {
// "anonymous": false,
// "inputs": [],
// "name": "e",
// "type": "event"
// },
// {
// "inputs": [],
// "name": "f",
// "outputs": [],
// "stateMutability": "nonpayable",
// "type": "function"
// }
// ]
//
//
// :L
// [
// {
// "anonymous": false,
// "inputs": [],
// "name": "e",
// "type": "event"
// }
// ]

61
test/libsolidity/ABIJson/same_event_defined_twice.sol Normal file
View File

@ -0,0 +1,61 @@
library L1 { event e(); }
library L2 { event e(); }
contract C {
constructor() {
emit L1.e();
}
function f() public {
emit L2.e();
}
}
// ----
// :C
// [
// {
// "inputs": [],
// "stateMutability": "nonpayable",
// "type": "constructor"
// },
// {
// "anonymous": false,
// "inputs": [],
// "name": "e",
// "type": "event"
// },
// {
// "anonymous": false,
// "inputs": [],
// "name": "e",
// "type": "event"
// },
// {
// "inputs": [],
// "name": "f",
// "outputs": [],
// "stateMutability": "nonpayable",
// "type": "function"
// }
// ]
//
//
// :L1
// [
// {
// "anonymous": false,
// "inputs": [],
// "name": "e",
// "type": "event"
// }
// ]
//
//
// :L2
// [
// {
// "anonymous": false,
// "inputs": [],
// "name": "e",
// "type": "event"
// }
// ]

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

@ -66,7 +66,8 @@
],
"scope": 6,
"src": "0:43:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:44:1"

3
test/libsolidity/ASTJSON/abstract_contract_parseOnly.json
View File

@ -50,7 +50,8 @@
}
],
"src": "0:43:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:44:1"

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

@ -571,7 +571,8 @@
],
"scope": 40,
"src": "0:258:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:259:1"

3
test/libsolidity/ASTJSON/address_payable_parseOnly.json
View File

@ -378,7 +378,8 @@
}
],
"src": "0:258:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:259:1"

3
test/libsolidity/ASTJSON/array_type_name.json
View File

@ -72,7 +72,8 @@
],
"scope": 5,
"src": "0:24:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:25:1"

3
test/libsolidity/ASTJSON/array_type_name_parseOnly.json
View File

@ -45,7 +45,8 @@
}
],
"src": "0:24:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:25:1"

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

@ -164,7 +164,8 @@
],
"scope": 7,
"src": "0:98:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:99:1"

3
test/libsolidity/ASTJSON/assembly/call_parseOnly.json
View File

@ -148,7 +148,8 @@
}
],
"src": "0:98:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:99:1"

3
test/libsolidity/ASTJSON/assembly/empty_block.json
View File

@ -89,7 +89,8 @@
],
"scope": 7,
"src": "0:75:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:76:1"

3
test/libsolidity/ASTJSON/assembly/empty_block_parseOnly.json
View File

@ -73,7 +73,8 @@
}
],
"src": "0:75:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:76:1"

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

@ -151,7 +151,8 @@
],
"scope": 7,
"src": "0:112:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:113:1"

3
test/libsolidity/ASTJSON/assembly/function_parseOnly.json
View File

@ -135,7 +135,8 @@
}
],
"src": "0:112:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:113:1"

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

@ -101,7 +101,8 @@
],
"scope": 7,
"src": "0:90:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:91:1"

3
test/libsolidity/ASTJSON/assembly/leave_parseOnly.json
View File

@ -85,7 +85,8 @@
}
],
"src": "0:90:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:91:1"

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

@ -164,7 +164,8 @@
],
"scope": 7,
"src": "0:118:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:119:1"

3
test/libsolidity/ASTJSON/assembly/loop_parseOnly.json
View File

@ -148,7 +148,8 @@
}
],
"src": "0:118:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:119:1"

3
test/libsolidity/ASTJSON/assembly/nested_functions.json
View File

@ -169,7 +169,8 @@
],
"scope": 9,
"src": "0:154:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:155:1"

3
test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json
View File

@ -135,7 +135,8 @@
}
],
"src": "0:154:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:155:1"

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

@ -245,7 +245,8 @@
],
"scope": 13,
"src": "0:148:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:149:1"

3
test/libsolidity/ASTJSON/assembly/slot_offset_parseOnly.json
View File

@ -189,7 +189,8 @@
}
],
"src": "0:148:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:149:1"

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

@ -106,7 +106,8 @@
],
"scope": 7,
"src": "0:82:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:83:1"

3
test/libsolidity/ASTJSON/assembly/stringlit_parseOnly.json
View File

@ -90,7 +90,8 @@
}
],
"src": "0:82:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:83:1"

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

@ -197,7 +197,8 @@
],
"scope": 7,
"src": "0:198:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:199:1"

3
test/libsolidity/ASTJSON/assembly/switch_default.json
View File

@ -128,7 +128,8 @@
],
"scope": 7,
"src": "0:102:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:103:1"

3
test/libsolidity/ASTJSON/assembly/switch_default_parseOnly.json
View File

@ -112,7 +112,8 @@
}
],
"src": "0:102:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:103:1"

3
test/libsolidity/ASTJSON/assembly/switch_parseOnly.json
View File

@ -181,7 +181,8 @@
}
],
"src": "0:198:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:199:1"

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

@ -155,7 +155,8 @@
],
"scope": 10,
"src": "0:95:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:96:1"

3
test/libsolidity/ASTJSON/assembly/var_access_parseOnly.json
View File

@ -121,7 +121,8 @@
}
],
"src": "0:95:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:96:1"

9
test/libsolidity/ASTJSON/ast_internal_function_id_export.json
View File

@ -568,7 +568,8 @@
],
"scope": 142,
"src": "60:299:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
},
{
"abstract": false,
@ -1374,7 +1375,8 @@
],
"scope": 142,
"src": "360:462:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
},
{
"abstract": false,
@ -1533,7 +1535,8 @@
],
"scope": 142,
"src": "823:85:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:909:1"

6
test/libsolidity/ASTJSON/base_constructor_call.json
View File

@ -102,7 +102,8 @@
],
"scope": 18,
"src": "0:35:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
},
{
"abstract": false,
@ -219,7 +220,8 @@
],
"scope": 18,
"src": "36:41:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:78:1"

6
test/libsolidity/ASTJSON/base_constructor_call_parseOnly.json
View File

@ -73,7 +73,8 @@
}
],
"src": "0:35:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
},
{
"abstract": false,
@ -169,7 +170,8 @@
}
],
"src": "36:41:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:78:1"

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

@ -66,7 +66,8 @@
],
"scope": 6,
"src": "0:34:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:35:1"

3
test/libsolidity/ASTJSON/constructor_parseOnly.json
View File

@ -50,7 +50,8 @@
}
],
"src": "0:34:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:35:1"

15
test/libsolidity/ASTJSON/contract_dep_order.json
View File

@ -45,7 +45,8 @@
"nodes": [],
"scope": 14,
"src": "0:14:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
},
{
"abstract": false,
@ -85,7 +86,8 @@
"nodes": [],
"scope": 14,
"src": "15:19:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
},
{
"abstract": false,
@ -126,7 +128,8 @@
"nodes": [],
"scope": 14,
"src": "35:19:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
},
{
"abstract": false,
@ -168,7 +171,8 @@
"nodes": [],
"scope": 14,
"src": "55:19:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
},
{
"abstract": false,
@ -211,7 +215,8 @@
"nodes": [],
"scope": 14,
"src": "75:19:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:95:1"

15
test/libsolidity/ASTJSON/contract_dep_order_parseOnly.json
View File

@ -15,7 +15,8 @@
"nodeType": "ContractDefinition",
"nodes": [],
"src": "0:14:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
},
{
"abstract": false,
@ -46,7 +47,8 @@
"nodeType": "ContractDefinition",
"nodes": [],
"src": "15:19:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
},
{
"abstract": false,
@ -77,7 +79,8 @@
"nodeType": "ContractDefinition",
"nodes": [],
"src": "35:19:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
},
{
"abstract": false,
@ -108,7 +111,8 @@
"nodeType": "ContractDefinition",
"nodes": [],
"src": "55:19:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
},
{
"abstract": false,
@ -139,7 +143,8 @@
"nodeType": "ContractDefinition",
"nodes": [],
"src": "75:19:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:95:1"

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

@ -37,7 +37,8 @@
"nodes": [],
"scope": 3,
"src": "28:13:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "28:14:1"
@ -80,7 +81,8 @@
"nodes": [],
"scope": 6,
"src": "62:13:2",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "62:14:2"
@ -259,7 +261,11 @@
],
"scope": 24,
"src": "0:213:3",
"usedErrors": []
"usedErrors": [],
"usedEvents":
[
12
]
}
],
"src": "0:214:3"

3
test/libsolidity/ASTJSON/documentation_local_variable.json
View File

@ -484,7 +484,8 @@
],
"scope": 42,
"src": "0:666:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:667:1"

3
test/libsolidity/ASTJSON/documentation_local_variable_parseOnly.json
View File

@ -350,7 +350,8 @@
}
],
"src": "0:666:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:667:1"

3
test/libsolidity/ASTJSON/documentation_on_statements.json
View File

@ -369,7 +369,8 @@
],
"scope": 28,
"src": "0:330:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:331:1"

3
test/libsolidity/ASTJSON/documentation_on_statements_parseOnly.json
View File

@ -253,7 +253,8 @@
}
],
"src": "0:330:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:331:1"

9
test/libsolidity/ASTJSON/documentation_parseOnly.json
View File

@ -23,7 +23,8 @@
"nodeType": "ContractDefinition",
"nodes": [],
"src": "28:13:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "28:14:1"
@ -52,7 +53,8 @@
"nodeType": "ContractDefinition",
"nodes": [],
"src": "62:13:2",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "62:14:2"
@ -197,7 +199,8 @@
}
],
"src": "0:213:3",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:214:3"

3
test/libsolidity/ASTJSON/documentation_triple.json
View File

@ -379,7 +379,8 @@
],
"scope": 29,
"src": "0:267:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:268:1"

3
test/libsolidity/ASTJSON/documentation_triple_parseOnly.json
View File

@ -256,7 +256,8 @@
}
],
"src": "0:267:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:268:1"

3
test/libsolidity/ASTJSON/enum_value.json
View File

@ -56,7 +56,8 @@
],
"scope": 5,
"src": "0:30:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:31:1"

3
test/libsolidity/ASTJSON/enum_value_parseOnly.json
View File

@ -41,7 +41,8 @@
}
],
"src": "0:30:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:31:1"

398
test/libsolidity/ASTJSON/event_aggregated_contract.json Normal file
View File

@ -0,0 +1,398 @@
{
"absolutePath": "a",
"exportedSymbols":
{
"C":
[
10
],
"D":
[
30
]
},
"id": 31,
"nodeType": "SourceUnit",
"nodes":
[
{
"abstract": false,
"baseContracts": [],
"canonicalName": "C",
"contractDependencies": [],
"contractKind": "contract",
"fullyImplemented": true,
"id": 10,
"linearizedBaseContracts":
[
10
],
"name": "C",
"nameLocation": "9:1:1",
"nodeType": "ContractDefinition",
"nodes":
[
{
"anonymous": false,
"eventSelector": "ffae15ba29768297c9b951e2e14bc33dc84599d1572acc234266fc70392babc8",
"id": 2,
"name": "e",
"nameLocation": "23:1:1",
"nodeType": "EventDefinition",
"parameters":
{
"id": 1,
"nodeType": "ParameterList",
"parameters": [],
"src": "24:2:1"
},
"src": "17:10:1"
},
{
"body":
{
"id": 8,
"nodeType": "Block",
"src": "52:25:1",
"statements":
[
{
"eventCall":
{
"arguments": [],
"expression":
{
"argumentTypes": [],
"id": 5,
"name": "e",
"nodeType": "Identifier",
"overloadedDeclarations": [],
"referencedDeclaration": 2,
"src": "67:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_function_event_nonpayable$__$returns$__$",
"typeString": "function ()"
}
},
"id": 6,
"isConstant": false,
"isLValue": false,
"isPure": false,
"kind": "functionCall",
"lValueRequested": false,
"nameLocations": [],
"names": [],
"nodeType": "FunctionCall",
"src": "67:3:1",
"tryCall": false,
"typeDescriptions":
{
"typeIdentifier": "t_tuple$__$",
"typeString": "tuple()"
}
},
"id": 7,
"nodeType": "EmitStatement",
"src": "62:8:1"
}
]
},
"functionSelector": "26121ff0",
"id": 9,
"implemented": true,
"kind": "function",
"modifiers": [],
"name": "f",
"nameLocation": "41:1:1",
"nodeType": "FunctionDefinition",
"parameters":
{
"id": 3,
"nodeType": "ParameterList",
"parameters": [],
"src": "42:2:1"
},
"returnParameters":
{
"id": 4,
"nodeType": "ParameterList",
"parameters": [],
"src": "52:0:1"
},
"scope": 10,
"src": "32:45:1",
"stateMutability": "nonpayable",
"virtual": false,
"visibility": "public"
}
],
"scope": 31,
"src": "0:79:1",
"usedErrors": [],
"usedEvents":
[
2
]
},
{
"abstract": false,
"baseContracts": [],
"canonicalName": "D",
"contractDependencies":
[
10
],
"contractKind": "contract",
"fullyImplemented": true,
"id": 30,
"linearizedBaseContracts":
[
30
],
"name": "D",
"nameLocation": "89:1:1",
"nodeType": "ContractDefinition",
"nodes":
[
{
"constant": false,
"id": 13,
"mutability": "mutable",
"name": "c",
"nameLocation": "99:1:1",
"nodeType": "VariableDeclaration",
"scope": 30,
"src": "97:3:1",
"stateVariable": true,
"storageLocation": "default",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_C_$10",
"typeString": "contract C"
},
"typeName":
{
"id": 12,
"nodeType": "UserDefinedTypeName",
"pathNode":
{
"id": 11,
"name": "C",
"nameLocations":
[
"97:1:1"
],
"nodeType": "IdentifierPath",
"referencedDeclaration": 10,
"src": "97:1:1"
},
"referencedDeclaration": 10,
"src": "97:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_C_$10",
"typeString": "contract C"
}
},
"visibility": "internal"
},
{
"body":
{
"id": 28,
"nodeType": "Block",
"src": "120:43:1",
"statements":
[
{
"expression":
{
"id": 21,
"isConstant": false,
"isLValue": false,
"isPure": false,
"lValueRequested": false,
"leftHandSide":
{
"id": 16,
"name": "c",
"nodeType": "Identifier",
"overloadedDeclarations": [],
"referencedDeclaration": 13,
"src": "130:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_C_$10",
"typeString": "contract C"
}
},
"nodeType": "Assignment",
"operator": "=",
"rightHandSide":
{
"arguments": [],
"expression":
{
"argumentTypes": [],
"id": 19,
"isConstant": false,
"isLValue": false,
"isPure": false,
"lValueRequested": false,
"nodeType": "NewExpression",
"src": "134:5:1",
"typeDescriptions":
{
"typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_C_$10_$",
"typeString": "function () returns (contract C)"
},
"typeName":
{
"id": 18,
"nodeType": "UserDefinedTypeName",
"pathNode":
{
"id": 17,
"name": "C",
"nameLocations":
[
"138:1:1"
],
"nodeType": "IdentifierPath",
"referencedDeclaration": 10,
"src": "138:1:1"
},
"referencedDeclaration": 10,
"src": "138:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_C_$10",
"typeString": "contract C"
}
}
},
"id": 20,
"isConstant": false,
"isLValue": false,
"isPure": false,
"kind": "functionCall",
"lValueRequested": false,
"nameLocations": [],
"names": [],
"nodeType": "FunctionCall",
"src": "134:7:1",
"tryCall": false,
"typeDescriptions":
{
"typeIdentifier": "t_contract$_C_$10",
"typeString": "contract C"
}
},
"src": "130:11:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_C_$10",
"typeString": "contract C"
}
},
"id": 22,
"nodeType": "ExpressionStatement",
"src": "130:11:1"
},
{
"expression":
{
"arguments": [],
"expression":
{
"argumentTypes": [],
"expression":
{
"id": 23,
"name": "c",
"nodeType": "Identifier",
"overloadedDeclarations": [],
"referencedDeclaration": 13,
"src": "151:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_contract$_C_$10",
"typeString": "contract C"
}
},
"id": 25,
"isConstant": false,
"isLValue": false,
"isPure": false,
"lValueRequested": false,
"memberLocation": "153:1:1",
"memberName": "f",
"nodeType": "MemberAccess",
"referencedDeclaration": 9,
"src": "151:3:1",
"typeDescriptions":
{
"typeIdentifier": "t_function_external_nonpayable$__$returns$__$",
"typeString": "function () external"
}
},
"id": 26,
"isConstant": false,
"isLValue": false,
"isPure": false,
"kind": "functionCall",
"lValueRequested": false,
"nameLocations": [],
"names": [],
"nodeType": "FunctionCall",
"src": "151:5:1",
"tryCall": false,
"typeDescriptions":
{
"typeIdentifier": "t_tuple$__$",
"typeString": "tuple()"
}
},
"id": 27,
"nodeType": "ExpressionStatement",
"src": "151:5:1"
}
]
},
"id": 29,
"implemented": true,
"kind": "constructor",
"modifiers": [],
"name": "",
"nameLocation": "-1:-1:-1",
"nodeType": "FunctionDefinition",
"parameters":
{
"id": 14,
"nodeType": "ParameterList",
"parameters": [],
"src": "117:2:1"
},
"returnParameters":
{
"id": 15,
"nodeType": "ParameterList",
"parameters": [],
"src": "120:0:1"
},
"scope": 30,
"src": "106:57:1",
"stateMutability": "nonpayable",
"virtual": false,
"visibility": "public"
}
],
"scope": 31,
"src": "80:85:1",
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:166:1"
}

15
test/libsolidity/ASTJSON/event_aggregated_contract.sol Normal file
View File

@ -0,0 +1,15 @@
contract C {
event e();
function f() public {
emit e();
}
}
contract D {
C c;
constructor() {
c = new C();
c.f();
}
}
// ----

6
test/libsolidity/ASTJSON/event_definition.json
View File

@ -47,7 +47,11 @@
],
"scope": 4,
"src": "0:25:1",
"usedErrors": []
"usedErrors": [],
"usedEvents":
[
2
]
}
],
"src": "0:26:1"

3
test/libsolidity/ASTJSON/event_definition_parseOnly.json
View File

@ -32,7 +32,8 @@
}
],
"src": "0:25:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:26:1"

289
test/libsolidity/ASTJSON/event_emited_in_base_contract.json Normal file
View File

@ -0,0 +1,289 @@
{
"absolutePath": "a",
"exportedSymbols":
{
"B":
[
16
],
"C":
[
19
],
"L":
[
5
]
},
"id": 20,
"nodeType": "SourceUnit",
"nodes":
[
{
"abstract": false,
"baseContracts": [],
"canonicalName": "L",
"contractDependencies": [],
"contractKind": "library",
"fullyImplemented": true,
"id": 5,
"linearizedBaseContracts":
[
5
],
"name": "L",
"nameLocation": "10:1:1",
"nodeType": "ContractDefinition",
"nodes":
[
{
"anonymous": false,
"eventSelector": "870e3024466c178150e2490c7cfb455e33c0db877113af040f89189d07946664",
"id": 4,
"name": "E",
"nameLocation": "20:1:1",
"nodeType": "EventDefinition",
"parameters":
{
"id": 3,
"nodeType": "ParameterList",
"parameters":
[
{
"constant": false,
"id": 2,
"indexed": false,
"mutability": "mutable",
"name": "",
"nameLocation": "-1:-1:-1",
"nodeType": "VariableDeclaration",
"scope": 4,
"src": "22:5:1",
"stateVariable": false,
"storageLocation": "default",
"typeDescriptions":
{
"typeIdentifier": "t_uint8",
"typeString": "uint8"
},
"typeName":
{
"id": 1,
"name": "uint8",
"nodeType": "ElementaryTypeName",
"src": "22:5:1",
"typeDescriptions":
{
"typeIdentifier": "t_uint8",
"typeString": "uint8"
}
},
"visibility": "internal"
}
],
"src": "21:7:1"
},
"src": "14:15:1"
}
],
"scope": 20,
"src": "0:31:1",
"usedErrors": [],
"usedEvents":
[
4
]
},
{
"abstract": false,
"baseContracts": [],
"canonicalName": "B",
"contractDependencies": [],
"contractKind": "contract",
"fullyImplemented": true,
"id": 16,
"linearizedBaseContracts":
[
16
],
"name": "B",
"nameLocation": "41:1:1",
"nodeType": "ContractDefinition",
"nodes":
[
{
"body":
{
"id": 14,
"nodeType": "Block",
"src": "63:28:1",
"statements":
[
{
"eventCall":
{
"arguments":
[
{
"hexValue": "30",
"id": 11,
"isConstant": false,
"isLValue": false,
"isPure": true,
"kind": "number",
"lValueRequested": false,
"nodeType": "Literal",
"src": "82:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_rational_0_by_1",
"typeString": "int_const 0"
},
"value": "0"
}
],
"expression":
{
"argumentTypes":
[
{
"typeIdentifier": "t_rational_0_by_1",
"typeString": "int_const 0"
}
],
"expression":
{
"id": 8,
"name": "L",
"nodeType": "Identifier",
"overloadedDeclarations": [],
"referencedDeclaration": 5,
"src": "78:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_type$_t_contract$_L_$5_$",
"typeString": "type(library L)"
}
},
"id": 10,
"isConstant": false,
"isLValue": false,
"isPure": false,
"lValueRequested": false,
"memberLocation": "80:1:1",
"memberName": "E",
"nodeType": "MemberAccess",
"referencedDeclaration": 4,
"src": "78:3:1",
"typeDescriptions":
{
"typeIdentifier": "t_function_event_nonpayable$_t_uint8_$returns$__$",
"typeString": "function (uint8)"
}
},
"id": 12,
"isConstant": false,
"isLValue": false,
"isPure": false,
"kind": "functionCall",
"lValueRequested": false,
"nameLocations": [],
"names": [],
"nodeType": "FunctionCall",
"src": "78:6:1",
"tryCall": false,
"typeDescriptions":
{
"typeIdentifier": "t_tuple$__$",
"typeString": "tuple()"
}
},
"id": 13,
"nodeType": "EmitStatement",
"src": "73:11:1"
}
]
},
"id": 15,
"implemented": true,
"kind": "constructor",
"modifiers": [],
"name": "",
"nameLocation": "-1:-1:-1",
"nodeType": "FunctionDefinition",
"parameters":
{
"id": 6,
"nodeType": "ParameterList",
"parameters": [],
"src": "60:2:1"
},
"returnParameters":
{
"id": 7,
"nodeType": "ParameterList",
"parameters": [],
"src": "63:0:1"
},
"scope": 16,
"src": "49:42:1",
"stateMutability": "nonpayable",
"virtual": false,
"visibility": "public"
}
],
"scope": 20,
"src": "32:61:1",
"usedErrors": [],
"usedEvents":
[
4
]
},
{
"abstract": false,
"baseContracts":
[
{
"baseName":
{
"id": 17,
"name": "B",
"nameLocations":
[
"108:1:1"
],
"nodeType": "IdentifierPath",
"referencedDeclaration": 16,
"src": "108:1:1"
},
"id": 18,
"nodeType": "InheritanceSpecifier",
"src": "108:1:1"
}
],
"canonicalName": "C",
"contractDependencies": [],
"contractKind": "contract",
"fullyImplemented": true,
"id": 19,
"linearizedBaseContracts":
[
19,
16
],
"name": "C",
"nameLocation": "103:1:1",
"nodeType": "ContractDefinition",
"nodes": [],
"scope": 20,
"src": "94:18:1",
"usedErrors": [],
"usedEvents":
[
4
]
}
],
"src": "0:113:1"
}

9
test/libsolidity/ASTJSON/event_emited_in_base_contract.sol Normal file
View File

@ -0,0 +1,9 @@
library L { event E(uint8); }
contract B {
constructor() {
emit L.E(0);
}
}
contract C is B {}
// ----

194
test/libsolidity/ASTJSON/event_inheritance.json Normal file
View File

@ -0,0 +1,194 @@
{
"absolutePath": "a",
"exportedSymbols":
{
"B":
[
3
],
"C":
[
8
],
"D":
[
13
]
},
"id": 14,
"nodeType": "SourceUnit",
"nodes":
[
{
"abstract": false,
"baseContracts": [],
"canonicalName": "B",
"contractDependencies": [],
"contractKind": "interface",
"fullyImplemented": true,
"id": 3,
"linearizedBaseContracts":
[
3
],
"name": "B",
"nameLocation": "10:1:1",
"nodeType": "ContractDefinition",
"nodes":
[
{
"anonymous": false,
"eventSelector": "dbec0351ad6bb0c1f07ea56e236e3e692fde2259f0165fd422f241da339b7e4f",
"id": 2,
"name": "EB",
"nameLocation": "24:2:1",
"nodeType": "EventDefinition",
"parameters":
{
"id": 1,
"nodeType": "ParameterList",
"parameters": [],
"src": "26:2:1"
},
"src": "18:11:1"
}
],
"scope": 14,
"src": "0:31:1",
"usedErrors": [],
"usedEvents":
[
2
]
},
{
"abstract": false,
"baseContracts":
[
{
"baseName":
{
"id": 4,
"name": "B",
"nameLocations":
[
"46:1:1"
],
"nodeType": "IdentifierPath",
"referencedDeclaration": 3,
"src": "46:1:1"
},
"id": 5,
"nodeType": "InheritanceSpecifier",
"src": "46:1:1"
}
],
"canonicalName": "C",
"contractDependencies": [],
"contractKind": "contract",
"fullyImplemented": true,
"id": 8,
"linearizedBaseContracts":
[
8,
3
],
"name": "C",
"nameLocation": "41:1:1",
"nodeType": "ContractDefinition",
"nodes":
[
{
"anonymous": false,
"eventSelector": "a08b3367d3fa83ea27f8951ffb5d9d160cbfadbd80816b47f677e7699d76f5a0",
"id": 7,
"name": "EC",
"nameLocation": "60:2:1",
"nodeType": "EventDefinition",
"parameters":
{
"id": 6,
"nodeType": "ParameterList",
"parameters": [],
"src": "62:2:1"
},
"src": "54:11:1"
}
],
"scope": 14,
"src": "32:35:1",
"usedErrors": [],
"usedEvents":
[
2,
7
]
},
{
"abstract": false,
"baseContracts":
[
{
"baseName":
{
"id": 9,
"name": "C",
"nameLocations":
[
"82:1:1"
],
"nodeType": "IdentifierPath",
"referencedDeclaration": 8,
"src": "82:1:1"
},
"id": 10,
"nodeType": "InheritanceSpecifier",
"src": "82:1:1"
}
],
"canonicalName": "D",
"contractDependencies": [],
"contractKind": "contract",
"fullyImplemented": true,
"id": 13,
"linearizedBaseContracts":
[
13,
8,
3
],
"name": "D",
"nameLocation": "77:1:1",
"nodeType": "ContractDefinition",
"nodes":
[
{
"anonymous": false,
"eventSelector": "caa54b91a2314ab89b39714b1cd283762e53a2f59cfb997d6770e2824c39db0d",
"id": 12,
"name": "ED",
"nameLocation": "96:2:1",
"nodeType": "EventDefinition",
"parameters":
{
"id": 11,
"nodeType": "ParameterList",
"parameters": [],
"src": "98:2:1"
},
"src": "90:11:1"
}
],
"scope": 14,
"src": "68:35:1",
"usedErrors": [],
"usedEvents":
[
2,
7,
12
]
}
],
"src": "0:104:1"
}

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

@ -0,0 +1,11 @@
interface B {
event EB();
}
contract C is B {
event EC();
}
contract D is C {
event ED();
}
// ----

3
test/libsolidity/ASTJSON/event_with_variables_of_internal_types_parseOnly.json
View File

@ -71,7 +71,8 @@
}
],
"src": "0:48:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:49:1"

3
test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json
View File

@ -289,7 +289,8 @@
}
],
"src": "21:154:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:176:1"

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

@ -66,7 +66,8 @@
],
"scope": 6,
"src": "0:50:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:51:1"

3
test/libsolidity/ASTJSON/fallback_and_reveice_ether.json → test/libsolidity/ASTJSON/fallback_and_receive_ether.json
View File

@ -101,7 +101,8 @@
],
"scope": 10,
"src": "0:85:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:86:1"

0
test/libsolidity/ASTJSON/fallback_and_reveice_ether.sol → test/libsolidity/ASTJSON/fallback_and_receive_ether.sol
View File

3
test/libsolidity/ASTJSON/fallback_and_reveice_ether_parseOnly.json → test/libsolidity/ASTJSON/fallback_and_receive_ether_parseOnly.json
View File

@ -85,7 +85,8 @@
}
],
"src": "0:85:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:86:1"

3
test/libsolidity/ASTJSON/fallback_parseOnly.json
View File

@ -51,7 +51,8 @@
}
],
"src": "0:50:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:51:1"

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

@ -66,7 +66,8 @@
],
"scope": 6,
"src": "0:38:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:39:1"

3
test/libsolidity/ASTJSON/fallback_payable_parseOnly.json
View File

@ -51,7 +51,8 @@
}
],
"src": "0:38:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:39:1"

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

@ -225,7 +225,8 @@
],
"scope": 18,
"src": "0:131:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:132:1"

3
test/libsolidity/ASTJSON/function_type_parseOnly.json
View File

@ -173,7 +173,8 @@
}
],
"src": "0:131:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:132:1"

319
test/libsolidity/ASTJSON/indirect_event.json Normal file
View File

@ -0,0 +1,319 @@
{
"absolutePath": "a",
"exportedSymbols":
{
"C":
[
25
],
"L":
[
10
]
},
"id": 26,
"license": "GPL-3.0",
"nodeType": "SourceUnit",
"nodes":
[
{
"abstract": false,
"baseContracts": [],
"canonicalName": "L",
"contractDependencies": [],
"contractKind": "library",
"fullyImplemented": true,
"id": 10,
"linearizedBaseContracts":
[
10
],
"name": "L",
"nameLocation": "44:1:1",
"nodeType": "ContractDefinition",
"nodes":
[
{
"anonymous": false,
"eventSelector": "92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028",
"id": 2,
"name": "E",
"nameLocation": "58:1:1",
"nodeType": "EventDefinition",
"parameters":
{
"id": 1,
"nodeType": "ParameterList",
"parameters": [],
"src": "59:2:1"
},
"src": "52:10:1"
},
{
"body":
{
"id": 8,
"nodeType": "Block",
"src": "89:13:1",
"statements":
[
{
"eventCall":
{
"arguments": [],
"expression":
{
"argumentTypes": [],
"id": 5,
"name": "E",
"nodeType": "Identifier",
"overloadedDeclarations": [],
"referencedDeclaration": 2,
"src": "96:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_function_event_nonpayable$__$returns$__$",
"typeString": "function ()"
}
},
"id": 6,
"isConstant": false,
"isLValue": false,
"isPure": false,
"kind": "functionCall",
"lValueRequested": false,
"nameLocations": [],
"names": [],
"nodeType": "FunctionCall",
"src": "96:3:1",
"tryCall": false,
"typeDescriptions":
{
"typeIdentifier": "t_tuple$__$",
"typeString": "tuple()"
}
},
"id": 7,
"nodeType": "EmitStatement",
"src": "91:8:1"
}
]
},
"id": 9,
"implemented": true,
"kind": "function",
"modifiers": [],
"name": "f",
"nameLocation": "76:1:1",
"nodeType": "FunctionDefinition",
"parameters":
{
"id": 3,
"nodeType": "ParameterList",
"parameters": [],
"src": "77:2:1"
},
"returnParameters":
{
"id": 4,
"nodeType": "ParameterList",
"parameters": [],
"src": "89:0:1"
},
"scope": 10,
"src": "67:35:1",
"stateMutability": "nonpayable",
"virtual": false,
"visibility": "internal"
}
],
"scope": 26,
"src": "36:68:1",
"usedErrors": [],
"usedEvents":
[
2
]
},
{
"abstract": false,
"baseContracts": [],
"canonicalName": "C",
"contractDependencies": [],
"contractKind": "contract",
"fullyImplemented": true,
"id": 25,
"linearizedBaseContracts":
[
25
],
"name": "C",
"nameLocation": "114:1:1",
"nodeType": "ContractDefinition",
"nodes":
[
{
"anonymous": false,
"eventSelector": "70a5d861ef9816388422765f41d618eb3abdf490acb37354b539729e37b09f0e",
"id": 12,
"name": "H",
"nameLocation": "128:1:1",
"nodeType": "EventDefinition",
"parameters":
{
"id": 11,
"nodeType": "ParameterList",
"parameters": [],
"src": "129:2:1"
},
"src": "122:10:1"
},
{
"body":
{
"id": 23,
"nodeType": "Block",
"src": "157:20:1",
"statements":
[
{
"expression":
{
"arguments": [],
"expression":
{
"argumentTypes": [],
"expression":
{
"id": 15,
"name": "L",
"nodeType": "Identifier",
"overloadedDeclarations": [],
"referencedDeclaration": 10,
"src": "159:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_type$_t_contract$_L_$10_$",
"typeString": "type(library L)"
}
},
"id": 17,
"isConstant": false,
"isLValue": false,
"isPure": false,
"lValueRequested": false,
"memberLocation": "161:1:1",
"memberName": "f",
"nodeType": "MemberAccess",
"referencedDeclaration": 9,
"src": "159:3:1",
"typeDescriptions":
{
"typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
"typeString": "function ()"
}
},
"id": 18,
"isConstant": false,
"isLValue": false,
"isPure": false,
"kind": "functionCall",
"lValueRequested": false,
"nameLocations": [],
"names": [],
"nodeType": "FunctionCall",
"src": "159:5:1",
"tryCall": false,
"typeDescriptions":
{
"typeIdentifier": "t_tuple$__$",
"typeString": "tuple()"
}
},
"id": 19,
"nodeType": "ExpressionStatement",
"src": "159:5:1"
},
{
"eventCall":
{
"arguments": [],
"expression":
{
"argumentTypes": [],
"id": 20,
"name": "H",
"nodeType": "Identifier",
"overloadedDeclarations": [],
"referencedDeclaration": 12,
"src": "171:1:1",
"typeDescriptions":
{
"typeIdentifier": "t_function_event_nonpayable$__$returns$__$",
"typeString": "function ()"
}
},
"id": 21,
"isConstant": false,
"isLValue": false,
"isPure": false,
"kind": "functionCall",
"lValueRequested": false,
"nameLocations": [],
"names": [],
"nodeType": "FunctionCall",
"src": "171:3:1",
"tryCall": false,
"typeDescriptions":
{
"typeIdentifier": "t_tuple$__$",
"typeString": "tuple()"
}
},
"id": 22,
"nodeType": "EmitStatement",
"src": "166:8:1"
}
]
},
"functionSelector": "e2179b8e",
"id": 24,
"implemented": true,
"kind": "function",
"modifiers": [],
"name": "g",
"nameLocation": "146:1:1",
"nodeType": "FunctionDefinition",
"parameters":
{
"id": 13,
"nodeType": "ParameterList",
"parameters": [],
"src": "147:2:1"
},
"returnParameters":
{
"id": 14,
"nodeType": "ParameterList",
"parameters": [],
"src": "157:0:1"
},
"scope": 25,
"src": "137:40:1",
"stateMutability": "nonpayable",
"virtual": false,
"visibility": "public"
}
],
"scope": 26,
"src": "105:74:1",
"usedErrors": [],
"usedEvents":
[
2,
12
]
}
],
"src": "36:144:1"
}

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

@ -0,0 +1,11 @@
// SPDX-License-Identifier: GPL-3.0
library L {
event E();
function f() internal { emit E(); }
}
contract C {
event H();
function g() public { L.f(); emit H(); }
}
// ----

228
test/libsolidity/ASTJSON/indirect_event_parseOnly.json Normal file
View File

@ -0,0 +1,228 @@
{
"absolutePath": "a",
"id": 26,
"license": "GPL-3.0",
"nodeType": "SourceUnit",
"nodes":
[
{
"abstract": false,
"baseContracts": [],
"contractDependencies": [],
"contractKind": "library",
"id": 10,
"name": "L",
"nameLocation": "44:1:1",
"nodeType": "ContractDefinition",
"nodes":
[
{
"anonymous": false,
"id": 2,
"name": "E",
"nameLocation": "58:1:1",
"nodeType": "EventDefinition",
"parameters":
{
"id": 1,
"nodeType": "ParameterList",
"parameters": [],
"src": "59:2:1"
},
"src": "52:10:1"
},
{
"body":
{
"id": 8,
"nodeType": "Block",
"src": "89:13:1",
"statements":
[
{
"eventCall":
{
"arguments": [],
"expression":
{
"id": 5,
"name": "E",
"nodeType": "Identifier",
"overloadedDeclarations": [],
"src": "96:1:1",
"typeDescriptions": {}
},
"id": 6,
"nameLocations": [],
"names": [],
"nodeType": "FunctionCall",
"src": "96:3:1",
"tryCall": false,
"typeDescriptions": {}
},
"id": 7,
"nodeType": "EmitStatement",
"src": "91:8:1"
}
]
},
"id": 9,
"implemented": true,
"kind": "function",
"modifiers": [],
"name": "f",
"nameLocation": "76:1:1",
"nodeType": "FunctionDefinition",
"parameters":
{
"id": 3,
"nodeType": "ParameterList",
"parameters": [],
"src": "77:2:1"
},
"returnParameters":
{
"id": 4,
"nodeType": "ParameterList",
"parameters": [],
"src": "89:0:1"
},
"src": "67:35:1",
"stateMutability": "nonpayable",
"virtual": false,
"visibility": "internal"
}
],
"src": "36:68:1",
"usedErrors": [],
"usedEvents": []
},
{
"abstract": false,
"baseContracts": [],
"contractDependencies": [],
"contractKind": "contract",
"id": 25,
"name": "C",
"nameLocation": "114:1:1",
"nodeType": "ContractDefinition",
"nodes":
[
{
"anonymous": false,
"id": 12,
"name": "H",
"nameLocation": "128:1:1",
"nodeType": "EventDefinition",
"parameters":
{
"id": 11,
"nodeType": "ParameterList",
"parameters": [],
"src": "129:2:1"
},
"src": "122:10:1"
},
{
"body":
{
"id": 23,
"nodeType": "Block",
"src": "157:20:1",
"statements":
[
{
"expression":
{
"arguments": [],
"expression":
{
"expression":
{
"id": 15,
"name": "L",
"nodeType": "Identifier",
"overloadedDeclarations": [],
"src": "159:1:1",
"typeDescriptions": {}
},
"id": 17,
"memberLocation": "161:1:1",
"memberName": "f",
"nodeType": "MemberAccess",
"src": "159:3:1",
"typeDescriptions": {}
},
"id": 18,
"nameLocations": [],
"names": [],
"nodeType": "FunctionCall",
"src": "159:5:1",
"tryCall": false,
"typeDescriptions": {}
},
"id": 19,
"nodeType": "ExpressionStatement",
"src": "159:5:1"
},
{
"eventCall":
{
"arguments": [],
"expression":
{
"id": 20,
"name": "H",
"nodeType": "Identifier",
"overloadedDeclarations": [],
"src": "171:1:1",
"typeDescriptions": {}
},
"id": 21,
"nameLocations": [],
"names": [],
"nodeType": "FunctionCall",
"src": "171:3:1",
"tryCall": false,
"typeDescriptions": {}
},
"id": 22,
"nodeType": "EmitStatement",
"src": "166:8:1"
}
]
},
"id": 24,
"implemented": true,
"kind": "function",
"modifiers": [],
"name": "g",
"nameLocation": "146:1:1",
"nodeType": "FunctionDefinition",
"parameters":
{
"id": 13,
"nodeType": "ParameterList",
"parameters": [],
"src": "147:2:1"
},
"returnParameters":
{
"id": 14,
"nodeType": "ParameterList",
"parameters": [],
"src": "157:0:1"
},
"src": "137:40:1",
"stateMutability": "nonpayable",
"virtual": false,
"visibility": "public"
}
],
"src": "105:74:1",
"usedErrors": [],
"usedEvents": []
}
],
"src": "36:144:1"
}

6
test/libsolidity/ASTJSON/inheritance_specifier.json
View File

@ -33,7 +33,8 @@
"nodes": [],
"scope": 5,
"src": "0:14:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
},
{
"abstract": false,
@ -73,7 +74,8 @@
"nodes": [],
"scope": 5,
"src": "15:20:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:36:1"

6
test/libsolidity/ASTJSON/inheritance_specifier_parseOnly.json
View File

@ -15,7 +15,8 @@
"nodeType": "ContractDefinition",
"nodes": [],
"src": "0:14:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
},
{
"abstract": false,
@ -46,7 +47,8 @@
"nodeType": "ContractDefinition",
"nodes": [],
"src": "15:20:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:36:1"

3
test/libsolidity/ASTJSON/license.json
View File

@ -30,7 +30,8 @@
"nodes": [],
"scope": 2,
"src": "36:13:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "36:14:1"

3
test/libsolidity/ASTJSON/license_parseOnly.json
View File

@ -16,7 +16,8 @@
"nodeType": "ContractDefinition",
"nodes": [],
"src": "36:13:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "36:14:1"

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

@ -168,7 +168,8 @@
],
"scope": 12,
"src": "0:54:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:55:1"

3
test/libsolidity/ASTJSON/long_type_name_binary_operation_parseOnly.json
View File

@ -115,7 +115,8 @@
}
],
"src": "0:54:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:55:1"

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

@ -177,7 +177,8 @@
],
"scope": 16,
"src": "0:70:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:71:1"

3
test/libsolidity/ASTJSON/long_type_name_identifier_parseOnly.json
View File

@ -130,7 +130,8 @@
}
],
"src": "0:70:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:71:1"

3
test/libsolidity/ASTJSON/mappings.json
View File

@ -315,7 +315,8 @@
],
"scope": 24,
"src": "0:173:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:174:1"

3
test/libsolidity/ASTJSON/mappings_parseOnly.json
View File

@ -228,7 +228,8 @@
}
],
"src": "0:173:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:174:1"

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

@ -169,7 +169,8 @@
],
"scope": 15,
"src": "0:68:1",
"usedErrors": []
"usedErrors": [],
"usedEvents": []
}
],
"src": "0:69:1"

Some files were not shown because too many files have changed in this diff Show More