diff options
| author | Christian Parpart <christian@parpart.family> | 2018-10-23 07:50:15 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-23 07:50:15 +0800 |
| commit | a2f5087d13274d6832669a39694ee5a3bf68f878 (patch) | |
| tree | 4b6b8b3816a0a1620e73a30de687ff3557a10098 /libsolidity/ast/ASTJsonConverter.cpp | |
| parent | c13b5280c1b44f18a2a1fb61ef5556e91c5678e7 (diff) | |
| parent | f112377dd44e8281bff092639bb546ec8a6a39ac (diff) | |
| download | dexon-solidity-a2f5087d13274d6832669a39694ee5a3bf68f878.tar dexon-solidity-a2f5087d13274d6832669a39694ee5a3bf68f878.tar.gz dexon-solidity-a2f5087d13274d6832669a39694ee5a3bf68f878.tar.bz2 dexon-solidity-a2f5087d13274d6832669a39694ee5a3bf68f878.tar.lz dexon-solidity-a2f5087d13274d6832669a39694ee5a3bf68f878.tar.xz dexon-solidity-a2f5087d13274d6832669a39694ee5a3bf68f878.tar.zst dexon-solidity-a2f5087d13274d6832669a39694ee5a3bf68f878.zip | |
Merge pull request #5286 from ethereum/refactor-token-as-enum-class
refactor `libsolidity::Token` into a strongly typed enum
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 4b282d85..569e5b0e 100644 --- a/libsolidity/ast/ASTJsonConverter.cpp +++ b/libsolidity/ast/ASTJsonConverter.cpp @@ -589,7 +589,7 @@ bool ASTJsonConverter::visit(Conditional const& _node) bool ASTJsonConverter::visit(Assignment const& _node) { std::vector<pair<string, Json::Value>> attributes = { - make_pair("operator", Token::toString(_node.assignmentOperator())), + make_pair("operator", TokenTraits::toString(_node.assignmentOperator())), make_pair("leftHandSide", toJson(_node.leftHandSide())), make_pair("rightHandSide", toJson(_node.rightHandSide())) }; @@ -613,7 +613,7 @@ bool ASTJsonConverter::visit(UnaryOperation const& _node) { std::vector<pair<string, Json::Value>> attributes = { make_pair("prefix", _node.isPrefixOperation()), - make_pair("operator", Token::toString(_node.getOperator())), + make_pair("operator", TokenTraits::toString(_node.getOperator())), make_pair("subExpression", toJson(_node.subExpression())) }; appendExpressionAttributes(attributes, _node.annotation()); @@ -624,7 +624,7 @@ bool ASTJsonConverter::visit(UnaryOperation const& _node) bool ASTJsonConverter::visit(BinaryOperation const& _node) { std::vector<pair<string, Json::Value>> attributes = { - make_pair("operator", Token::toString(_node.getOperator())), + make_pair("operator", TokenTraits::toString(_node.getOperator())), make_pair("leftExpression", toJson(_node.leftExpression())), make_pair("rightExpression", toJson(_node.rightExpression())), make_pair("commonType", typePointerToJson(_node.annotation().commonType)), @@ -719,7 +719,7 @@ bool ASTJsonConverter::visit(Literal const& _node) Json::Value value{_node.value()}; if (!dev::validateUTF8(_node.value())) value = Json::nullValue; - Token::Value subdenomination = Token::Value(_node.subDenomination()); + Token subdenomination = Token(_node.subDenomination()); std::vector<pair<string, Json::Value>> attributes = { make_pair(m_legacy ? "token" : "kind", literalTokenKind(_node.token())), make_pair("value", value), @@ -728,7 +728,7 @@ bool ASTJsonConverter::visit(Literal const& _node) "subdenomination", subdenomination == Token::Illegal ? Json::nullValue : - Json::Value{Token::toString(subdenomination)} + Json::Value{TokenTraits::toString(subdenomination)} ) }; appendExpressionAttributes(attributes, _node.annotation()); @@ -790,7 +790,7 @@ string ASTJsonConverter::functionCallKind(FunctionCallKind _kind) } } -string ASTJsonConverter::literalTokenKind(Token::Value _token) +string ASTJsonConverter::literalTokenKind(Token _token) { switch (_token) { |