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

Support parsing let statements without a value

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-05-05 16:46:26 +01:00
parent 2b33e0bcec
commit cee93d946d
5 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libsolidity/inlineasm/AsmAnalysis.cpp
View File

@ -174,14 +174,20 @@ bool AsmAnalyzer::operator()(assembly::Assignment const& _assignment)
bool AsmAnalyzer::operator()(assembly::VariableDeclaration const& _varDecl) bool AsmAnalyzer::operator()(assembly::VariableDeclaration const& _varDecl)
{ {
bool success = true;
int const expectedItems = _varDecl.variables.size(); int const expectedItems = _varDecl.variables.size();
int const stackHeight = m_stackHeight; if (_varDecl.value)
bool success = boost::apply_visitor(*this, *_varDecl.value);
if ((m_stackHeight - stackHeight) != expectedItems)
{ {
m_errorReporter.declarationError(_varDecl.location, "Variable count mismatch."); int const stackHeight = m_stackHeight;
return false; success = boost::apply_visitor(*this, *_varDecl.value);
if ((m_stackHeight - stackHeight) != expectedItems)
{
m_errorReporter.declarationError(_varDecl.location, "Variable count mismatch.");
return false;
}
} }
else
m_stackHeight += expectedItems;
for (auto const& variable: _varDecl.variables) for (auto const& variable: _varDecl.variables)
{ {

13
libsolidity/inlineasm/AsmParser.cpp
View File

@ -347,10 +347,15 @@ assembly::VariableDeclaration Parser::parseVariableDeclaration()
else else
break; break;
} }
expectToken(Token::Colon); if (currentToken() == Token::Colon)
expectToken(Token::Assign); {
varDecl.value.reset(new Statement(parseExpression())); expectToken(Token::Colon);
varDecl.location.end = locationOf(*varDecl.value).end; expectToken(Token::Assign);
varDecl.value.reset(new Statement(parseExpression()));
varDecl.location.end = locationOf(*varDecl.value).end;
}
else
varDecl.location.end = varDecl.variables.back().location.end;
return varDecl; return varDecl;
} }

7
libsolidity/inlineasm/AsmPrinter.cpp
View File

@ -128,8 +128,11 @@ string AsmPrinter::operator()(assembly::VariableDeclaration const& _variableDecl
), ),
", " ", "
); );
out += " := "; if (_variableDeclaration.value)
out += boost::apply_visitor(*this, *_variableDeclaration.value); {
out += " := ";
out += boost::apply_visitor(*this, *_variableDeclaration.value);
}
return out; return out;
} }

5
test/libjulia/Parser.cpp
View File

@ -131,6 +131,11 @@ BOOST_AUTO_TEST_CASE(vardecl_bool)
BOOST_CHECK(successParse("{ let x:bool := false:bool }")); BOOST_CHECK(successParse("{ let x:bool := false:bool }"));
} }
BOOST_AUTO_TEST_CASE(vardecl_empty)
{
BOOST_CHECK(successParse("{ let x }"));
}
BOOST_AUTO_TEST_CASE(assignment) BOOST_AUTO_TEST_CASE(assignment)
{ {
BOOST_CHECK(successParse("{ let x:u256 := 2:u256 let y:u256 := x }")); BOOST_CHECK(successParse("{ let x:u256 := 2:u256 let y:u256 := x }"));

5
test/libsolidity/InlineAssembly.cpp
View File

@ -195,6 +195,11 @@ BOOST_AUTO_TEST_CASE(vardecl_bool)
CHECK_PARSE_ERROR("{ let x := false }", ParserError, "True and false are not valid literals."); CHECK_PARSE_ERROR("{ let x := false }", ParserError, "True and false are not valid literals.");
} }
BOOST_AUTO_TEST_CASE(vardecl_empty)
{
BOOST_CHECK(successParse("{ let x }"));
}
BOOST_AUTO_TEST_CASE(assignment) BOOST_AUTO_TEST_CASE(assignment)
{ {
BOOST_CHECK(successParse("{ let x := 2 7 8 add =: x }")); BOOST_CHECK(successParse("{ let x := 2 7 8 add =: x }"));