summaryrefslogtreecommitdiffstats
path: root/base/json
diff options
context:
space:
mode:
authorarv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-01 01:02:07 +0000
committerarv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-01 01:02:07 +0000
commitfb534c949f92bec8c6312b58ffcc04c5dc488f2d (patch)
tree84384bdb8b06e62662ce1a5e9619ae455e9a69a8 /base/json
parentefeb669b05db99c54309771e4884b1a17d604a37 (diff)
downloadchromium_src-fb534c949f92bec8c6312b58ffcc04c5dc488f2d.zip
chromium_src-fb534c949f92bec8c6312b58ffcc04c5dc488f2d.tar.gz
chromium_src-fb534c949f92bec8c6312b58ffcc04c5dc488f2d.tar.bz2
Rename Real* to Double* in values.* and dependent files
BUG=None TEST=Compiles and passes all tests Review URL: http://codereview.chromium.org/6248026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73232 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/json')
-rw-r--r--base/json/json_reader.cc2
-rw-r--r--base/json/json_reader_unittest.cc72
-rw-r--r--base/json/json_writer.cc4
-rw-r--r--base/json/json_writer_unittest.cc6
4 files changed, 42 insertions, 42 deletions
diff --git a/base/json/json_reader.cc b/base/json/json_reader.cc
index dd5d088..c8fe78d 100644
--- a/base/json/json_reader.cc
+++ b/base/json/json_reader.cc
@@ -396,7 +396,7 @@ Value* JSONReader::DecodeNumber(const Token& token) {
double num_double;
if (StringToDouble(WideToUTF8(num_string), &num_double) &&
base::IsFinite(num_double))
- return Value::CreateRealValue(num_double);
+ return Value::CreateDoubleValue(num_double);
return NULL;
}
diff --git a/base/json/json_reader_unittest.cc b/base/json/json_reader_unittest.cc
index c00c976..db0ab63 100644
--- a/base/json/json_reader_unittest.cc
+++ b/base/json/json_reader_unittest.cc
@@ -75,60 +75,60 @@ TEST(JSONReaderTest, Reading) {
// storage as doubles
root.reset(JSONReader().JsonToValue("2147483648", false, false));
ASSERT_TRUE(root.get());
- double real_val;
- ASSERT_TRUE(root->IsType(Value::TYPE_REAL));
- real_val = 0.0;
- ASSERT_TRUE(root->GetAsReal(&real_val));
- ASSERT_DOUBLE_EQ(2147483648.0, real_val);
+ double double_val;
+ ASSERT_TRUE(root->IsType(Value::TYPE_DOUBLE));
+ double_val = 0.0;
+ ASSERT_TRUE(root->GetAsDouble(&double_val));
+ ASSERT_DOUBLE_EQ(2147483648.0, double_val);
root.reset(JSONReader().JsonToValue("-2147483649", false, false));
ASSERT_TRUE(root.get());
- ASSERT_TRUE(root->IsType(Value::TYPE_REAL));
- real_val = 0.0;
- ASSERT_TRUE(root->GetAsReal(&real_val));
- ASSERT_DOUBLE_EQ(-2147483649.0, real_val);
+ ASSERT_TRUE(root->IsType(Value::TYPE_DOUBLE));
+ double_val = 0.0;
+ ASSERT_TRUE(root->GetAsDouble(&double_val));
+ ASSERT_DOUBLE_EQ(-2147483649.0, double_val);
// Parse a double
root.reset(JSONReader().JsonToValue("43.1", false, false));
ASSERT_TRUE(root.get());
- ASSERT_TRUE(root->IsType(Value::TYPE_REAL));
- real_val = 0.0;
- ASSERT_TRUE(root->GetAsReal(&real_val));
- ASSERT_DOUBLE_EQ(43.1, real_val);
+ ASSERT_TRUE(root->IsType(Value::TYPE_DOUBLE));
+ double_val = 0.0;
+ ASSERT_TRUE(root->GetAsDouble(&double_val));
+ ASSERT_DOUBLE_EQ(43.1, double_val);
root.reset(JSONReader().JsonToValue("4.3e-1", false, false));
ASSERT_TRUE(root.get());
- ASSERT_TRUE(root->IsType(Value::TYPE_REAL));
- real_val = 0.0;
- ASSERT_TRUE(root->GetAsReal(&real_val));
- ASSERT_DOUBLE_EQ(.43, real_val);
+ ASSERT_TRUE(root->IsType(Value::TYPE_DOUBLE));
+ double_val = 0.0;
+ ASSERT_TRUE(root->GetAsDouble(&double_val));
+ ASSERT_DOUBLE_EQ(.43, double_val);
root.reset(JSONReader().JsonToValue("2.1e0", false, false));
ASSERT_TRUE(root.get());
- ASSERT_TRUE(root->IsType(Value::TYPE_REAL));
- real_val = 0.0;
- ASSERT_TRUE(root->GetAsReal(&real_val));
- ASSERT_DOUBLE_EQ(2.1, real_val);
+ ASSERT_TRUE(root->IsType(Value::TYPE_DOUBLE));
+ double_val = 0.0;
+ ASSERT_TRUE(root->GetAsDouble(&double_val));
+ ASSERT_DOUBLE_EQ(2.1, double_val);
root.reset(JSONReader().JsonToValue("2.1e+0001", false, false));
ASSERT_TRUE(root.get());
- ASSERT_TRUE(root->IsType(Value::TYPE_REAL));
- real_val = 0.0;
- ASSERT_TRUE(root->GetAsReal(&real_val));
- ASSERT_DOUBLE_EQ(21.0, real_val);
+ ASSERT_TRUE(root->IsType(Value::TYPE_DOUBLE));
+ double_val = 0.0;
+ ASSERT_TRUE(root->GetAsDouble(&double_val));
+ ASSERT_DOUBLE_EQ(21.0, double_val);
root.reset(JSONReader().JsonToValue("0.01", false, false));
ASSERT_TRUE(root.get());
- ASSERT_TRUE(root->IsType(Value::TYPE_REAL));
- real_val = 0.0;
- ASSERT_TRUE(root->GetAsReal(&real_val));
- ASSERT_DOUBLE_EQ(0.01, real_val);
+ ASSERT_TRUE(root->IsType(Value::TYPE_DOUBLE));
+ double_val = 0.0;
+ ASSERT_TRUE(root->GetAsDouble(&double_val));
+ ASSERT_DOUBLE_EQ(0.01, double_val);
root.reset(JSONReader().JsonToValue("1.00", false, false));
ASSERT_TRUE(root.get());
- ASSERT_TRUE(root->IsType(Value::TYPE_REAL));
- real_val = 0.0;
- ASSERT_TRUE(root->GetAsReal(&real_val));
- ASSERT_DOUBLE_EQ(1.0, real_val);
+ ASSERT_TRUE(root->IsType(Value::TYPE_DOUBLE));
+ double_val = 0.0;
+ ASSERT_TRUE(root->GetAsDouble(&double_val));
+ ASSERT_DOUBLE_EQ(1.0, double_val);
// Fractional parts must have a digit before and after the decimal point.
root.reset(JSONReader().JsonToValue("1.", false, false));
@@ -303,9 +303,9 @@ TEST(JSONReaderTest, Reading) {
ASSERT_TRUE(root.get());
ASSERT_TRUE(root->IsType(Value::TYPE_DICTIONARY));
DictionaryValue* dict_val = static_cast<DictionaryValue*>(root.get());
- real_val = 0.0;
- ASSERT_TRUE(dict_val->GetReal("number", &real_val));
- ASSERT_DOUBLE_EQ(9.87654321, real_val);
+ double_val = 0.0;
+ ASSERT_TRUE(dict_val->GetDouble("number", &double_val));
+ ASSERT_DOUBLE_EQ(9.87654321, double_val);
Value* null_val = NULL;
ASSERT_TRUE(dict_val->Get("null", &null_val));
ASSERT_TRUE(null_val->IsType(Value::TYPE_NULL));
diff --git a/base/json/json_writer.cc b/base/json/json_writer.cc
index dbf43ec..fa8f239 100644
--- a/base/json/json_writer.cc
+++ b/base/json/json_writer.cc
@@ -75,10 +75,10 @@ void JSONWriter::BuildJSONString(const Value* const node,
break;
}
- case Value::TYPE_REAL:
+ case Value::TYPE_DOUBLE:
{
double value;
- bool result = node->GetAsReal(&value);
+ bool result = node->GetAsDouble(&value);
DCHECK(result);
std::string real = DoubleToString(value);
// Ensure that the number has a .0 if there's no decimal or 'e'. This
diff --git a/base/json/json_writer_unittest.cc b/base/json/json_writer_unittest.cc
index 937d083..6d7714b 100644
--- a/base/json/json_writer_unittest.cc
+++ b/base/json/json_writer_unittest.cc
@@ -29,19 +29,19 @@ TEST(JSONWriterTest, Writing) {
delete root;
// Test Real values should always have a decimal or an 'e'.
- root = Value::CreateRealValue(1.0);
+ root = Value::CreateDoubleValue(1.0);
JSONWriter::Write(root, false, &output_js);
ASSERT_EQ("1.0", output_js);
delete root;
// Test Real values in the the range (-1, 1) must have leading zeros
- root = Value::CreateRealValue(0.2);
+ root = Value::CreateDoubleValue(0.2);
JSONWriter::Write(root, false, &output_js);
ASSERT_EQ("0.2", output_js);
delete root;
// Test Real values in the the range (-1, 1) must have leading zeros
- root = Value::CreateRealValue(-0.8);
+ root = Value::CreateDoubleValue(-0.8);
JSONWriter::Write(root, false, &output_js);
ASSERT_EQ("-0.8", output_js);
delete root;
generated by cgit v1.1 at 2025-03-02 02:16:12 +0000