aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2016-09-01 04:34:44 +0800
committerGitHub <noreply@github.com>2016-09-01 04:34:44 +0800
commit18abafe029a2eb4628136f7a944c80265da3ece4 (patch)
tree010c8a38e9541bf0d0bf5a3e29ae046931267402 /test
parent58dbd162ab369e9dd69af0b2a45a386527ed7b58 (diff)
parenta8c5d2bbde73e13dc2fc2e002bab0bd39536f162 (diff)
downloaddexon-solidity-18abafe029a2eb4628136f7a944c80265da3ece4.tar
dexon-solidity-18abafe029a2eb4628136f7a944c80265da3ece4.tar.gz
dexon-solidity-18abafe029a2eb4628136f7a944c80265da3ece4.tar.bz2
dexon-solidity-18abafe029a2eb4628136f7a944c80265da3ece4.tar.lz
dexon-solidity-18abafe029a2eb4628136f7a944c80265da3ece4.tar.xz
dexon-solidity-18abafe029a2eb4628136f7a944c80265da3ece4.tar.zst
dexon-solidity-18abafe029a2eb4628136f7a944c80265da3ece4.zip
Merge pull request #960 from Denton-L/change-else-style
Change else style
Diffstat (limited to 'test')
-rw-r--r--test/contracts/AuctionRegistrar.cpp8
-rw-r--r--test/libsolidity/SolidityEndToEndTest.cpp3
-rw-r--r--test/libsolidity/SolidityParser.cpp2
3 files changed, 5 insertions, 8 deletions
diff --git a/test/contracts/AuctionRegistrar.cpp b/test/contracts/AuctionRegistrar.cpp
index 3b1d1165..6eba2706 100644
--- a/test/contracts/AuctionRegistrar.cpp
+++ b/test/contracts/AuctionRegistrar.cpp
@@ -130,9 +130,7 @@ contract GlobalRegistrar is Registrar, AuctionSystem {
if (previousOwner != 0) {
if (!record.owner.send(auction.sumOfBids - auction.highestBid / 100))
throw;
- }
- else
- {
+ } else {
if (!auction.highestBidder.send(auction.highestBid - auction.secondHighestBid))
throw;
}
@@ -147,9 +145,7 @@ contract GlobalRegistrar is Registrar, AuctionSystem {
if (now < m_toRecord[_name].renewalDate)
throw;
bid(_name, msg.sender, msg.value);
- }
- else
- {
+ } else {
Record record = m_toRecord[_name];
if (record.owner != 0)
throw;
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index a370aafa..35b7078d 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -2563,8 +2563,9 @@ BOOST_AUTO_TEST_CASE(event)
if (_manually) {
bytes32 s = 0x19dacbf83c5de6658e14cbf7bcae5c15eca2eedecf1c66fbca928e4d351bea0f;
log3(bytes32(msg.value), s, bytes32(msg.sender), _id);
- } else
+ } else {
Deposit(msg.sender, _id, msg.value);
+ }
}
}
)";
diff --git a/test/libsolidity/SolidityParser.cpp b/test/libsolidity/SolidityParser.cpp
index 909d18c9..92f5a142 100644
--- a/test/libsolidity/SolidityParser.cpp
+++ b/test/libsolidity/SolidityParser.cpp
@@ -540,7 +540,7 @@ BOOST_AUTO_TEST_CASE(if_statement)
{
char const* text = "contract test {\n"
" function fun(uint256 a) {\n"
- " if (a >= 8) return 2; else { var b = 7; }\n"
+ " if (a >= 8) { return 2; } else { var b = 7; }\n"
" }\n"
"}\n";
BOOST_CHECK(successParse(text));