From aa7b9a3965b2eef95aea5e8231f624359ef6ad3d Mon Sep 17 00:00:00 2001 From: ToruNiina Date: Sat, 27 Apr 2019 16:45:25 +0900 Subject: [PATCH] refactor: rename as_floating -> as_float Actually, since `floating` is used for toml::types, `as_floating` seems to be clearer. But currently `is_*` functions uses `float`, not `floating`, so `as_float` is chosen for the consistency. In a future release, possibly v3, those names may need to be re-considered for clarity. --- tests/test_value.cpp | 24 ++++++++++++------------ toml/value.hpp | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/test_value.cpp b/tests/test_value.cpp index 691e521..40d83e3 100644 --- a/tests/test_value.cpp +++ b/tests/test_value.cpp @@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE(test_value_boolean) BOOST_CHECK_EQUAL(v1.cast(), 42); BOOST_CHECK_EQUAL(v2.cast(), 3.14); BOOST_CHECK_EQUAL(v1.as_integer(), 42); - BOOST_CHECK_EQUAL(v2.as_floating(), 3.14); + BOOST_CHECK_EQUAL(v2.as_float(), 3.14); } BOOST_AUTO_TEST_CASE(test_value_integer) @@ -205,8 +205,8 @@ BOOST_AUTO_TEST_CASE(test_value_float) BOOST_CHECK_EQUAL (v1.cast(), 3.14); BOOST_CHECK_CLOSE_FRACTION(v2.cast(), 3.14, 1e-2); - BOOST_CHECK_EQUAL (v1.as_floating(), 3.14); - BOOST_CHECK_CLOSE_FRACTION(v2.as_floating(), 3.14, 1e-2); + BOOST_CHECK_EQUAL (v1.as_float(), 3.14); + BOOST_CHECK_CLOSE_FRACTION(v2.as_float(), 3.14, 1e-2); v1 = 2.718f; v2 = 2.718; @@ -222,8 +222,8 @@ BOOST_AUTO_TEST_CASE(test_value_float) BOOST_CHECK_CLOSE_FRACTION(v1.cast(), 2.718, 1e-3); BOOST_CHECK_EQUAL (v2.cast(), 2.718); - BOOST_CHECK_CLOSE_FRACTION(v1.as_floating(), 2.718, 1e-3); - BOOST_CHECK_EQUAL (v2.as_floating(), 2.718); + BOOST_CHECK_CLOSE_FRACTION(v1.as_float(), 2.718, 1e-3); + BOOST_CHECK_EQUAL (v2.as_float(), 2.718); toml::value v3(v1); toml::value v4(v2); @@ -241,8 +241,8 @@ BOOST_AUTO_TEST_CASE(test_value_float) BOOST_CHECK_CLOSE_FRACTION(v3.cast(), 2.718, 1e-3); BOOST_CHECK_EQUAL (v4.cast(), 2.718); - BOOST_CHECK_CLOSE_FRACTION(v3.as_floating(), 2.718, 1e-3); - BOOST_CHECK_EQUAL (v4.as_floating(), 2.718); + BOOST_CHECK_CLOSE_FRACTION(v3.as_float(), 2.718, 1e-3); + BOOST_CHECK_EQUAL (v4.as_float(), 2.718); toml::value v5(std::move(v1)); toml::value v6(std::move(v2)); @@ -258,8 +258,8 @@ BOOST_AUTO_TEST_CASE(test_value_float) BOOST_CHECK_CLOSE_FRACTION(v5.cast(), 2.718, 1e-3); BOOST_CHECK_EQUAL (v6.cast(), 2.718); - BOOST_CHECK_CLOSE_FRACTION(v5.as_floating(), 2.718, 1e-3); - BOOST_CHECK_EQUAL (v6.as_floating(), 2.718); + BOOST_CHECK_CLOSE_FRACTION(v5.as_float(), 2.718, 1e-3); + BOOST_CHECK_EQUAL (v6.as_float(), 2.718); v1 = true; v2 = false; @@ -768,7 +768,7 @@ BOOST_AUTO_TEST_CASE(test_value_table) BOOST_CHECK_EQUAL(v1.cast().at("bar").cast(), 3.14); BOOST_CHECK_EQUAL(v1.cast().at("baz").cast().str, "qux"); BOOST_CHECK_EQUAL(v1.as_table().at("foo").as_integer(), 42); - BOOST_CHECK_EQUAL(v1.as_table().at("bar").as_floating(), 3.14); + BOOST_CHECK_EQUAL(v1.as_table().at("bar").as_float(), 3.14); BOOST_CHECK_EQUAL(v1.as_table().at("baz").as_string().str, "qux"); @@ -782,7 +782,7 @@ BOOST_AUTO_TEST_CASE(test_value_table) BOOST_CHECK_EQUAL(v1.cast().at("foo").cast(), 2.71); BOOST_CHECK_EQUAL(v1.cast().at("bar").cast(), 54); BOOST_CHECK_EQUAL(v1.cast().at("baz").cast().str, "quux"); - BOOST_CHECK_EQUAL(v1.as_table().at("foo").as_floating(), 2.71); + BOOST_CHECK_EQUAL(v1.as_table().at("foo").as_float(), 2.71); BOOST_CHECK_EQUAL(v1.as_table().at("bar").as_integer(), 54); BOOST_CHECK_EQUAL(v1.as_table().at("baz").as_string().str, "quux"); @@ -798,7 +798,7 @@ BOOST_AUTO_TEST_CASE(test_value_table) BOOST_CHECK_EQUAL(v3.cast().at("foo").cast(), 2.71); BOOST_CHECK_EQUAL(v3.cast().at("bar").cast(), 54); BOOST_CHECK_EQUAL(v3.cast().at("baz").cast().str, "quux"); - BOOST_CHECK_EQUAL(v3.as_table().at("foo").as_floating(), 2.71); + BOOST_CHECK_EQUAL(v3.as_table().at("foo").as_float(), 2.71); BOOST_CHECK_EQUAL(v3.as_table().at("bar").as_integer(), 54); BOOST_CHECK_EQUAL(v3.as_table().at("baz").as_string().str, "quux"); diff --git a/toml/value.hpp b/toml/value.hpp index 31910e2..d327b3d 100644 --- a/toml/value.hpp +++ b/toml/value.hpp @@ -609,7 +609,7 @@ class value boolean const& as_boolean() const {return this->cast();} integer const& as_integer() const {return this->cast();} - floating const& as_floating() const {return this->cast();} + floating const& as_float() const {return this->cast();} string const& as_string() const {return this->cast();} offset_datetime const& as_offset_datetime() const {return this->cast();} local_datetime const& as_local_datetime() const {return this->cast();} @@ -620,7 +620,7 @@ class value boolean& as_boolean() {return this->cast();} integer& as_integer() {return this->cast();} - floating& as_floating() {return this->cast();} + floating& as_float() {return this->cast();} string& as_string() {return this->cast();} offset_datetime& as_offset_datetime() {return this->cast();} local_datetime& as_local_datetime() {return this->cast();}