Merge branch 'develop' into develop_060

This commit is contained in:
Daniel Kirchner
2019-11-12 10:32:41 +01:00
18 changed files with 35 additions and 55 deletions
+1 -1
View File
@@ -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:
+1 -1
View File
@@ -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();
+1 -1
View File
@@ -229,7 +229,7 @@ bool StaticAnalyzer::visit(MemberAccess const& _memberAccess)
if (m_constructor)
{
auto const* expr = &_memberAccess.expression();
while(expr)
while (expr)
{
if (auto id = dynamic_cast<Identifier const*>(expr))
{
+1 -1
View File
@@ -187,7 +187,7 @@ public:
static std::string visibilityToString(Declaration::Visibility _visibility)
{
switch(_visibility)
switch (_visibility)
{
case Declaration::Visibility::Public:
return "public";
+1 -1
View File
@@ -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";
+2 -2
View File
@@ -663,7 +663,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
@@ -2881,7 +2881,7 @@ unsigned FunctionType::sizeOnStack() const
unsigned size = 0;
switch(kind)
switch (kind)
{
case Kind::External:
case Kind::DelegateCall:
+2 -2
View File
@@ -254,7 +254,7 @@ std::pair<ContractDefinition::ContractKind, bool> Parser::parseContractKind()
abstract = true;
m_scanner->next();
}
switch(m_scanner->currentToken())
switch (m_scanner->currentToken())
{
case Token::Interface:
kind = ContractDefinition::ContractKind::Interface;
@@ -436,7 +436,7 @@ StateMutability Parser::parseStateMutability()
{
StateMutability stateMutability(StateMutability::NonPayable);
Token token = m_scanner->currentToken();
switch(token)
switch (token)
{
case Token::Payable:
stateMutability = StateMutability::Payable;