Merge pull request #9511 from ethereum/ast-hex-string

[BREAKING] Distinguish between stringLiteral and hexStringLiteral in the JSON AST
This commit is contained in:
chriseth
2020-07-27 12:34:40 +02:00
committed by GitHub
6 changed files with 8 additions and 3 deletions
+2 -1
View File
@@ -919,8 +919,9 @@ string ASTJsonConverter::literalTokenKind(Token _token)
case Token::Number:
return "number";
case Token::StringLiteral:
case Token::HexStringLiteral:
return "string";
case Token::HexStringLiteral:
return "hexString";
case Token::TrueLiteral:
case Token::FalseLiteral:
return "bool";
+2
View File
@@ -943,6 +943,8 @@ Token ASTJsonImporter::literalTokenKind(Json::Value const& _node)
tok = Token::Number;
else if (_node["kind"].asString() == "string")
tok = Token::StringLiteral;
else if (_node["kind"].asString() == "hexString")
tok = Token::HexStringLiteral;
else if (_node["kind"].asString() == "bool")
tok = (member(_node, "value").asString() == "true") ? Token::TrueLiteral : Token::FalseLiteral;
else