diff options
| author | chriseth <c@ethdev.com> | 2016-09-02 06:21:39 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2016-09-02 06:22:03 +0800 |
| commit | ada31fa9b72434a24471116d0c7281d7499039b9 (patch) | |
| tree | a5fff8576a724a778742c2e9399904c0eb4894ab | |
| parent | b5d941d3d9f32193c7f9094dee20511585508f6a (diff) | |
| download | dexon-solidity-ada31fa9b72434a24471116d0c7281d7499039b9.tar.gz dexon-solidity-ada31fa9b72434a24471116d0c7281d7499039b9.tar.zst dexon-solidity-ada31fa9b72434a24471116d0c7281d7499039b9.zip | |
Do not emit non-utf8 strings for ast json.
| -rw-r--r-- | libsolidity/ast/ASTJsonConverter.cpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/libsolidity/ast/ASTJsonConverter.cpp b/libsolidity/ast/ASTJsonConverter.cpp index 49ee6d34..0ea5e093 100644 --- a/libsolidity/ast/ASTJsonConverter.cpp +++ b/libsolidity/ast/ASTJsonConverter.cpp @@ -22,6 +22,7 @@ #include <libsolidity/ast/ASTJsonConverter.h> #include <boost/algorithm/string/join.hpp> +#include <libdevcore/UTF8.h> #include <libsolidity/ast/AST.h> using namespace std; @@ -397,9 +398,21 @@ bool ASTJsonConverter::visit(ElementaryTypeNameExpression const& _node) bool ASTJsonConverter::visit(Literal const& _node) { char const* tokenString = Token::toString(_node.token()); + size_t invalidPos = 0; + Json::Value value{_node.value()}; + if (!dev::validate(_node.value(), invalidPos)) + value = Json::nullValue; + Token::Value subdenomination = Token::Value(_node.subDenomination()); addJsonNode(_node, "Literal", { - make_pair("string", tokenString ? tokenString : Json::Value()), - make_pair("value", _node.value()), + make_pair("token", tokenString ? tokenString : Json::Value()), + make_pair("value", value), + make_pair("hexvalue", toHex(_node.value())), + make_pair( + "subdenomination", + subdenomination == Token::Illegal ? + Json::nullValue : + Json::Value{Token::toString(subdenomination)} + ), make_pair("type", type(_node)) }); return true; |