diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-02 19:22:14 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-02 19:22:14 +0100 |
| commit | 552534a2a264676a5a560bbcd9bdbf8c72910a7e (patch) | |
| tree | 373a1d1fd1eaf668b8f79138b62ddc9c41306f1c | |
| parent | 713a073cae011a108e6acb69daca73abf852783c (diff) | |
Rename a few bits.
| -rw-r--r-- | src/cxml.h | 10 | ||||
| -rw-r--r-- | test/tests.cc | 18 |
2 files changed, 14 insertions, 14 deletions
@@ -66,7 +66,7 @@ public: * </Fred> * * string_child ("Jim") would return "42" - * numerical_child<int64_t> ("Jim") would return 42. + * number_child<int64_t> ("Jim") would return 42. * ...and so on. * * The methods not marked "optional" will throw an exception @@ -84,7 +84,7 @@ public: boost::optional<bool> optional_bool_child (std::string) const; template <class T> - T numerical_child (std::string c) const + T number_child (std::string c) const { std::string s = string_child (c); boost::erase_all (s, " "); @@ -92,7 +92,7 @@ public: } template <class T> - boost::optional<T> optional_numerical_child (std::string c) const + boost::optional<T> optional_number_child (std::string c) const { boost::optional<std::string> s = optional_string_child (c); if (!s) { @@ -123,7 +123,7 @@ public: boost::optional<bool> optional_bool_attribute (std::string) const; template <class T> - T numerical_attribute (std::string c) const + T number_attribute (std::string c) const { std::string s = string_attribute (c); boost::erase_all (s, " "); @@ -131,7 +131,7 @@ public: } template <class T> - boost::optional<T> optional_numerical_attribute (std::string c) const + boost::optional<T> optional_number_attribute (std::string c) const { boost::optional<std::string> s = optional_string_attribute (c); if (!s) { diff --git a/test/tests.cc b/test/tests.cc index 21466ca..326a813 100644 --- a/test/tests.cc +++ b/test/tests.cc @@ -37,24 +37,24 @@ BOOST_AUTO_TEST_CASE (test) cxml::File file ("test/ref/a.xml", "A"); BOOST_CHECK_EQUAL (file.string_child("B"), "42"); - BOOST_CHECK_EQUAL (file.numerical_child<int>("B"), 42); - BOOST_CHECK_EQUAL (file.numerical_child<float>("B"), 42); + BOOST_CHECK_EQUAL (file.number_child<int>("B"), 42); + BOOST_CHECK_EQUAL (file.number_child<float>("B"), 42); BOOST_CHECK_EQUAL (file.string_child("C"), "fred"); - BOOST_CHECK_EQUAL (file.numerical_child<double>("D"), 42.9); + BOOST_CHECK_EQUAL (file.number_child<double>("D"), 42.9); BOOST_CHECK_EQUAL (file.string_child("E"), "yes"); BOOST_CHECK_EQUAL (file.bool_child("E"), true); BOOST_CHECK_THROW (file.bool_child("F"), cxml::Error); BOOST_CHECK (file.optional_string_child("B")); BOOST_CHECK_EQUAL (file.optional_string_child("B").get(), "42"); - BOOST_CHECK (file.optional_numerical_child<int>("B")); - BOOST_CHECK_EQUAL (file.optional_numerical_child<int>("B").get(), 42); - BOOST_CHECK (file.optional_numerical_child<float>("B")); - BOOST_CHECK_EQUAL (file.optional_numerical_child<float>("B").get(), 42); + BOOST_CHECK (file.optional_number_child<int>("B")); + BOOST_CHECK_EQUAL (file.optional_number_child<int>("B").get(), 42); + BOOST_CHECK (file.optional_number_child<float>("B")); + BOOST_CHECK_EQUAL (file.optional_number_child<float>("B").get(), 42); BOOST_CHECK (file.optional_string_child("C")); BOOST_CHECK_EQUAL (file.optional_string_child("C").get(), "fred"); - BOOST_CHECK (file.optional_numerical_child<double>("D")); - BOOST_CHECK_EQUAL (file.optional_numerical_child<double>("D").get(), 42.9); + BOOST_CHECK (file.optional_number_child<double>("D")); + BOOST_CHECK_EQUAL (file.optional_number_child<double>("D").get(), 42.9); BOOST_CHECK (file.optional_string_child("E")); BOOST_CHECK_EQUAL (file.optional_string_child("E").get(), "yes"); BOOST_CHECK (file.optional_bool_child("E")); |