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

Coding style.

Browse Source
This commit is contained in:
chriseth 2018-07-10 22:20:10 +02:00
parent 1505e28b56
commit 458a4c8aa5
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libsolidity/analysis/TypeChecker.cpp
View File

@ -1052,48 +1052,46 @@ void TypeChecker::endVisit(EmitStatement const& _emit)
m_insideEmitStatement = false; m_insideEmitStatement = false;
} }
namespace
{
/** /**
* Creates a tuple declaration syntax from a vector of variable declarations. * @returns a suggested left-hand-side of a multi-variable declaration contairing
* * the variable declarations given in @a _decls.
* @param decls a tuple of variables
*
* @returns a Solidity language confirming string of a tuple variable declaration.
*/ */
static string createTupleDecl(vector<VariableDeclaration const*> const & decls) string createTupleDecl(vector<VariableDeclaration const*> const& _decls)
{ {
vector<string> components; vector<string> components;
for (VariableDeclaration const* decl : decls) for (VariableDeclaration const* decl: _decls)
if (decl) if (decl)
components.emplace_back(decl->annotation().type->toString(false) + " " + decl->name()); components.emplace_back(decl->annotation().type->toString(false) + " " + decl->name());
else else
components.emplace_back(); components.emplace_back();
if (decls.size() == 1) if (_decls.size() == 1)
return components.front(); return components.front();
else else
return "(" + boost::algorithm::join(components, ", ") + ")"; return "(" + boost::algorithm::join(components, ", ") + ")";
} }
static bool typeCanBeExpressed(vector<VariableDeclaration const*> const & decls) bool typeCanBeExpressed(vector<VariableDeclaration const*> const& decls)
{ {
for (VariableDeclaration const* decl : decls) for (VariableDeclaration const* decl: decls)
{ {
// skip empty tuples (they can be expressed of course) // skip empty tuples (they can be expressed of course)
if (!decl) if (!decl)
continue; continue;
if (auto functionType = dynamic_cast<FunctionType const*>(decl->annotation().type.get())) if (auto functionType = dynamic_cast<FunctionType const*>(decl->annotation().type.get()))
{
if ( if (
functionType->kind() != FunctionType::Kind::Internal && functionType->kind() != FunctionType::Kind::Internal &&
functionType->kind() != FunctionType::Kind::External functionType->kind() != FunctionType::Kind::External
) )
return false; return false;
}
} }
return true; return true;
} }
}
bool TypeChecker::visit(VariableDeclarationStatement const& _statement) bool TypeChecker::visit(VariableDeclarationStatement const& _statement)
{ {
@ -1302,20 +1300,17 @@ bool TypeChecker::visit(VariableDeclarationStatement const& _statement)
if (autoTypeDeductionNeeded) if (autoTypeDeductionNeeded)
{ {
if (!typeCanBeExpressed(assignments)) if (!typeCanBeExpressed(assignments))
{ m_errorReporter.syntaxError(
m_errorReporter.syntaxError(_statement.location(), _statement.location(),
"Use of the \"var\" keyword is disallowed. " "Use of the \"var\" keyword is disallowed. "
"Type cannot be expressed in syntax."); "Type cannot be expressed in syntax."
} );
else else
{ m_errorReporter.syntaxError(
// report with trivial snipped `uint i = ...` _statement.location(),
string const typeName = createTupleDecl(assignments);
m_errorReporter.syntaxError(_statement.location(),
"Use of the \"var\" keyword is disallowed. " "Use of the \"var\" keyword is disallowed. "
"Use explicit declaration `" + typeName + " = ...´ instead."); "Use explicit declaration `" + createTupleDecl(assignments) + " = ...´ instead."
} );
} }
return false; return false;