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

Better error messages for invalid switch cases

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-05-26 01:49:32 +01:00
parent c64bd33784
commit 05fcf1989c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsolidity/inlineasm/AsmParser.cpp
View File

@ -78,6 +78,10 @@ assembly::Statement Parser::parseStatement()
_switch.cases.emplace_back(parseCase()); _switch.cases.emplace_back(parseCase());
if (m_scanner->currentToken() == Token::Default) if (m_scanner->currentToken() == Token::Default)
_switch.cases.emplace_back(parseCase()); _switch.cases.emplace_back(parseCase());
if (m_scanner->currentToken() == Token::Default)
fatalParserError("Only one default case allowed.");
else if (m_scanner->currentToken() == Token::Case)
fatalParserError("Case not allowed after default case.");
if (_switch.cases.size() == 0) if (_switch.cases.size() == 0)
fatalParserError("Switch statement without any cases."); fatalParserError("Switch statement without any cases.");
_switch.location.end = _switch.cases.back().body.location.end; _switch.location.end = _switch.cases.back().body.location.end;

4
test/libsolidity/InlineAssembly.cpp
View File

@ -252,12 +252,12 @@ BOOST_AUTO_TEST_CASE(switch_invalid_expression)
BOOST_AUTO_TEST_CASE(switch_default_before_case) BOOST_AUTO_TEST_CASE(switch_default_before_case)
{ {
CHECK_PARSE_ERROR("{ switch 42 default {} case 1 {} }", ParserError, "Expected elementary inline assembly operation."); CHECK_PARSE_ERROR("{ switch 42 default {} case 1 {} }", ParserError, "Case not allowed after default case.");
} }
BOOST_AUTO_TEST_CASE(switch_duplicate_default_case) BOOST_AUTO_TEST_CASE(switch_duplicate_default_case)
{ {
CHECK_PARSE_ERROR("{ switch 42 default {} default {} }", ParserError, "Expected elementary inline assembly operation."); CHECK_PARSE_ERROR("{ switch 42 default {} default {} }", ParserError, "Only one default case allowed.");
} }
BOOST_AUTO_TEST_CASE(switch_invalid_case) BOOST_AUTO_TEST_CASE(switch_invalid_case)