cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tests and fixes for ether subdenominations

Browse Source
This commit is contained in:
Lefteris Karapetsas 2015-02-05 13:48:02 +01:00
parent 426f9a2860
commit eaadc71b4c
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Parser.cpp
View File

@ -694,10 +694,10 @@ ASTPointer<Expression> Parser::parsePrimaryExpression()
case Token::NUMBER: case Token::NUMBER:
nextToken = m_scanner->peekNextToken(); nextToken = m_scanner->peekNextToken();
case Token::STRING_LITERAL: case Token::STRING_LITERAL:
if (Token::isEtherSubdenomination(nextToken))
m_scanner->next();
nodeFactory.markEndPosition(); nodeFactory.markEndPosition();
expression = nodeFactory.createNode<Literal>(token, getLiteralAndAdvance(), nextToken); expression = nodeFactory.createNode<Literal>(token, getLiteralAndAdvance(), nextToken);
if (Token::isEtherSubdenomination(nextToken))
m_scanner->next();
break; break;
case Token::IDENTIFIER: case Token::IDENTIFIER:
nodeFactory.markEndPosition(); nodeFactory.markEndPosition();

31
Types.cpp
View File

@ -328,31 +328,32 @@ string IntegerConstantType::toString() const
u256 IntegerConstantType::literalValue(Literal const* _literal) const u256 IntegerConstantType::literalValue(Literal const* _literal) const
{ {
Literal::ethSubDenomination sub =_literal->getSubDenomination();
u256 value; u256 value;
// we ignore the literal and hope that the type was correctly determined // we ignore the literal and hope that the type was correctly determined
solAssert(m_value <= u256(-1), "Integer constant too large."); solAssert(m_value <= u256(-1), "Integer constant too large.");
solAssert(m_value >= -(bigint(1) << 255), "Integer constant too small."); solAssert(m_value >= -(bigint(1) << 255), "Integer constant too small.");
if (m_value >= 0) if (m_value >= 0)
value = u256(m_value); value = u256(m_value);
else else
value = s2u(s256(m_value)); value = s2u(s256(m_value));
switch(sub) { if (_literal) {
case Literal::ethSubDenomination::WEI: Literal::ethSubDenomination sub =_literal->getSubDenomination();
case Literal::ethSubDenomination::NONE: switch(sub) {
break; case Literal::ethSubDenomination::WEI:
case Literal::ethSubDenomination::SZABO: case Literal::ethSubDenomination::NONE:
value *= u256(1000000000000); break;
break; case Literal::ethSubDenomination::SZABO:
case Literal::ethSubDenomination::FINNEY: value *= u256(1000000000000);
value *= u256(1000000000000000); break;
break; case Literal::ethSubDenomination::FINNEY:
case Literal::ethSubDenomination::ETHER: value *= u256(1000000000000000);
value *= u256(1000000000000000000); break;
break; case Literal::ethSubDenomination::ETHER:
value *= u256(1000000000000000000);
break;
}
} }
return value; return value;