From 32f0a8bd3a5c9f3c454164f4d23289851b0de3e7 Mon Sep 17 00:00:00 2001
From: Steve Doiel <steved@usnr.com>
Date: Tue, 6 Jan 2015 15:33:56 -0800
Subject: Add xml_text::set for float Make float/double round-trip
---
src/pugixml.cpp | 17 ++++++++++++++++-
src/pugixml.hpp | 1 +
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/pugixml.cpp b/src/pugixml.cpp
index dd3f427..6608d8d 100644
--- a/src/pugixml.cpp
+++ b/src/pugixml.cpp
@@ -3954,10 +3954,18 @@ PUGI__NS_BEGIN
return set_value_buffer(dest, header, header_mask, buf);
}
+ PUGI__FN bool set_value_convert(char_t*& dest, uintptr_t& header, uintptr_t header_mask, float value)
+ {
+ char buf[128];
+ sprintf(buf, "%.9g", value);
+
+ return set_value_buffer(dest, header, header_mask, buf);
+ }
+
PUGI__FN bool set_value_convert(char_t*& dest, uintptr_t& header, uintptr_t header_mask, double value)
{
char buf[128];
- sprintf(buf, "%g", value);
+ sprintf(buf, "%.17g", value);
return set_value_buffer(dest, header, header_mask, buf);
}
@@ -5603,6 +5611,13 @@ namespace pugi
return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
}
+ PUGI__FN bool xml_text::set(float rhs)
+ {
+ xml_node_struct* dn = _data_new();
+
+ return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
+ }
+
PUGI__FN bool xml_text::set(double rhs)
{
xml_node_struct* dn = _data_new();
diff --git a/src/pugixml.hpp b/src/pugixml.hpp
index 917ef4a..8a332e1 100644
--- a/src/pugixml.hpp
+++ b/src/pugixml.hpp
@@ -693,6 +693,7 @@ namespace pugi
// Set text with type conversion (numbers are converted to strings, boolean is converted to "true"/"false")
bool set(int rhs);
bool set(unsigned int rhs);
+ bool set(float rhs);
bool set(double rhs);
bool set(bool rhs);
--
cgit v1.2.3
From 4ae1940065c415223445efb23d3200d1b0b1d4a1 Mon Sep 17 00:00:00 2001
From: Steve Doiel <steved@usnr.com>
Date: Fri, 16 Jan 2015 14:55:10 -0800
Subject: Fix attribute round trip for float as well
---
src/pugixml.cpp | 7 +++++++
src/pugixml.hpp | 1 +
2 files changed, 8 insertions(+)
diff --git a/src/pugixml.cpp b/src/pugixml.cpp
index 6608d8d..2ed94f3 100644
--- a/src/pugixml.cpp
+++ b/src/pugixml.cpp
@@ -4608,6 +4608,13 @@ namespace pugi
return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs);
}
+ PUGI__FN bool xml_attribute::set_value(float rhs)
+ {
+ if (!_attr) return false;
+
+ return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs);
+ }
+
PUGI__FN bool xml_attribute::set_value(bool rhs)
{
if (!_attr) return false;
diff --git a/src/pugixml.hpp b/src/pugixml.hpp
index 8a332e1..2076426 100644
--- a/src/pugixml.hpp
+++ b/src/pugixml.hpp
@@ -352,6 +352,7 @@ namespace pugi
bool set_value(int rhs);
bool set_value(unsigned int rhs);
bool set_value(double rhs);
+ bool set_value(float rhs);
bool set_value(bool rhs);
#ifdef PUGIXML_HAS_LONG_LONG
--
cgit v1.2.3
From 53525a037b45ecf4dc29bf6700ad384647541da2 Mon Sep 17 00:00:00 2001
From: Steve Doiel <steved@usnr.com>
Date: Fri, 16 Jan 2015 15:20:28 -0800
Subject: Add a couple of more overloads for floats
---
src/pugixml.cpp | 12 ++++++++++++
src/pugixml.hpp | 2 ++
2 files changed, 14 insertions(+)
diff --git a/src/pugixml.cpp b/src/pugixml.cpp
index 2ed94f3..9760e9f 100644
--- a/src/pugixml.cpp
+++ b/src/pugixml.cpp
@@ -4553,6 +4553,12 @@ namespace pugi
return *this;
}
+ PUGI__FN xml_attribute& xml_attribute::operator=(float rhs)
+ {
+ set_value(rhs);
+ return *this;
+ }
+
PUGI__FN xml_attribute& xml_attribute::operator=(bool rhs)
{
set_value(rhs);
@@ -5679,6 +5685,12 @@ namespace pugi
return *this;
}
+ PUGI__FN xml_text& xml_text::operator=(float rhs)
+ {
+ set(rhs);
+ return *this;
+ }
+
PUGI__FN xml_text& xml_text::operator=(bool rhs)
{
set(rhs);
diff --git a/src/pugixml.hpp b/src/pugixml.hpp
index 2076426..163059d 100644
--- a/src/pugixml.hpp
+++ b/src/pugixml.hpp
@@ -365,6 +365,7 @@ namespace pugi
xml_attribute& operator=(int rhs);
xml_attribute& operator=(unsigned int rhs);
xml_attribute& operator=(double rhs);
+ xml_attribute& operator=(float rhs);
xml_attribute& operator=(bool rhs);
#ifdef PUGIXML_HAS_LONG_LONG
@@ -708,6 +709,7 @@ namespace pugi
xml_text& operator=(int rhs);
xml_text& operator=(unsigned int rhs);
xml_text& operator=(double rhs);
+ xml_text& operator=(float rhs);
xml_text& operator=(bool rhs);
#ifdef PUGIXML_HAS_LONG_LONG
--
cgit v1.2.3
From cf72c20ca173bbad227e8f70bd68a2dbfb5b2890 Mon Sep 17 00:00:00 2001
From: Steve Doiel <steved@usnr.com>
Date: Fri, 16 Jan 2015 16:14:59 -0800
Subject: Increase precision on large number test
---
tests/test_dom_modify.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/test_dom_modify.cpp b/tests/test_dom_modify.cpp
index 7863718..85c381e 100644
--- a/tests/test_dom_modify.cpp
+++ b/tests/test_dom_modify.cpp
@@ -753,8 +753,8 @@ TEST_XML(dom_attr_assign_large_number, "<node attr1='' attr2='' />")
node.attribute(STR("attr1")) = std::numeric_limits<float>::max();
node.attribute(STR("attr2")) = std::numeric_limits<double>::max();
- CHECK(test_node(node, STR("<node attr1=\"3.40282e+038\" attr2=\"1.79769e+308\" />"), STR(""), pugi::format_raw) ||
- test_node(node, STR("<node attr1=\"3.40282e+38\" attr2=\"1.79769e+308\" />"), STR(""), pugi::format_raw));
+ CHECK(test_node(node, STR("<node attr1=\"3.40282347e+038\" attr2=\"1.7976931348623157ee+308\" />"), STR(""), pugi::format_raw) ||
+ test_node(node, STR("<node attr1=\"3.40282347e+38\" attr2=\"1.7976931348623157e+308\" />"), STR(""), pugi::format_raw));
}
TEST(dom_node_declaration_name)
--
cgit v1.2.3