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

Moved test.

Browse Source
This commit is contained in:
chriseth 2017-01-25 17:24:43 +01:00
parent 8e318181e9
commit 27ba665694
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/inlineasm/AsmParser.cpp
View File

@ -215,7 +215,7 @@ assembly::VariableDeclaration Parser::parseVariableDeclaration()
expectToken(Token::Let); expectToken(Token::Let);
varDecl.name = m_scanner->currentLiteral(); varDecl.name = m_scanner->currentLiteral();
if (s_instructions.count(varDecl.name)) if (s_instructions.count(varDecl.name))
fatalParserError("Cannot shadow instructions with variable declaration."); fatalParserError("Cannot use instruction names for identifier names.");
expectToken(Token::Identifier); expectToken(Token::Identifier);
expectToken(Token::Colon); expectToken(Token::Colon);
expectToken(Token::Assign); expectToken(Token::Assign);

6
test/libsolidity/InlineAssembly.cpp
View File

@ -182,6 +182,12 @@ BOOST_AUTO_TEST_CASE(error_tag)
BOOST_CHECK(successAssemble("{ invalidJumpLabel }")); BOOST_CHECK(successAssemble("{ invalidJumpLabel }"));
} }
BOOST_AUTO_TEST_CASE(inline_assembly_shadowed_instruction)
{
// Error message: "Cannot use instruction names for identifier names."
BOOST_CHECK(!successAssemble("{ let gas := 1 }"));
}
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()
} }

14
test/libsolidity/SolidityParser.cpp
View File

@ -1479,20 +1479,6 @@ BOOST_AUTO_TEST_CASE(function_type_state_variable)
BOOST_CHECK(successParse(text)); BOOST_CHECK(successParse(text));
} }
BOOST_AUTO_TEST_CASE(inline_assembly_shadowed_instruction)
{
char const* text = R"(
contract A {
function f() {
assembly {
let gas := 1
}
}
}
)";
CHECK_PARSE_ERROR(text, "Cannot shadow instructions with variable declaration.");
}
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()
} }