cerc-io/solidity
15
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

Rename x to value

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-03-15 12:50:34 +00:00
parent a2b9f52ca4
commit dde87de4cf
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libsolidity/ast/Types.cpp
View File

@ -574,7 +574,7 @@ TypePointer FixedPointType::binaryOperatorResult(Token::Value _operator, TypePoi
tuple<bool, rational> RationalNumberType::isValidLiteral(Literal const& _literal) tuple<bool, rational> RationalNumberType::isValidLiteral(Literal const& _literal)
{ {
rational x; rational value;
try try
{ {
auto expPoint = find(_literal.value().begin(), _literal.value().end(), 'e'); auto expPoint = find(_literal.value().begin(), _literal.value().end(), 'e');
@ -585,7 +585,7 @@ tuple<bool, rational> RationalNumberType::isValidLiteral(Literal const& _literal
if (boost::starts_with(_literal.value(), "0x")) if (boost::starts_with(_literal.value(), "0x"))
{ {
// process as hex // process as hex
x = bigint(_literal.value()); value = bigint(_literal.value());
} }
else if (expPoint != _literal.value().end()) else if (expPoint != _literal.value().end())
{ {
@ -599,17 +599,18 @@ tuple<bool, rational> RationalNumberType::isValidLiteral(Literal const& _literal
if (exp > numeric_limits<int32_t>::max() || exp < numeric_limits<int32_t>::min()) if (exp > numeric_limits<int32_t>::max() || exp < numeric_limits<int32_t>::min())
return make_tuple(false, rational(0)); return make_tuple(false, rational(0));
x = bigint(string(_literal.value().begin(), expPoint)); value = bigint(string(_literal.value().begin(), expPoint));
if (exp < 0) if (exp < 0)
{ {
exp *= -1; exp *= -1;
x /= boost::multiprecision::pow( value /= boost::multiprecision::pow(
bigint(10), bigint(10),
exp.convert_to<int32_t>() exp.convert_to<int32_t>()
); );
} }
else else
x *= boost::multiprecision::pow( value *= boost::multiprecision::pow(
bigint(10), bigint(10),
exp.convert_to<int32_t>() exp.convert_to<int32_t>()
); );
@ -637,10 +638,10 @@ tuple<bool, rational> RationalNumberType::isValidLiteral(Literal const& _literal
distance(radixPoint + 1, _literal.value().end()) distance(radixPoint + 1, _literal.value().end())
); );
numerator = bigint(string(_literal.value().begin(), radixPoint)); numerator = bigint(string(_literal.value().begin(), radixPoint));
x = numerator + denominator; value = numerator + denominator;
} }
else else
x = bigint(_literal.value()); value = bigint(_literal.value());
} }
catch (...) catch (...)
{ {
@ -653,33 +654,33 @@ tuple<bool, rational> RationalNumberType::isValidLiteral(Literal const& _literal
case Literal::SubDenomination::Second: case Literal::SubDenomination::Second:
break; break;
case Literal::SubDenomination::Szabo: case Literal::SubDenomination::Szabo:
x *= bigint("1000000000000"); value *= bigint("1000000000000");
break; break;
case Literal::SubDenomination::Finney: case Literal::SubDenomination::Finney:
x *= bigint("1000000000000000"); value *= bigint("1000000000000000");
break; break;
case Literal::SubDenomination::Ether: case Literal::SubDenomination::Ether:
x *= bigint("1000000000000000000"); value *= bigint("1000000000000000000");
break; break;
case Literal::SubDenomination::Minute: case Literal::SubDenomination::Minute:
x *= bigint("60"); value *= bigint("60");
break; break;
case Literal::SubDenomination::Hour: case Literal::SubDenomination::Hour:
x *= bigint("3600"); value *= bigint("3600");
break; break;
case Literal::SubDenomination::Day: case Literal::SubDenomination::Day:
x *= bigint("86400"); value *= bigint("86400");
break; break;
case Literal::SubDenomination::Week: case Literal::SubDenomination::Week:
x *= bigint("604800"); value *= bigint("604800");
break; break;
case Literal::SubDenomination::Year: case Literal::SubDenomination::Year:
x *= bigint("31536000"); value *= bigint("31536000");
break; break;
} }
return make_tuple(true, x); return make_tuple(true, value);
} }
bool RationalNumberType::isImplicitlyConvertibleTo(Type const& _convertTo) const bool RationalNumberType::isImplicitlyConvertibleTo(Type const& _convertTo) const