aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2017-07-13 02:51:16 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2017-07-13 21:18:40 +0800
commit8d90e6fc4e76ccf41d8ccb59c23920623269cd06 (patch)
treece93451d2306dba53191a58b1f279b825ca19f38
parentee3a2c0599d3d5db65ab4b7de61e495ad2acd71c (diff)
downloaddexon-solidity-8d90e6fc4e76ccf41d8ccb59c23920623269cd06.tar
dexon-solidity-8d90e6fc4e76ccf41d8ccb59c23920623269cd06.tar.gz
dexon-solidity-8d90e6fc4e76ccf41d8ccb59c23920623269cd06.tar.bz2
dexon-solidity-8d90e6fc4e76ccf41d8ccb59c23920623269cd06.tar.lz
dexon-solidity-8d90e6fc4e76ccf41d8ccb59c23920623269cd06.tar.xz
dexon-solidity-8d90e6fc4e76ccf41d8ccb59c23920623269cd06.tar.zst
dexon-solidity-8d90e6fc4e76ccf41d8ccb59c23920623269cd06.zip
Rename expectedItems to numVariables
-rw-r--r--libjulia/backends/evm/EVMCodeTransform.cpp6
-rw-r--r--libsolidity/inlineasm/AsmAnalysis.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/libjulia/backends/evm/EVMCodeTransform.cpp b/libjulia/backends/evm/EVMCodeTransform.cpp
index a4967dbd..704aa3c1 100644
--- a/libjulia/backends/evm/EVMCodeTransform.cpp
+++ b/libjulia/backends/evm/EVMCodeTransform.cpp
@@ -37,16 +37,16 @@ void CodeTransform::operator()(VariableDeclaration const& _varDecl)
{
solAssert(m_scope, "");
- int const expectedItems = _varDecl.variables.size();
+ int const numVariables = _varDecl.variables.size();
int height = m_assembly.stackHeight();
if (_varDecl.value)
{
boost::apply_visitor(*this, *_varDecl.value);
- expectDeposit(expectedItems, height);
+ expectDeposit(numVariables, height);
}
else
{
- int variablesLeft = expectedItems;
+ int variablesLeft = numVariables;
while (variablesLeft--)
m_assembly.appendConstant(u256(0));
}
diff --git a/libsolidity/inlineasm/AsmAnalysis.cpp b/libsolidity/inlineasm/AsmAnalysis.cpp
index d8aca725..76b0bbd5 100644
--- a/libsolidity/inlineasm/AsmAnalysis.cpp
+++ b/libsolidity/inlineasm/AsmAnalysis.cpp
@@ -175,19 +175,19 @@ bool AsmAnalyzer::operator()(assembly::Assignment const& _assignment)
bool AsmAnalyzer::operator()(assembly::VariableDeclaration const& _varDecl)
{
bool success = true;
- int const expectedItems = _varDecl.variables.size();
+ int const numVariables = _varDecl.variables.size();
if (_varDecl.value)
{
int const stackHeight = m_stackHeight;
success = boost::apply_visitor(*this, *_varDecl.value);
- if ((m_stackHeight - stackHeight) != expectedItems)
+ if ((m_stackHeight - stackHeight) != numVariables)
{
m_errorReporter.declarationError(_varDecl.location, "Variable count mismatch.");
return false;
}
}
else
- m_stackHeight += expectedItems;
+ m_stackHeight += numVariables;
for (auto const& variable: _varDecl.variables)
{