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

Changelog entry and small fixes.

Browse Source
This commit is contained in:
chriseth
2016-11-16 14:37:18 +01:00
parent 6172590b87
commit 62492b67e7
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/ast/ASTJsonConverter.cpp
+5
View File
@@ -228,8 +228,13 @@ bool ASTJsonConverter::visit(UserDefinedTypeName const& _node)
bool ASTJsonConverter::visit(FunctionTypeName const& _node)
{
string visibility = "internal";
if (_node.visibility() == Declaration::Visibility::External)
visibility = "external";
addJsonNode(_node, "FunctionTypeName", {
make_pair("payable", _node.isPayable()),
make_pair("visibility", visibility),
make_pair("constant", _node.isDeclaredConst())
});
return true;
libsolidity/ast/Types.cpp
+3 -5
View File
@@ -2077,12 +2077,10 @@ TypePointer FunctionType::encodingType() const
TypePointer FunctionType::interfaceType(bool /*_inLibrary*/) const
{
if (m_location != Location::External && m_location != Location::Internal)
return TypePointer();
if (m_location != Location::External)
return TypePointer();
else
if (m_location == Location::External)
return make_shared<IntegerType>(8 * storageBytes());
else
return TypePointer();
}
bool FunctionType::canTakeArguments(TypePointers const& _argumentTypes, TypePointer const& _selfType) const