diff options
author | chriseth <chris@ethereum.org> | 2018-12-11 02:22:02 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-11 02:22:02 +0800 |
commit | baaefb4b422fb22a89af08b79e6595e7859d2323 (patch) | |
tree | 1a04773f8ac16ee5722446009da4494bf3a10ebb /libsolidity/ast/ASTJsonConverter.cpp | |
parent | 5355380f80eeb9fac49dd28a32b08ba88e662c87 (diff) | |
parent | cb935fe9086b60295f97c5b8a5fd0ea8245d145e (diff) | |
download | dexon-solidity-baaefb4b422fb22a89af08b79e6595e7859d2323.tar dexon-solidity-baaefb4b422fb22a89af08b79e6595e7859d2323.tar.gz dexon-solidity-baaefb4b422fb22a89af08b79e6595e7859d2323.tar.bz2 dexon-solidity-baaefb4b422fb22a89af08b79e6595e7859d2323.tar.lz dexon-solidity-baaefb4b422fb22a89af08b79e6595e7859d2323.tar.xz dexon-solidity-baaefb4b422fb22a89af08b79e6595e7859d2323.tar.zst dexon-solidity-baaefb4b422fb22a89af08b79e6595e7859d2323.zip |
Merge pull request #5619 from ethereum/cleanup-abc
Some code cleanup
Diffstat (limited to 'libsolidity/ast/ASTJsonConverter.cpp')
-rw-r--r-- | libsolidity/ast/ASTJsonConverter.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libsolidity/ast/ASTJsonConverter.cpp b/libsolidity/ast/ASTJsonConverter.cpp index e92134a8..1a2b3345 100644 --- a/libsolidity/ast/ASTJsonConverter.cpp +++ b/libsolidity/ast/ASTJsonConverter.cpp @@ -234,7 +234,7 @@ bool ASTJsonConverter::visit(ImportDirective const& _node) make_pair(m_legacy ? "SourceUnit" : "sourceUnit", nodeId(*_node.annotation().sourceUnit)), make_pair("scope", idOrNull(_node.scope())) }; - attributes.push_back(make_pair("unitAlias", _node.name())); + attributes.emplace_back("unitAlias", _node.name()); Json::Value symbolAliases(Json::arrayValue); for (auto const& symbolAlias: _node.symbolAliases()) { @@ -244,7 +244,7 @@ bool ASTJsonConverter::visit(ImportDirective const& _node) tuple["local"] = symbolAlias.second ? Json::Value(*symbolAlias.second) : Json::nullValue; symbolAliases.append(tuple); } - attributes.push_back(make_pair("symbolAliases", std::move(symbolAliases))); + attributes.emplace_back("symbolAliases", std::move(symbolAliases)); setJsonNode(_node, "ImportDirective", std::move(attributes)); return false; } @@ -357,7 +357,7 @@ bool ASTJsonConverter::visit(VariableDeclaration const& _node) make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true)) }; if (m_inEvent) - attributes.push_back(make_pair("indexed", _node.isIndexed())); + attributes.emplace_back("indexed", _node.isIndexed()); setJsonNode(_node, "VariableDeclaration", std::move(attributes)); return false; } @@ -647,11 +647,11 @@ bool ASTJsonConverter::visit(FunctionCall const& _node) }; if (m_legacy) { - attributes.push_back(make_pair("isStructConstructorCall", _node.annotation().kind == FunctionCallKind::StructConstructorCall)); - attributes.push_back(make_pair("type_conversion", _node.annotation().kind == FunctionCallKind::TypeConversion)); + attributes.emplace_back("isStructConstructorCall", _node.annotation().kind == FunctionCallKind::StructConstructorCall); + attributes.emplace_back("type_conversion", _node.annotation().kind == FunctionCallKind::TypeConversion); } else - attributes.push_back(make_pair("kind", functionCallKind(_node.annotation().kind))); + attributes.emplace_back("kind", functionCallKind(_node.annotation().kind)); appendExpressionAttributes(attributes, _node.annotation()); setJsonNode(_node, "FunctionCall", std::move(attributes)); return false; |