mirror of
				https://github.com/ethereum/solidity
				synced 2023-10-03 13:03:40 +00:00 
			
		
		
		
	Disallow enums in interfaces
This commit is contained in:
		
							parent
							
								
									16a91ef90a
								
							
						
					
					
						commit
						2c4bce2d62
					
				| @ -933,6 +933,7 @@ Interfaces are similar to abstract contracts, but they cannot have any functions | |||||||
| #. Cannot inherit other contracts or interfaces. | #. Cannot inherit other contracts or interfaces. | ||||||
| #. Cannot define variables. | #. Cannot define variables. | ||||||
| #. Cannot define structs. | #. Cannot define structs. | ||||||
|  | #. Cannot define enums. | ||||||
| 
 | 
 | ||||||
| Some of these restrictions might be lifted in the future. | Some of these restrictions might be lifted in the future. | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -517,6 +517,13 @@ bool TypeChecker::visit(VariableDeclaration const& _variable) | |||||||
| 	return false; | 	return false; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | bool TypeChecker::visit(EnumDefinition const& _enum) | ||||||
|  | { | ||||||
|  | 	if (m_scope->contractKind() == ContractDefinition::ContractKind::Interface) | ||||||
|  | 		typeError(_enum.location(), "Enumerable cannot be declared in interfaces."); | ||||||
|  | 	return false; | ||||||
|  | } | ||||||
|  | 
 | ||||||
| void TypeChecker::visitManually( | void TypeChecker::visitManually( | ||||||
| 	ModifierInvocation const& _modifier, | 	ModifierInvocation const& _modifier, | ||||||
| 	vector<ContractDefinition const*> const& _bases | 	vector<ContractDefinition const*> const& _bases | ||||||
|  | |||||||
| @ -83,6 +83,7 @@ private: | |||||||
| 	virtual bool visit(StructDefinition const& _struct) override; | 	virtual bool visit(StructDefinition const& _struct) override; | ||||||
| 	virtual bool visit(FunctionDefinition const& _function) override; | 	virtual bool visit(FunctionDefinition const& _function) override; | ||||||
| 	virtual bool visit(VariableDeclaration const& _variable) override; | 	virtual bool visit(VariableDeclaration const& _variable) override; | ||||||
|  | 	virtual bool visit(EnumDefinition const& _enum) override; | ||||||
| 	/// We need to do this manually because we want to pass the bases of the current contract in
 | 	/// We need to do this manually because we want to pass the bases of the current contract in
 | ||||||
| 	/// case this is a base constructor call.
 | 	/// case this is a base constructor call.
 | ||||||
| 	void visitManually(ModifierInvocation const& _modifier, std::vector<ContractDefinition const*> const& _bases); | 	void visitManually(ModifierInvocation const& _modifier, std::vector<ContractDefinition const*> const& _bases); | ||||||
|  | |||||||
| @ -5411,6 +5411,16 @@ BOOST_AUTO_TEST_CASE(interface_variables) | |||||||
| 	CHECK_ERROR(text, TypeError, "Variables cannot be declared in interfaces"); | 	CHECK_ERROR(text, TypeError, "Variables cannot be declared in interfaces"); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | BOOST_AUTO_TEST_CASE(interface_enums) | ||||||
|  | { | ||||||
|  | 	char const* text = R"( | ||||||
|  | 		interface I { | ||||||
|  | 			enum A { B, C } | ||||||
|  | 		} | ||||||
|  | 	)"; | ||||||
|  | 	CHECK_ERROR(text, TypeError, "Enumerable cannot be declared in interfaces"); | ||||||
|  | } | ||||||
|  | 
 | ||||||
| BOOST_AUTO_TEST_CASE(using_interface) | BOOST_AUTO_TEST_CASE(using_interface) | ||||||
| { | { | ||||||
| 	char const* text = R"( | 	char const* text = R"( | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user