mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Fix ICE when emitting event from another contract
This commit is contained in:
committed by
Kamil Śliwak
parent
957a9e742b
commit
964bdc711c
@@ -80,14 +80,6 @@ Json::Value Natspec::userDocumentation(ContractDefinition const& _contractDef)
|
||||
|
||||
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;
|
||||
@@ -178,16 +170,7 @@ Json::Value Natspec::devDocumentation(ContractDefinition const& _contractDef)
|
||||
|
||||
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);
|
||||
|
||||
Reference in New Issue
Block a user