diff --git a/libsolidity/AST.cpp b/libsolidity/AST.cpp index e0ee5c098..2cb738d30 100644 --- a/libsolidity/AST.cpp +++ b/libsolidity/AST.cpp @@ -43,6 +43,9 @@ TypeError ASTNode::createTypeError(string const& _description) const void ContractDefinition::checkTypeRequirements() { + for (ASTPointer const& base: getBaseContracts()) + base->checkTypeRequirements(); + checkIllegalOverrides(); FunctionDefinition const* constructor = getConstructor(); @@ -123,6 +126,22 @@ vector, FunctionDefinition const*>> const& ContractDefinition: return *m_interfaceFunctionList; } +void InheritanceSpecifier::checkTypeRequirements() +{ + m_baseName->checkTypeRequirements(); + for (ASTPointer const& argument: m_arguments) + argument->checkTypeRequirements(); + + ContractDefinition const* base = dynamic_cast(m_baseName->getReferencedDeclaration()); + solAssert(base, "Base contract not available."); + TypePointers parameterTypes = ContractType(*base).getConstructorType()->getParameterTypes(); + if (parameterTypes.size() != m_arguments.size()) + BOOST_THROW_EXCEPTION(createTypeError("Wrong argument count for constructor call.")); + for (size_t i = 0; i < m_arguments.size(); ++i) + if (!m_arguments[i]->getType()->isImplicitlyConvertibleTo(*parameterTypes[i])) + BOOST_THROW_EXCEPTION(createTypeError("Invalid type for argument in constructer call.")); +} + void StructDefinition::checkMemberTypes() const { for (ASTPointer const& member: getMembers()) diff --git a/libsolidity/AST.h b/libsolidity/AST.h index 76bdaebc7..8079348cf 100755 --- a/libsolidity/AST.h +++ b/libsolidity/AST.h @@ -158,7 +158,7 @@ public: ContractDefinition(Location const& _location, ASTPointer const& _name, ASTPointer const& _documentation, - std::vector> const& _baseContracts, + std::vector> const& _baseContracts, std::vector> const& _definedStructs, std::vector> const& _stateVariables, std::vector> const& _definedFunctions): @@ -173,7 +173,7 @@ public: virtual void accept(ASTVisitor& _visitor) override; virtual void accept(ASTConstVisitor& _visitor) const override; - std::vector> const& getBaseContracts() const { return m_baseContracts; } + std::vector> const& getBaseContracts() const { return m_baseContracts; } std::vector> const& getDefinedStructs() const { return m_definedStructs; } std::vector> const& getStateVariables() const { return m_stateVariables; } std::vector> const& getDefinedFunctions() const { return m_definedFunctions; } @@ -203,7 +203,7 @@ private: std::vector, FunctionDefinition const*>> const& getInterfaceFunctionList() const; - std::vector> m_baseContracts; + std::vector> m_baseContracts; std::vector> m_definedStructs; std::vector> m_stateVariables; std::vector> m_definedFunctions; @@ -213,6 +213,26 @@ private: mutable std::unique_ptr, FunctionDefinition const*>>> m_interfaceFunctionList; }; +class InheritanceSpecifier: public ASTNode +{ +public: + InheritanceSpecifier(Location const& _location, ASTPointer const& _baseName, + std::vector> _arguments): + ASTNode(_location), m_baseName(_baseName), m_arguments(_arguments) {} + + virtual void accept(ASTVisitor& _visitor) override; + virtual void accept(ASTConstVisitor& _visitor) const override; + + ASTPointer const& getName() const { return m_baseName; } + std::vector> const& getArguments() const { return m_arguments; } + + void checkTypeRequirements(); + +private: + ASTPointer m_baseName; + std::vector> m_arguments; +}; + class StructDefinition: public Declaration { public: diff --git a/libsolidity/ASTForward.h b/libsolidity/ASTForward.h index c960fc8f0..da0a88122 100644 --- a/libsolidity/ASTForward.h +++ b/libsolidity/ASTForward.h @@ -38,6 +38,7 @@ class SourceUnit; class ImportDirective; class Declaration; class ContractDefinition; +class InheritanceSpecifier; class StructDefinition; class ParameterList; class FunctionDefinition; diff --git a/libsolidity/AST_accept.h b/libsolidity/AST_accept.h index 7f3db85a1..b77cfe1c6 100644 --- a/libsolidity/AST_accept.h +++ b/libsolidity/AST_accept.h @@ -61,6 +61,7 @@ void ContractDefinition::accept(ASTVisitor& _visitor) { if (_visitor.visit(*this)) { + listAccept(m_baseContracts, _visitor); listAccept(m_definedStructs, _visitor); listAccept(m_stateVariables, _visitor); listAccept(m_definedFunctions, _visitor); @@ -72,6 +73,7 @@ void ContractDefinition::accept(ASTConstVisitor& _visitor) const { if (_visitor.visit(*this)) { + listAccept(m_baseContracts, _visitor); listAccept(m_definedStructs, _visitor); listAccept(m_stateVariables, _visitor); listAccept(m_definedFunctions, _visitor); @@ -79,6 +81,26 @@ void ContractDefinition::accept(ASTConstVisitor& _visitor) const _visitor.endVisit(*this); } +void InheritanceSpecifier::accept(ASTVisitor& _visitor) +{ + if (_visitor.visit(*this)) + { + m_baseName->accept(_visitor); + listAccept(m_arguments, _visitor); + } + _visitor.endVisit(*this); +} + +void InheritanceSpecifier::accept(ASTConstVisitor& _visitor) const +{ + if (_visitor.visit(*this)) + { + m_baseName->accept(_visitor); + listAccept(m_arguments, _visitor); + } + _visitor.endVisit(*this); +} + void StructDefinition::accept(ASTVisitor& _visitor) { if (_visitor.visit(*this)) diff --git a/libsolidity/NameAndTypeResolver.cpp b/libsolidity/NameAndTypeResolver.cpp index f208dc787..7df51566a 100644 --- a/libsolidity/NameAndTypeResolver.cpp +++ b/libsolidity/NameAndTypeResolver.cpp @@ -48,7 +48,7 @@ void NameAndTypeResolver::resolveNamesAndTypes(ContractDefinition& _contract) { m_currentScope = &m_scopes[nullptr]; - for (ASTPointer const& baseContract: _contract.getBaseContracts()) + for (ASTPointer const& baseContract: _contract.getBaseContracts()) ReferencesResolver resolver(*baseContract, *this, &_contract, nullptr); m_currentScope = &m_scopes[&_contract]; @@ -113,18 +113,19 @@ void NameAndTypeResolver::linearizeBaseContracts(ContractDefinition& _contract) // order in the lists is from derived to base // list of lists to linearize, the last element is the list of direct bases list> input(1, {&_contract}); - for (ASTPointer const& baseIdentifier: _contract.getBaseContracts()) + for (ASTPointer const& baseSpecifier: _contract.getBaseContracts()) { + ASTPointer baseName = baseSpecifier->getName(); ContractDefinition const* base = dynamic_cast( - baseIdentifier->getReferencedDeclaration()); + baseName->getReferencedDeclaration()); if (!base) - BOOST_THROW_EXCEPTION(baseIdentifier->createTypeError("Contract expected.")); + BOOST_THROW_EXCEPTION(baseName->createTypeError("Contract expected.")); // "push_back" has the effect that bases mentioned earlier can overwrite members of bases // mentioned later input.back().push_back(base); vector const& basesBases = base->getLinearizedBaseContracts(); if (basesBases.empty()) - BOOST_THROW_EXCEPTION(baseIdentifier->createTypeError("Definition of base has to precede definition of derived contract")); + BOOST_THROW_EXCEPTION(baseName->createTypeError("Definition of base has to precede definition of derived contract")); input.push_front(list(basesBases.begin(), basesBases.end())); } vector result = cThreeMerge(input); diff --git a/libsolidity/Parser.cpp b/libsolidity/Parser.cpp index 26fc2018e..c0ca1abb2 100644 --- a/libsolidity/Parser.cpp +++ b/libsolidity/Parser.cpp @@ -117,7 +117,7 @@ ASTPointer Parser::parseContractDefinition() docstring = make_shared(m_scanner->getCurrentCommentLiteral()); expectToken(Token::CONTRACT); ASTPointer name = expectIdentifierToken(); - vector> baseContracts; + vector> baseContracts; vector> structs; vector> stateVariables; vector> functions; @@ -125,7 +125,7 @@ ASTPointer Parser::parseContractDefinition() do { m_scanner->next(); - baseContracts.push_back(ASTNodeFactory(*this).createNode(expectIdentifierToken())); + baseContracts.push_back(parseInheritanceSpecifier()); } while (m_scanner->getCurrentToken() == Token::COMMA); expectToken(Token::LBRACE); @@ -161,6 +161,23 @@ ASTPointer Parser::parseContractDefinition() stateVariables, functions); } +ASTPointer Parser::parseInheritanceSpecifier() +{ + ASTNodeFactory nodeFactory(*this); + ASTPointer name = ASTNodeFactory(*this).createNode(expectIdentifierToken()); + vector> arguments; + if (m_scanner->getCurrentToken() == Token::LPAREN) + { + m_scanner->next(); + arguments = parseFunctionCallArguments(); + nodeFactory.markEndPosition(); + expectToken(Token::RPAREN); + } + else + nodeFactory.setEndPositionFromNode(name); + return nodeFactory.createNode(name, arguments); +} + ASTPointer Parser::parseFunctionDefinition(bool _isPublic) { ASTNodeFactory nodeFactory(*this); diff --git a/libsolidity/Parser.h b/libsolidity/Parser.h index bf3a6beac..1b7a980ff 100644 --- a/libsolidity/Parser.h +++ b/libsolidity/Parser.h @@ -49,6 +49,7 @@ private: ///@name Parsing functions for the AST nodes ASTPointer parseImportDirective(); ASTPointer parseContractDefinition(); + ASTPointer parseInheritanceSpecifier(); ASTPointer parseFunctionDefinition(bool _isPublic); ASTPointer parseStructDefinition(); ASTPointer parseVariableDeclaration(bool _allowVar); diff --git a/libsolidity/grammar.txt b/libsolidity/grammar.txt index f06d4def2..11d99854c 100644 --- a/libsolidity/grammar.txt +++ b/libsolidity/grammar.txt @@ -1,7 +1,10 @@ -ContractDefinition = 'contract' Identifier '{' ContractPart* '}' +ContractDefinition = 'contract' Identifier + ( 'is' InheritanceSpecifier (',' InheritanceSpecifier )* )? + '{' ContractPart* '}' ContractPart = VariableDeclaration ';' | StructDefinition | FunctionDefinition | 'public:' | 'private:' +InheritanceSpecifier = Identifier ( '(' Expression ( ',' Expression )* ')' )? StructDefinition = 'struct' Identifier '{' ( VariableDeclaration (';' VariableDeclaration)* )? '} diff --git a/test/SolidityParser.cpp b/test/SolidityParser.cpp index f18c530b5..91e571306 100644 --- a/test/SolidityParser.cpp +++ b/test/SolidityParser.cpp @@ -525,6 +525,21 @@ BOOST_AUTO_TEST_CASE(contract_multiple_inheritance) BOOST_CHECK_NO_THROW(parseText(text)); } +BOOST_AUTO_TEST_CASE(contract_multiple_inheritance_with_arguments) +{ + char const* text = "contract base {\n" + " function fun() {\n" + " uint64(2);\n" + " }\n" + "}\n" + "contract derived is base(2), nonExisting(\"abc\", \"def\", base.fun()) {\n" + " function fun() {\n" + " uint64(2);\n" + " }\n" + "}\n"; + BOOST_CHECK_NO_THROW(parseText(text)); +} + BOOST_AUTO_TEST_SUITE_END() }