[lmi-commits] [lmi] master 48fcbf7 3/4: Replace print_hex_val() with floating_rep()

[Greg Chicares]

branch: master
commit 48fcbf70dc916685d4ce1d28afa9b1c4f882446c
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Replace print_hex_val() with floating_rep()
---
 round_test.cpp    | 62 +++++--------------------------------------------------
 round_to_test.cpp | 61 ++++--------------------------------------------------
 2 files changed, 9 insertions(+), 114 deletions(-)

diff --git a/round_test.cpp b/round_test.cpp
index 7aa43bb..fad8f4d 100644
--- a/round_test.cpp
+++ b/round_test.cpp
@@ -35,13 +35,14 @@
 #include "round_to.hpp"
 
 #include "fenv_lmi.hpp"
+#include "miscellany.hpp"               // floating_rep()
 #include "test_tools.hpp"
 
 #include <algorithm>                    // max()
 #include <cmath>                        // round()
-#include <cstddef>                      // size_t
 #include <ios>
 #include <iostream>
+#include <limits>
 #include <math.h>                       // ::round[,f,l]() and kin
 #include <ostream>
 
@@ -122,56 +123,6 @@ void set_hardware_rounding_mode(e_ieee754_rounding mode, 
bool synchronize)
         }
 }
 
-// print_hex_val() bears the following copyright and permission:
-/* boost limits_test.cpp   test your <limits> file for important
- *
- * Copyright Jens Maurer 2000
- * Permission to use, copy, modify, sell, and distribute this software
- * is hereby granted without free [sic] provided that the above copyright 
notice
- * appears in all copies and that both that copyright notice and this
- * permission notice appear in supporting documentation,
- *
- * Jens Maurer makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- */
-// GWC modified the code as noted below, e.g. to print in byte-reversed
-// order as well, and made some trivial formatting changes.
-template<typename T>
-void print_hex_val(T t, char const* name)
-{
-  // GWC changed C cast to reinterpret_cast:
-  unsigned char const* p = reinterpret_cast<unsigned char const*>(&t);
-  std::cout << "hex value of " << name << " is: ";
-
-// GWC modifications begin
-  // For gcc with x87, sizeof(long double) == 12, but only
-  // ten bytes are significant--the other two are padding.
-  std::size_t size_of_T = sizeof(T);
-#if defined __GNUC__ && defined LMI_X87
-  if(12 == size_of_T)
-    size_of_T = 10;
-#endif // defined __GNUC__ && defined LMI_X87
-// GWC modifications end
-
-  for(unsigned int i = 0; i < size_of_T; ++i) { // modified by GWC
-    if(p[i] <= 0xF)
-      std::cout << "0";
-    // GWC changed C cast to static_cast:
-    std::cout << std::hex << static_cast<int>(p[i]);
-  }
-// GWC modifications begin
-  std::cout << " / ";
-  for(int i = size_of_T - 1; 0 <= i; --i) {
-    if(p[i] <= 0xF)
-      std::cout << "0";
-    std::cout << std::hex << static_cast<int>(p[i]);
-  }
-  std::cout << std::dec << std::endl;
-// GWC modifications end
-}
-
 /// Emulate std::round() in order to test it. This may seem somewhat
 /// silly, because elsewhere a conforming C++11 implementation is
 /// presumed. However, std::round() calls for extraordinary testing
@@ -267,12 +218,9 @@ bool test_one_case
             ;
         std::cout << '\n';
 
-        std::cout << "  ";
-        print_hex_val(unrounded, "input   ");
-        std::cout << "  ";
-        print_hex_val(expected,  "expected");
-        std::cout << "  ";
-        print_hex_val(observed,  "observed");
+        std::cout << "  input    " << floating_rep(unrounded) << '\n';
+        std::cout << "  expected " << floating_rep(expected)  << '\n';
+        std::cout << "  observed " << floating_rep(observed)  << '\n';
 
         std::cout.setf(std::ios_base::fixed, std::ios_base::floatfield);
         std::cout
diff --git a/round_to_test.cpp b/round_to_test.cpp
index cb69355..c61f02d 100644
--- a/round_to_test.cpp
+++ b/round_to_test.cpp
@@ -24,10 +24,10 @@
 #include "round_to.hpp"
 
 #include "fenv_lmi.hpp"
+#include "miscellany.hpp"               // floating_rep()
 #include "test_tools.hpp"
 
 #include <algorithm>                    // max()
-#include <cstddef>                      // size_t
 #include <ios>
 #include <iostream>
 #include <ostream>
@@ -109,56 +109,6 @@ void set_hardware_rounding_mode(e_ieee754_rounding mode, 
bool synchronize)
         }
 }
 
-// print_hex_val() bears the following copyright and permission:
-/* boost limits_test.cpp   test your <limits> file for important
- *
- * Copyright Jens Maurer 2000
- * Permission to use, copy, modify, sell, and distribute this software
- * is hereby granted without free [sic] provided that the above copyright 
notice
- * appears in all copies and that both that copyright notice and this
- * permission notice appear in supporting documentation,
- *
- * Jens Maurer makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- */
-// GWC modified the code as noted below, e.g. to print in byte-reversed
-// order as well, and made some trivial formatting changes.
-template<typename T>
-void print_hex_val(T t, char const* name)
-{
-  // GWC changed C cast to reinterpret_cast:
-  unsigned char const* p = reinterpret_cast<unsigned char const*>(&t);
-  std::cout << "hex value of " << name << " is: ";
-
-// GWC modifications begin
-  // For gcc with x87, sizeof(long double) == 12, but only
-  // ten bytes are significant--the other two are padding.
-  std::size_t size_of_T = sizeof(T);
-#if defined __GNUC__ && defined LMI_X87
-  if(12 == size_of_T)
-    size_of_T = 10;
-#endif // defined __GNUC__ && defined LMI_X87
-// GWC modifications end
-
-  for(unsigned int i = 0; i < size_of_T; ++i) { // modified by GWC
-    if(p[i] <= 0xF)
-      std::cout << "0";
-    // GWC changed C cast to static_cast:
-    std::cout << std::hex << static_cast<int>(p[i]);
-  }
-// GWC modifications begin
-  std::cout << " / ";
-  for(int i = size_of_T - 1; 0 <= i; --i) {
-    if(p[i] <= 0xF)
-      std::cout << "0";
-    std::cout << std::hex << static_cast<int>(p[i]);
-  }
-  std::cout << std::dec << std::endl;
-// GWC modifications end
-}
-
 template<typename RealType>
 bool test_one_case
     (RealType       unrounded
@@ -273,12 +223,9 @@ bool test_one_case
             ;
         std::cout << '\n';
 
-        std::cout << "  ";
-        print_hex_val(unrounded, "input   ");
-        std::cout << "  ";
-        print_hex_val(expected,  "expected");
-        std::cout << "  ";
-        print_hex_val(observed,  "observed");
+        std::cout << "  input    " << floating_rep(unrounded) << '\n';
+        std::cout << "  expected " << floating_rep(expected)  << '\n';
+        std::cout << "  observed " << floating_rep(observed)  << '\n';
 
         std::cout.setf(std::ios_base::fixed, std::ios_base::floatfield);
         std::cout