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

Change return type for interfaceType() to ResultType

Browse Source
This commit is contained in:
Mathias Baumann 2019-03-18 13:22:42 +01:00
parent 56f2912e61
commit 0fbea8a1a0
5 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/analysis/ReferencesResolver.cpp
View File

@ -213,7 +213,7 @@ void ReferencesResolver::endVisit(FunctionTypeName const& _typeName)
for (auto const& t: _typeName.parameterTypes() + _typeName.returnParameterTypes()) for (auto const& t: _typeName.parameterTypes() + _typeName.returnParameterTypes())
{ {
solAssert(t->annotation().type, "Type not set for parameter."); solAssert(t->annotation().type, "Type not set for parameter.");
if (!t->annotation().type->interfaceType(false)) if (!t->annotation().type->interfaceType(false).get())
{ {
fatalTypeError(t->location(), "Internal type cannot be used for external function type."); fatalTypeError(t->location(), "Internal type cannot be used for external function type.");
return; return;

6
libsolidity/analysis/TypeChecker.cpp
View File

@ -355,7 +355,7 @@ bool TypeChecker::visit(FunctionDefinition const& _function)
{ {
if (!type(var)->canLiveOutsideStorage() && _function.isPublic()) if (!type(var)->canLiveOutsideStorage() && _function.isPublic())
m_errorReporter.typeError(var.location(), "Type is required to live outside storage."); m_errorReporter.typeError(var.location(), "Type is required to live outside storage.");
if (_function.isPublic() && !(type(var)->interfaceType(isLibraryFunction))) if (_function.isPublic() && !(type(var)->interfaceType(isLibraryFunction).get()))
m_errorReporter.fatalTypeError(var.location(), "Internal or recursive type is not allowed for public or external functions."); m_errorReporter.fatalTypeError(var.location(), "Internal or recursive type is not allowed for public or external functions.");
} }
if ( if (
@ -576,7 +576,7 @@ bool TypeChecker::visit(EventDefinition const& _eventDef)
numIndexed++; numIndexed++;
if (!type(*var)->canLiveOutsideStorage()) if (!type(*var)->canLiveOutsideStorage())
m_errorReporter.typeError(var->location(), "Type is required to live outside storage."); m_errorReporter.typeError(var->location(), "Type is required to live outside storage.");
if (!type(*var)->interfaceType(false)) if (!type(*var)->interfaceType(false).get())
m_errorReporter.typeError(var->location(), "Internal or recursive type is not allowed as event parameter type."); m_errorReporter.typeError(var->location(), "Internal or recursive type is not allowed as event parameter type.");
if ( if (
!_eventDef.sourceUnit().annotation().experimentalFeatures.count(ExperimentalFeature::ABIEncoderV2) && !_eventDef.sourceUnit().annotation().experimentalFeatures.count(ExperimentalFeature::ABIEncoderV2) &&
@ -599,7 +599,7 @@ void TypeChecker::endVisit(FunctionTypeName const& _funType)
{ {
FunctionType const& fun = dynamic_cast<FunctionType const&>(*_funType.annotation().type); FunctionType const& fun = dynamic_cast<FunctionType const&>(*_funType.annotation().type);
if (fun.kind() == FunctionType::Kind::External) if (fun.kind() == FunctionType::Kind::External)
solAssert(fun.interfaceType(false), "External function type uses internal types."); solAssert(fun.interfaceType(false).get(), "External function type uses internal types.");
} }
bool TypeChecker::visit(InlineAssembly const& _inlineAssembly) bool TypeChecker::visit(InlineAssembly const& _inlineAssembly)

20
libsolidity/ast/Types.cpp
View File

@ -1869,7 +1869,7 @@ TypePointer ArrayType::decodingType() const
return shared_from_this(); return shared_from_this();
} }
TypePointer ArrayType::interfaceType(bool _inLibrary) const TypeResult ArrayType::interfaceType(bool _inLibrary) const
{ {
if (_inLibrary && m_interfaceType_library.is_initialized()) if (_inLibrary && m_interfaceType_library.is_initialized())
return *m_interfaceType_library; return *m_interfaceType_library;
@ -2135,7 +2135,7 @@ MemberList::MemberMap StructType::nativeMembers(ContractDefinition const*) const
return members; return members;
} }
TypePointer StructType::interfaceType(bool _inLibrary) const TypeResult StructType::interfaceType(bool _inLibrary) const
{ {
if (_inLibrary && m_interfaceType_library.is_initialized()) if (_inLibrary && m_interfaceType_library.is_initialized())
return *m_interfaceType_library; return *m_interfaceType_library;
@ -2168,7 +2168,7 @@ TypePointer StructType::interfaceType(bool _inLibrary) const
allOkay = false; allOkay = false;
break; break;
} }
if (!var->annotation().type->interfaceType(false)) if (!var->annotation().type->interfaceType(false).get())
{ {
allOkay = false; allOkay = false;
break; break;
@ -2204,8 +2204,8 @@ string StructType::signatureInExternalFunction(bool _structsByName) const
{ {
solAssert(_t, "Parameter should have external type."); solAssert(_t, "Parameter should have external type.");
auto t = _t->interfaceType(_structsByName); auto t = _t->interfaceType(_structsByName);
solAssert(t, ""); solAssert(t.get(), "");
return t->signatureInExternalFunction(_structsByName); return t.get()->signatureInExternalFunction(_structsByName);
}); });
return "(" + boost::algorithm::join(memberTypeStrings, ",") + ")"; return "(" + boost::algorithm::join(memberTypeStrings, ",") + ")";
} }
@ -2574,7 +2574,7 @@ FunctionType::FunctionType(FunctionTypeName const& _typeName):
solAssert(t->annotation().type, "Type not set for parameter."); solAssert(t->annotation().type, "Type not set for parameter.");
if (m_kind == Kind::External) if (m_kind == Kind::External)
solAssert( solAssert(
t->annotation().type->interfaceType(false), t->annotation().type->interfaceType(false).get(),
"Internal type used as parameter for external function." "Internal type used as parameter for external function."
); );
m_parameterTypes.push_back(t->annotation().type); m_parameterTypes.push_back(t->annotation().type);
@ -2584,7 +2584,7 @@ FunctionType::FunctionType(FunctionTypeName const& _typeName):
solAssert(t->annotation().type, "Type not set for return parameter."); solAssert(t->annotation().type, "Type not set for return parameter.");
if (m_kind == Kind::External) if (m_kind == Kind::External)
solAssert( solAssert(
t->annotation().type->interfaceType(false), t->annotation().type->interfaceType(false).get(),
"Internal type used as return parameter for external function." "Internal type used as return parameter for external function."
); );
m_returnParameterTypes.push_back(t->annotation().type); m_returnParameterTypes.push_back(t->annotation().type);
@ -2885,14 +2885,14 @@ FunctionTypePointer FunctionType::interfaceFunctionType() const
for (auto type: m_parameterTypes) for (auto type: m_parameterTypes)
{ {
if (auto ext = type->interfaceType(isLibraryFunction)) if (auto ext = type->interfaceType(isLibraryFunction).get())
paramTypes.push_back(ext); paramTypes.push_back(ext);
else else
return FunctionTypePointer(); return FunctionTypePointer();
} }
for (auto type: m_returnParameterTypes) for (auto type: m_returnParameterTypes)
{ {
if (auto ext = type->interfaceType(isLibraryFunction)) if (auto ext = type->interfaceType(isLibraryFunction).get())
retParamTypes.push_back(ext); retParamTypes.push_back(ext);
else else
return FunctionTypePointer(); return FunctionTypePointer();
@ -2978,7 +2978,7 @@ TypePointer FunctionType::encodingType() const
return TypePointer(); return TypePointer();
} }
TypePointer FunctionType::interfaceType(bool /*_inLibrary*/) const TypeResult FunctionType::interfaceType(bool /*_inLibrary*/) const
{ {
if (m_kind == Kind::External) if (m_kind == Kind::External)
return shared_from_this(); return shared_from_this();

32
libsolidity/ast/Types.h
View File

@ -304,7 +304,7 @@ public:
/// If there is no such type, returns an empty shared pointer. /// If there is no such type, returns an empty shared pointer.
/// @param _inLibrary if set, returns types as used in a library, e.g. struct and contract types /// @param _inLibrary if set, returns types as used in a library, e.g. struct and contract types
/// are returned without modification. /// are returned without modification.
virtual TypePointer interfaceType(bool /*_inLibrary*/) const { return TypePointer(); } virtual TypeResult interfaceType(bool /*_inLibrary*/) const { return TypePointer(); }
private: private:
/// @returns a member list containing all members added to this type by `using for` directives. /// @returns a member list containing all members added to this type by `using for` directives.
@ -355,7 +355,7 @@ public:
u256 literalValue(Literal const* _literal) const override; u256 literalValue(Literal const* _literal) const override;
TypePointer encodingType() const override { return shared_from_this(); } TypePointer encodingType() const override { return shared_from_this(); }
TypePointer interfaceType(bool) const override { return shared_from_this(); } TypeResult interfaceType(bool) const override { return shared_from_this(); }
StateMutability stateMutability(void) const { return m_stateMutability; } StateMutability stateMutability(void) const { return m_stateMutability; }
@ -395,7 +395,7 @@ public:
std::string toString(bool _short) const override; std::string toString(bool _short) const override;
TypePointer encodingType() const override { return shared_from_this(); } TypePointer encodingType() const override { return shared_from_this(); }
TypePointer interfaceType(bool) const override { return shared_from_this(); } TypeResult interfaceType(bool) const override { return shared_from_this(); }
unsigned numBits() const { return m_bits; } unsigned numBits() const { return m_bits; }
bool isSigned() const { return m_modifier == Modifier::Signed; } bool isSigned() const { return m_modifier == Modifier::Signed; }
@ -437,7 +437,7 @@ public:
std::string toString(bool _short) const override; std::string toString(bool _short) const override;
TypePointer encodingType() const override { return shared_from_this(); } TypePointer encodingType() const override { return shared_from_this(); }
TypePointer interfaceType(bool) const override { return shared_from_this(); } TypeResult interfaceType(bool) const override { return shared_from_this(); }
/// Number of bits used for this type in total. /// Number of bits used for this type in total.
unsigned numBits() const { return m_totalBits; } unsigned numBits() const { return m_totalBits; }
@ -583,7 +583,7 @@ public:
std::string toString(bool) const override { return "bytes" + dev::toString(m_bytes); } std::string toString(bool) const override { return "bytes" + dev::toString(m_bytes); }
MemberList::MemberMap nativeMembers(ContractDefinition const*) const override; MemberList::MemberMap nativeMembers(ContractDefinition const*) const override;
TypePointer encodingType() const override { return shared_from_this(); } TypePointer encodingType() const override { return shared_from_this(); }
TypePointer interfaceType(bool) const override { return shared_from_this(); } TypeResult interfaceType(bool) const override { return shared_from_this(); }
unsigned numBytes() const { return m_bytes; } unsigned numBytes() const { return m_bytes; }
@ -609,7 +609,7 @@ public:
std::string toString(bool) const override { return "bool"; } std::string toString(bool) const override { return "bool"; }
u256 literalValue(Literal const* _literal) const override; u256 literalValue(Literal const* _literal) const override;
TypePointer encodingType() const override { return shared_from_this(); } TypePointer encodingType() const override { return shared_from_this(); }
TypePointer interfaceType(bool) const override { return shared_from_this(); } TypeResult interfaceType(bool) const override { return shared_from_this(); }
}; };
/** /**
@ -716,7 +716,7 @@ public:
MemberList::MemberMap nativeMembers(ContractDefinition const* _currentScope) const override; MemberList::MemberMap nativeMembers(ContractDefinition const* _currentScope) const override;
TypePointer encodingType() const override; TypePointer encodingType() const override;
TypePointer decodingType() const override; TypePointer decodingType() const override;
TypePointer interfaceType(bool _inLibrary) const override; TypeResult interfaceType(bool _inLibrary) const override;
/// @returns true if this is valid to be stored in calldata /// @returns true if this is valid to be stored in calldata
bool validForCalldata() const; bool validForCalldata() const;
@ -749,8 +749,8 @@ private:
TypePointer m_baseType; TypePointer m_baseType;
bool m_hasDynamicLength = true; bool m_hasDynamicLength = true;
u256 m_length; u256 m_length;
mutable boost::optional<TypePointer> m_interfaceType; mutable boost::optional<TypeResult> m_interfaceType;
mutable boost::optional<TypePointer> m_interfaceType_library; mutable boost::optional<TypeResult> m_interfaceType_library;
}; };
/** /**
@ -788,7 +788,7 @@ public:
return TypePointer{}; return TypePointer{};
return std::make_shared<AddressType>(isPayable() ? StateMutability::Payable : StateMutability::NonPayable); return std::make_shared<AddressType>(isPayable() ? StateMutability::Payable : StateMutability::NonPayable);
} }
TypePointer interfaceType(bool _inLibrary) const override TypeResult interfaceType(bool _inLibrary) const override
{ {
if (isSuper()) if (isSuper())
return TypePointer{}; return TypePointer{};
@ -842,7 +842,7 @@ public:
{ {
return location() == DataLocation::Storage ? std::make_shared<IntegerType>(256) : shared_from_this(); return location() == DataLocation::Storage ? std::make_shared<IntegerType>(256) : shared_from_this();
} }
TypePointer interfaceType(bool _inLibrary) const override; TypeResult interfaceType(bool _inLibrary) const override;
TypePointer copyForLocation(DataLocation _location, bool _isPointer) const override; TypePointer copyForLocation(DataLocation _location, bool _isPointer) const override;
@ -872,8 +872,8 @@ private:
StructDefinition const& m_struct; StructDefinition const& m_struct;
/// Cache for the recursive() function. /// Cache for the recursive() function.
mutable boost::optional<bool> m_recursive; mutable boost::optional<bool> m_recursive;
mutable boost::optional<TypePointer> m_interfaceType; mutable boost::optional<TypeResult> m_interfaceType;
mutable boost::optional<TypePointer> m_interfaceType_library; mutable boost::optional<TypeResult> m_interfaceType_library;
}; };
/** /**
@ -902,7 +902,7 @@ public:
{ {
return std::make_shared<IntegerType>(8 * int(storageBytes())); return std::make_shared<IntegerType>(8 * int(storageBytes()));
} }
TypePointer interfaceType(bool _inLibrary) const override TypeResult interfaceType(bool _inLibrary) const override
{ {
return _inLibrary ? shared_from_this() : encodingType(); return _inLibrary ? shared_from_this() : encodingType();
} }
@ -1098,7 +1098,7 @@ public:
bool hasSimpleZeroValueInMemory() const override { return false; } bool hasSimpleZeroValueInMemory() const override { return false; }
MemberList::MemberMap nativeMembers(ContractDefinition const* _currentScope) const override; MemberList::MemberMap nativeMembers(ContractDefinition const* _currentScope) const override;
TypePointer encodingType() const override; TypePointer encodingType() const override;
TypePointer interfaceType(bool _inLibrary) const override; TypeResult interfaceType(bool _inLibrary) const override;
/// @returns TypePointer of a new FunctionType object. All input/return parameters are an /// @returns TypePointer of a new FunctionType object. All input/return parameters are an
/// appropriate external types (i.e. the interfaceType()s) of input/return parameters of /// appropriate external types (i.e. the interfaceType()s) of input/return parameters of
@ -1223,7 +1223,7 @@ public:
{ {
return std::make_shared<IntegerType>(256); return std::make_shared<IntegerType>(256);
} }
TypePointer interfaceType(bool _inLibrary) const override TypeResult interfaceType(bool _inLibrary) const override
{ {
return _inLibrary ? shared_from_this() : TypePointer(); return _inLibrary ? shared_from_this() : TypePointer();
} }

8
libsolidity/interface/ABI.cpp
View File

@ -107,9 +107,9 @@ Json::Value ABI::generate(ContractDefinition const& _contractDef)
for (auto const& p: it->parameters()) for (auto const& p: it->parameters())
{ {
auto type = p->annotation().type->interfaceType(false); auto type = p->annotation().type->interfaceType(false);
solAssert(type, ""); solAssert(type.get(), "");
Json::Value input; Json::Value input;
auto param = formatType(p->name(), *type, false); auto param = formatType(p->name(), *type.get(), false);
param["indexed"] = p->isIndexed(); param["indexed"] = p->isIndexed();
params.append(param); params.append(param);
} }
@ -173,8 +173,8 @@ Json::Value ABI::formatType(string const& _name, Type const& _type, bool _forLib
{ {
solAssert(member.type, ""); solAssert(member.type, "");
auto t = member.type->interfaceType(_forLibrary); auto t = member.type->interfaceType(_forLibrary);
solAssert(t, ""); solAssert(t.get(), "");
ret["components"].append(formatType(member.name, *t, _forLibrary)); ret["components"].append(formatType(member.name, *t.get(), _forLibrary));
} }
} }
else else