diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-04 11:40:03 +0200 |
---|---|---|
committer | Jonas Schnelli <jonas.schnelli@include7.ch> | 2015-06-04 13:18:57 +0200 |
commit | c02309204b8195476945f7066e8d96c60246db08 (patch) | |
tree | 3a550d0ff86d1bd557c793441b23df0d7725c68f /src/univalue/univalue.h | |
parent | 7e98a3c642222edc0813ced945d4b6e548cb8ca8 (diff) | |
download | bitcoin-c02309204b8195476945f7066e8d96c60246db08.tar.xz |
univalue: add strict type checking
Diffstat (limited to 'src/univalue/univalue.h')
-rw-r--r-- | src/univalue/univalue.h | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/src/univalue/univalue.h b/src/univalue/univalue.h index 57a96abe26..79018bb787 100644 --- a/src/univalue/univalue.h +++ b/src/univalue/univalue.h @@ -13,7 +13,6 @@ #include <sstream> // .get_int64() #include <utility> // std::pair -#include <stdlib.h> // atoi(), atof() TODO: remove class UniValue { public: @@ -75,7 +74,7 @@ public: bool isNull() const { return (typ == VNULL); } bool isTrue() const { return (typ == VBOOL) && (val == "1"); } - bool isFalse() const { return (!isTrue()); } + bool isFalse() const { return (typ == VBOOL) && (val != "1"); } bool isBool() const { return (typ == VBOOL); } bool isStr() const { return (typ == VSTR); } bool isNum() const { return (typ == VNUM); } @@ -140,27 +139,22 @@ private: void writeObject(unsigned int prettyIndent, unsigned int indentLevel, std::string& s) const; public: - // - // The following were added for compatibility with json_spirit. - // Most duplicate other methods, and should be removed. - // - std::vector<std::string> getKeys() const { return keys; } - std::vector<UniValue> getValues() const { return values; } - bool get_bool() const { return getBool(); } - std::string get_str() const { return getValStr(); } - int get_int() const { return atoi(getValStr().c_str()); } - double get_real() const { return atof(getValStr().c_str()); } - const UniValue& get_obj() const { return *this; } - const UniValue& get_array() const { return *this; } + // Strict type-specific getters, these throw std::runtime_error if the + // value is of unexpected type + std::vector<std::string> getKeys() const; + std::vector<UniValue> getValues() const; + bool get_bool() const; + std::string get_str() const; + int get_int() const; + int64_t get_int64() const; + double get_real() const; + const UniValue& get_obj() const; + const UniValue& get_array() const; + enum VType type() const { return getType(); } bool push_back(std::pair<std::string,UniValue> pear) { return pushKV(pear.first, pear.second); } - int64_t get_int64() const { - int64_t ret; - std::istringstream(getValStr()) >> ret; - return ret; - } friend const UniValue& find_value( const UniValue& obj, const std::string& name); }; |