aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHsuan Lee <boczeratul@gmail.com>2019-04-10 16:20:31 +0800
committerHsuan Lee <boczeratul@gmail.com>2019-04-10 16:20:31 +0800
commit30e8946044eefec37441c98ff1e7aef2326f887d (patch)
tree044d5466630259a4714532f15fb68b8d550d11ec
parent06badc6ca08a40e7c9e9e259d0e47dd495b47a54 (diff)
downloaddexon-solidity-30e8946044eefec37441c98ff1e7aef2326f887d.tar
dexon-solidity-30e8946044eefec37441c98ff1e7aef2326f887d.tar.gz
dexon-solidity-30e8946044eefec37441c98ff1e7aef2326f887d.tar.bz2
dexon-solidity-30e8946044eefec37441c98ff1e7aef2326f887d.tar.lz
dexon-solidity-30e8946044eefec37441c98ff1e7aef2326f887d.tar.xz
dexon-solidity-30e8946044eefec37441c98ff1e7aef2326f887d.tar.zst
dexon-solidity-30e8946044eefec37441c98ff1e7aef2326f887d.zip
Fix time constants
-rw-r--r--libsolidity/ast/Types.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index cc978b4a..c1b4652c 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -938,7 +938,6 @@ tuple<bool, rational> RationalNumberType::isValidLiteral(Literal const& _literal
{
case Literal::SubDenomination::None:
case Literal::SubDenomination::Wei:
- case Literal::SubDenomination::Second:
break;
case Literal::SubDenomination::Szabo:
value *= bigint("1000000000000");
@@ -949,20 +948,23 @@ tuple<bool, rational> RationalNumberType::isValidLiteral(Literal const& _literal
case Literal::SubDenomination::Ether:
value *= bigint("1000000000000000000");
break;
+ case Literal::SubDenomination::Second:
+ value *= bigint("1000");
+ break;
case Literal::SubDenomination::Minute:
- value *= bigint("60");
+ value *= bigint("60000");
break;
case Literal::SubDenomination::Hour:
- value *= bigint("3600");
+ value *= bigint("3600000");
break;
case Literal::SubDenomination::Day:
- value *= bigint("86400");
+ value *= bigint("86400000");
break;
case Literal::SubDenomination::Week:
- value *= bigint("604800");
+ value *= bigint("604800000");
break;
case Literal::SubDenomination::Year:
- value *= bigint("31536000");
+ value *= bigint("31536000000");
break;
}