From 8df89c5d5b349bbf366eaf410b59a9c85c8832ad Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Tue, 8 Aug 2017 11:59:55 +0100 Subject: Disable unimplemented library functions instead --- libsolidity/analysis/TypeChecker.cpp | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'libsolidity') diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index fbdac1c7..6852c13d 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -518,6 +518,8 @@ bool TypeChecker::visit(FunctionDefinition const& _function) _function.body().accept(*this); else if (_function.isConstructor()) m_errorReporter.typeError(_function.location(), "Constructor must be implemented if declared."); + else if (isLibraryFunction && _function.visibility() <= FunctionDefinition::Visibility::Internal) + m_errorReporter.typeError(_function.location(), "Internal library function must be implemented if declared."); return false; } @@ -1403,21 +1405,6 @@ bool TypeChecker::visit(FunctionCall const& _functionCall) else _functionCall.annotation().type = make_shared(functionType->returnParameterTypes()); - // Internal library functions must be implemented, because of inlining rules. - if ( - functionType->kind() == FunctionType::Kind::Internal && - functionType->hasDeclaration() && - dynamic_cast(&functionType->declaration()) - ) - { - FunctionDefinition const* function = dynamic_cast(&functionType->declaration()); - bool isLibraryFunction = - dynamic_cast(function->scope()) && - dynamic_cast(function->scope())->isLibrary(); - if (!function->isImplemented() && isLibraryFunction) - m_errorReporter.typeError(_functionCall.location(), "Inlined library function is lacking implementation."); - } - TypePointers parameterTypes = functionType->parameterTypes(); if (!functionType->takesArbitraryParameters() && parameterTypes.size() != arguments.size()) { -- cgit v1.2.3