mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Remove finney and szabo denominations.
This commit is contained in:
committed by
Leonardo Alt
parent
cf189a3285
commit
38c6ecbbe2
@@ -1,7 +1,7 @@
|
||||
contract C {
|
||||
uint constant a = 1 wei + 2 szabo + 3 finney + 4 ether;
|
||||
uint constant a = 1 wei + 4 ether;
|
||||
uint constant b = 1 seconds + 2 minutes + 3 hours + 4 days + 5 weeks;
|
||||
uint constant c = 2 szabo / 1 seconds + 3 finney * 3 hours;
|
||||
uint constant d = 2 gwei / 1 seconds + 3 finney * 3 hours;
|
||||
uint constant c = 2 ether / 1 seconds + 3 gwei * 3 hours;
|
||||
uint constant d = 2 gwei / 1 seconds + 3 minutes * 3 hours;
|
||||
}
|
||||
// ----
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
contract C {
|
||||
function f() {
|
||||
uint x = 1 finney;
|
||||
}
|
||||
}
|
||||
// ----
|
||||
// ParserError 2314: (45-51): Expected ';' but got identifier
|
||||
@@ -0,0 +1,6 @@
|
||||
contract C {
|
||||
function f(uint finney) public pure returns (uint szabo) {
|
||||
// These used to be denominations.
|
||||
szabo = finney;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
contract C {
|
||||
function f() {
|
||||
uint x = 1 szabo;
|
||||
}
|
||||
}
|
||||
// ----
|
||||
// ParserError 2314: (45-50): Expected ';' but got identifier
|
||||
+2
-6
@@ -2,15 +2,11 @@ contract C {
|
||||
function f() public
|
||||
{
|
||||
a = 1 wei;
|
||||
b = 2 szabo;
|
||||
c = 3 finney;
|
||||
d = 4 ether;
|
||||
e = 5 gwei;
|
||||
b = 2 ether;
|
||||
c = 3 gwei;
|
||||
}
|
||||
uint256 a;
|
||||
uint256 b;
|
||||
uint256 c;
|
||||
uint256 d;
|
||||
uint256 e;
|
||||
}
|
||||
// ----
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
contract c {
|
||||
constructor()
|
||||
{
|
||||
a = 1 wei * 100 wei + 7 szabo - 3;
|
||||
a = 1 wei * 100 wei + 7 gwei - 3;
|
||||
}
|
||||
uint256 a;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user