Browse Source

univalue: add support for real, fix percision and make it json_spirit compatible

- avoid breaking the API because of different number/percision handling
0.13
Jonas Schnelli 10 years ago
parent
commit
0c5b2cf69a
  1. 5
      src/rpcclient.cpp
  2. 10
      src/test/univalue_tests.cpp
  3. 8
      src/univalue/univalue.cpp
  4. 3
      src/univalue/univalue.h
  5. 9
      src/univalue/univalue_write.cpp

5
src/rpcclient.cpp

@ -146,8 +146,9 @@ Array RPCConvertValues(const std::string &strMethod, const std::vector<std::stri
jVal.setBool(false); jVal.setBool(false);
else else
{ {
if (!jVal.read(strVal)) if (!jVal.read(strVal) || (jVal.isNull() && strVal.size() > 0))
throw runtime_error(string("Error parsing JSON:")+strVal); if(!jVal.setNumStr(strVal) || jVal.isNull())
throw runtime_error(string("Error parsing JSON:")+strVal);
} }
params.push_back(jVal); params.push_back(jVal);
} }

10
src/test/univalue_tests.cpp

@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(univalue_constructor)
double vd = -7.21; double vd = -7.21;
UniValue v7(vd); UniValue v7(vd);
BOOST_CHECK(v7.isNum()); BOOST_CHECK(v7.isReal());
BOOST_CHECK_EQUAL(v7.getValStr(), "-7.21"); BOOST_CHECK_EQUAL(v7.getValStr(), "-7.21");
string vs("yawn"); string vs("yawn");
@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE(univalue_set)
BOOST_CHECK_EQUAL(v.getValStr(), "zum"); BOOST_CHECK_EQUAL(v.getValStr(), "zum");
BOOST_CHECK(v.setFloat(-1.01)); BOOST_CHECK(v.setFloat(-1.01));
BOOST_CHECK(v.isNum()); BOOST_CHECK(v.isReal());
BOOST_CHECK_EQUAL(v.getValStr(), "-1.01"); BOOST_CHECK_EQUAL(v.getValStr(), "-1.01");
BOOST_CHECK(v.setInt((int)1023)); BOOST_CHECK(v.setInt((int)1023));
@ -230,7 +230,7 @@ BOOST_AUTO_TEST_CASE(univalue_object)
objTypes["distance"] = UniValue::VNUM; objTypes["distance"] = UniValue::VNUM;
objTypes["time"] = UniValue::VNUM; objTypes["time"] = UniValue::VNUM;
objTypes["calories"] = UniValue::VNUM; objTypes["calories"] = UniValue::VNUM;
objTypes["temperature"] = UniValue::VNUM; objTypes["temperature"] = UniValue::VREAL;
objTypes["cat1"] = UniValue::VNUM; objTypes["cat1"] = UniValue::VNUM;
objTypes["cat2"] = UniValue::VNUM; objTypes["cat2"] = UniValue::VNUM;
BOOST_CHECK(obj.checkObject(objTypes)); BOOST_CHECK(obj.checkObject(objTypes));
@ -244,7 +244,7 @@ BOOST_AUTO_TEST_CASE(univalue_object)
} }
static const char *json1 = static const char *json1 =
"[1.1,{\"key1\":\"str\",\"key2\":800,\"key3\":{\"name\":\"martian\"}}]"; "[1.10000000,{\"key1\":\"str\",\"key2\":800,\"key3\":{\"name\":\"martian\"}}]";
BOOST_AUTO_TEST_CASE(univalue_readwrite) BOOST_AUTO_TEST_CASE(univalue_readwrite)
{ {
@ -257,7 +257,7 @@ BOOST_AUTO_TEST_CASE(univalue_readwrite)
BOOST_CHECK(v.isArray()); BOOST_CHECK(v.isArray());
BOOST_CHECK_EQUAL(v.size(), 2); BOOST_CHECK_EQUAL(v.size(), 2);
BOOST_CHECK_EQUAL(v[0].getValStr(), "1.1"); BOOST_CHECK_EQUAL(v[0].getValStr(), "1.10000000");
UniValue obj = v[1]; UniValue obj = v[1];
BOOST_CHECK(obj.isObject()); BOOST_CHECK(obj.isObject());

8
src/univalue/univalue.cpp

@ -4,6 +4,7 @@
#include <stdint.h> #include <stdint.h>
#include <ctype.h> #include <ctype.h>
#include <iomanip>
#include <sstream> #include <sstream>
#include "univalue.h" #include "univalue.h"
@ -78,9 +79,11 @@ bool UniValue::setFloat(double val)
string s; string s;
ostringstream oss; ostringstream oss;
oss << val; oss << std::setprecision(16) << val;
return setNumStr(oss.str()); bool ret = setNumStr(oss.str());
typ = VREAL;
return ret;
} }
bool UniValue::setStr(const string& val_) bool UniValue::setStr(const string& val_)
@ -203,6 +206,7 @@ const char *uvTypeName(UniValue::VType t)
case UniValue::VARR: return "array"; case UniValue::VARR: return "array";
case UniValue::VSTR: return "string"; case UniValue::VSTR: return "string";
case UniValue::VNUM: return "number"; case UniValue::VNUM: return "number";
case UniValue::VREAL: return "number";
} }
// not reached // not reached

3
src/univalue/univalue.h

@ -17,7 +17,7 @@
class UniValue { class UniValue {
public: public:
enum VType { VNULL, VOBJ, VARR, VSTR, VNUM, VBOOL, }; enum VType { VNULL, VOBJ, VARR, VSTR, VNUM, VREAL, VBOOL, };
UniValue() { typ = VNULL; } UniValue() { typ = VNULL; }
UniValue(UniValue::VType initialType, const std::string& initialStr = "") { UniValue(UniValue::VType initialType, const std::string& initialStr = "") {
@ -76,6 +76,7 @@ public:
bool isBool() const { return (typ == VBOOL); } bool isBool() const { return (typ == VBOOL); }
bool isStr() const { return (typ == VSTR); } bool isStr() const { return (typ == VSTR); }
bool isNum() const { return (typ == VNUM); } bool isNum() const { return (typ == VNUM); }
bool isReal() const { return (typ == VREAL); }
bool isArray() const { return (typ == VARR); } bool isArray() const { return (typ == VARR); }
bool isObject() const { return (typ == VOBJ); } bool isObject() const { return (typ == VOBJ); }

9
src/univalue/univalue_write.cpp

@ -3,6 +3,8 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <ctype.h> #include <ctype.h>
#include <iomanip>
#include <sstream>
#include <stdio.h> #include <stdio.h>
#include "univalue.h" #include "univalue.h"
#include "univalue_escapes.h" #include "univalue_escapes.h"
@ -59,6 +61,13 @@ string UniValue::write(unsigned int prettyIndent,
case VSTR: case VSTR:
s += "\"" + json_escape(val) + "\""; s += "\"" + json_escape(val) + "\"";
break; break;
case VREAL:
{
std::stringstream ss;
ss << std::showpoint << std::fixed << std::setprecision(8) << get_real();
s += ss.str();
}
break;
case VNUM: case VNUM:
s += val; s += val;
break; break;

Loading…
Cancel
Save