Merge pull request #7684 from ethereum/add_while_style_rule

Add ``switch (..)` to style checker

liblangutil/Exceptions.cpp

@@ -29,7 +29,7 @@ using namespace langutil;
 Error::Error(Type _type, SourceLocation const& _location, string const& _description):
 	m_type(_type)
 {
-	switch(m_type)
+	switch (m_type)
 	{
 	case Type::DeclarationError:
 		m_typeName = "DeclarationError";

libsolidity/analysis/ControlFlowBuilder.cpp

@@ -49,7 +49,7 @@ bool ControlFlowBuilder::visit(BinaryOperation const& _operation)
 {
 	solAssert(!!m_currentNode, "");
 
-	switch(_operation.getOperator())
+	switch (_operation.getOperator())
 	{
 		case Token::Or:
 		case Token::And:

libsolidity/analysis/ReferencesResolver.cpp

@@ -126,7 +126,7 @@ bool ReferencesResolver::visit(ElementaryTypeName const& _typeName)
 		{
 			// for non-address types this was already caught by the parser
 			solAssert(_typeName.annotation().type->category() == Type::Category::Address, "");
-			switch(*_typeName.stateMutability())
+			switch (*_typeName.stateMutability())
 			{
 				case StateMutability::Payable:
 					_typeName.annotation().type = TypeProvider::payableAddress();

libsolidity/ast/AST.h

@@ -187,7 +187,7 @@ public:
 
 	static std::string visibilityToString(Declaration::Visibility _visibility)
 	{
-		switch(_visibility)
+		switch (_visibility)
 		{
 		case Declaration::Visibility::Public:
 			return "public";

libsolidity/ast/ASTEnums.h

@@ -36,7 +36,7 @@ enum class StateMutability { Pure, View, NonPayable, Payable };
 
 inline std::string stateMutabilityToString(StateMutability const& _stateMutability)
 {
-	switch(_stateMutability)
+	switch (_stateMutability)
 	{
 	case StateMutability::Pure:
 		return "pure";

libsolidity/ast/Types.cpp

@@ -658,7 +658,7 @@ BoolResult FixedPointType::isExplicitlyConvertibleTo(Type const& _convertTo) con
 
 TypeResult FixedPointType::unaryOperatorResult(Token _operator) const
 {
-	switch(_operator)
+	switch (_operator)
 	{
 	case Token::Delete:
 		// "delete" is ok for all fixed types
@@ -2846,7 +2846,7 @@ unsigned FunctionType::sizeOnStack() const
 
 	unsigned size = 0;
 
-	switch(kind)
+	switch (kind)
 	{
 	case Kind::External:
 	case Kind::DelegateCall:

libsolidity/parsing/Parser.cpp

@@ -241,7 +241,7 @@ ASTPointer<ImportDirective> Parser::parseImportDirective()
 ContractDefinition::ContractKind Parser::parseContractKind()
 {
 	ContractDefinition::ContractKind kind;
-	switch(m_scanner->currentToken())
+	switch (m_scanner->currentToken())
 	{
 	case Token::Interface:
 		kind = ContractDefinition::ContractKind::Interface;
@@ -388,7 +388,7 @@ StateMutability Parser::parseStateMutability()
 {
 	StateMutability stateMutability(StateMutability::NonPayable);
 	Token token = m_scanner->currentToken();
-	switch(token)
+	switch (token)
 	{
 		case Token::Payable:
 			stateMutability = StateMutability::Payable;

libyul/Utilities.cpp

@@ -113,7 +113,7 @@ u256 yul::valueOfBoolLiteral(Literal const& _literal)
 
 u256 yul::valueOfLiteral(Literal const& _literal)
 {
-	switch(_literal.kind)
+	switch (_literal.kind)
 	{
 		case LiteralKind::Number:
 			return valueOfNumberLiteral(_literal);

scripts/check_style.sh

@@ -17,7 +17,7 @@ fi
 
 FORMATERROR=$(
 (
-	git grep -nIE "\<(if|for|while)\(" -- '*.h' '*.cpp' # no space after "if", "for" or "while"
+	git grep -nIE "\<(if|for|while|switch)\(" -- '*.h' '*.cpp' # no space after "if", "for", "while" or "switch"
 	git grep -nIE "\<for\>\s*\([^=]*\>\s:\s.*\)" -- '*.h' '*.cpp' # no space before range based for-loop
 	git grep -nIE "\<if\>\s*\(.*\)\s*\{\s*$" -- '*.h' '*.cpp' # "{\n" on same line as "if" / "for"
 	git grep -nIE "[,\(<]\s*const " -- '*.h' '*.cpp' # const on left side of type