From 8d90e6fc4e76ccf41d8ccb59c23920623269cd06 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 12 Jul 2017 19:51:16 +0100 Subject: [PATCH] Rename expectedItems to numVariables --- libjulia/backends/evm/EVMCodeTransform.cpp | 6 +++--- libsolidity/inlineasm/AsmAnalysis.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libjulia/backends/evm/EVMCodeTransform.cpp b/libjulia/backends/evm/EVMCodeTransform.cpp index a4967dbd7..704aa3c10 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 d8aca7253..76b0bbd54 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) {