diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-09-20 15:41:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-20 15:41:44 +0800 |
| commit | d6bc0a0631897f893c06dcc9382bf29f23db6b26 (patch) | |
| tree | bd4fba85b391e7005d2c69e88b7a25b5ab37c700 /libsolidity/ast/ASTJsonConverter.h | |
| parent | 137b214be471dd690aeadaf0e02b9ad0915d9e84 (diff) | |
| parent | f958463416e88a769d0904ca3da48dac8a9c1c5a (diff) | |
| download | dexon-solidity-d6bc0a0631897f893c06dcc9382bf29f23db6b26.tar dexon-solidity-d6bc0a0631897f893c06dcc9382bf29f23db6b26.tar.gz dexon-solidity-d6bc0a0631897f893c06dcc9382bf29f23db6b26.tar.bz2 dexon-solidity-d6bc0a0631897f893c06dcc9382bf29f23db6b26.tar.lz dexon-solidity-d6bc0a0631897f893c06dcc9382bf29f23db6b26.tar.xz dexon-solidity-d6bc0a0631897f893c06dcc9382bf29f23db6b26.tar.zst dexon-solidity-d6bc0a0631897f893c06dcc9382bf29f23db6b26.zip | |
Merge pull request #2929 from ethereum/cppcheck
Another set of improvements found by cppcheck
Diffstat (limited to 'libsolidity/ast/ASTJsonConverter.h')
| -rw-r--r-- | libsolidity/ast/ASTJsonConverter.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libsolidity/ast/ASTJsonConverter.h b/libsolidity/ast/ASTJsonConverter.h index 60c660c1..9a886220 100644 --- a/libsolidity/ast/ASTJsonConverter.h +++ b/libsolidity/ast/ASTJsonConverter.h @@ -120,7 +120,7 @@ private: std::vector<std::pair<std::string, Json::Value>>&& _attributes ); std::string sourceLocationToString(SourceLocation const& _location) const; - std::string namePathToString(std::vector<ASTString> const& _namePath) const; + static std::string namePathToString(std::vector<ASTString> const& _namePath); static Json::Value idOrNull(ASTNode const* _pt) { return _pt ? Json::Value(nodeId(*_pt)) : Json::nullValue; @@ -129,13 +129,13 @@ private: { return _node ? toJson(*_node) : Json::nullValue; } - Json::Value inlineAssemblyIdentifierToJson(std::pair<assembly::Identifier const* , InlineAssemblyAnnotation::ExternalIdentifierInfo> _info); - std::string location(VariableDeclaration::Location _location); - std::string contractKind(ContractDefinition::ContractKind _kind); - std::string functionCallKind(FunctionCallKind _kind); - std::string literalTokenKind(Token::Value _token); - std::string type(Expression const& _expression); - std::string type(VariableDeclaration const& _varDecl); + Json::Value inlineAssemblyIdentifierToJson(std::pair<assembly::Identifier const* , InlineAssemblyAnnotation::ExternalIdentifierInfo> _info) const; + static std::string location(VariableDeclaration::Location _location); + static std::string contractKind(ContractDefinition::ContractKind _kind); + static std::string functionCallKind(FunctionCallKind _kind); + static std::string literalTokenKind(Token::Value _token); + static std::string type(Expression const& _expression); + static std::string type(VariableDeclaration const& _varDecl); static int nodeId(ASTNode const& _node) { return _node.id(); @@ -151,8 +151,8 @@ private: } return tmp; } - Json::Value typePointerToJson(TypePointer _tp); - Json::Value typePointerToJson(std::shared_ptr<std::vector<TypePointer>> _tps); + static Json::Value typePointerToJson(TypePointer _tp); + static Json::Value typePointerToJson(std::shared_ptr<std::vector<TypePointer>> _tps); void appendExpressionAttributes( std::vector<std::pair<std::string, Json::Value>> &_attributes, ExpressionAnnotation const& _annotation |