diff --git a/libsolidity/AST.cpp b/libsolidity/AST.cpp index 455dc44aa..50a67a8db 100644 --- a/libsolidity/AST.cpp +++ b/libsolidity/AST.cpp @@ -602,7 +602,7 @@ Literal::Literal(Location const& _location, Token::Value _token, if (Token::isEtherSubdenomination(_sub)) m_subDenomination = static_cast(_sub); else - m_subDenomination = Literal::SubDenomination::NONE; + m_subDenomination = Literal::SubDenomination::None; } void Literal::checkTypeRequirements() diff --git a/libsolidity/AST.h b/libsolidity/AST.h index 193e7310a..bced99f9a 100755 --- a/libsolidity/AST.h +++ b/libsolidity/AST.h @@ -1119,11 +1119,11 @@ class Literal: public PrimaryExpression public: enum class SubDenomination { - NONE = Token::ILLEGAL, - WEI = Token::SubWei, - SZABO = Token::SubSzabo, - FINNEY = Token::SubFinney, - ETHER = Token::SubEther + None = Token::ILLEGAL, + Wei = Token::SubWei, + Szabo = Token::SubSzabo, + Finney = Token::SubFinney, + Ether = Token::SubEther }; Literal(Location const& _location, Token::Value _token, ASTPointer const& _value, diff --git a/libsolidity/Types.cpp b/libsolidity/Types.cpp index a8b3add48..648cf9cb2 100644 --- a/libsolidity/Types.cpp +++ b/libsolidity/Types.cpp @@ -343,16 +343,16 @@ u256 IntegerConstantType::literalValue(Literal const* _literal) const Literal::SubDenomination sub =_literal->getSubDenomination(); switch(sub) { - case Literal::SubDenomination::WEI: - case Literal::SubDenomination::NONE: + case Literal::SubDenomination::Wei: + case Literal::SubDenomination::None: break; - case Literal::SubDenomination::SZABO: + case Literal::SubDenomination::Szabo: value *= u256(1000000000000); break; - case Literal::SubDenomination::FINNEY: + case Literal::SubDenomination::Finney: value *= u256(1000000000000000); break; - case Literal::SubDenomination::ETHER: + case Literal::SubDenomination::Ether: value *= u256(1000000000000000000); break; }