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

Allow "byte" in inline assembly.

Browse Source
This commit is contained in:
chriseth 2016-04-05 14:57:40 +02:00
parent 12797ed6c9
commit 26a91109a7
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsolidity/inlineasm/AsmParser.cpp
View File

@ -73,6 +73,7 @@ assembly::Statement Parser::parseStatement()
return assembly::Assignment{assembly::Identifier{name}}; return assembly::Assignment{assembly::Identifier{name}};
} }
case Token::Return: // opcode case Token::Return: // opcode
case Token::Byte: // opcode
default: default:
break; break;
} }
@ -143,10 +144,13 @@ assembly::Statement Parser::parseElementaryOperation(bool _onlySinglePusher)
{ {
case Token::Identifier: case Token::Identifier:
case Token::Return: case Token::Return:
case Token::Byte:
{ {
string literal; string literal;
if (m_scanner->currentToken() == Token::Return) if (m_scanner->currentToken() == Token::Return)
literal = "return"; literal = "return";
else if (m_scanner->currentToken() == Token::Byte)
literal = "byte";
else else
literal = m_scanner->currentLiteral(); literal = m_scanner->currentLiteral();
// first search the set of instructions. // first search the set of instructions.

5
test/libsolidity/InlineAssembly.cpp
View File

@ -88,6 +88,11 @@ BOOST_AUTO_TEST_CASE(simple_instructions)
BOOST_CHECK(successParse("{ dup1 dup1 mul dup1 sub }")); BOOST_CHECK(successParse("{ dup1 dup1 mul dup1 sub }"));
} }
BOOST_AUTO_TEST_CASE(keywords)
{
BOOST_CHECK(successParse("{ byte return }"));
}
BOOST_AUTO_TEST_CASE(constants) BOOST_AUTO_TEST_CASE(constants)
{ {
BOOST_CHECK(successParse("{ 7 8 mul }")); BOOST_CHECK(successParse("{ 7 8 mul }"));