[PATCH 2/5] libstdc++: Apply modifications to our local copy of fast_float

[Patrick Palka <ppalka@redhat.com>]

This performs the following modifications to our local copy of fast_float
in order to make it more readily usable in our std::from_chars
implementation:

  * Remove system #includes
  * Replace stray call to assert
  * Use the standard library chars_format and from_chars_result types

libstdc++-v3/ChangeLog:

	* src/c++17/fast_float/LOCAL_PATCHES: Update.
	* src/c++17/fast_float/ascii_number.h,
	src/c++17/fast_float/bigint.h,
	src/c++17/fast_float/decimal_to_binary.h,
	src/c++17/fast_float/digit_comparison.h,
	src/c++17/fast_float/fast_float.h,
	src/c++17/fast_float/fast_table.h,
	src/c++17/fast_float/float_common.h,
	src/c++17/fast_float/parse_number.h: Apply local modifications.
---
 libstdc++-v3/src/c++17/fast_float/LOCAL_PATCHES   |  1 +
 libstdc++-v3/src/c++17/fast_float/ascii_number.h  | 11 +++--------
 libstdc++-v3/src/c++17/fast_float/bigint.h        |  5 -----
 .../src/c++17/fast_float/decimal_to_binary.h      |  6 ------
 .../src/c++17/fast_float/digit_comparison.h       |  5 -----
 libstdc++-v3/src/c++17/fast_float/fast_float.h    | 15 ++-------------
 libstdc++-v3/src/c++17/fast_float/fast_table.h    |  2 --
 libstdc++-v3/src/c++17/fast_float/float_common.h  |  7 +------
 libstdc++-v3/src/c++17/fast_float/parse_number.h  |  5 -----
 9 files changed, 7 insertions(+), 50 deletions(-)

diff --git a/libstdc++-v3/src/c++17/fast_float/LOCAL_PATCHES b/libstdc++-v3/src/c++17/fast_float/LOCAL_PATCHES
index e69de29bb2d..e9d7bba6195 100644
--- a/libstdc++-v3/src/c++17/fast_float/LOCAL_PATCHES
+++ b/libstdc++-v3/src/c++17/fast_float/LOCAL_PATCHES
@@ -0,0 +1 @@
+r12-????
diff --git a/libstdc++-v3/src/c++17/fast_float/ascii_number.h b/libstdc++-v3/src/c++17/fast_float/ascii_number.h
index 3e6bb3e9ef3..c2f69326b2f 100644
--- a/libstdc++-v3/src/c++17/fast_float/ascii_number.h
+++ b/libstdc++-v3/src/c++17/fast_float/ascii_number.h
@@ -1,11 +1,6 @@
 #ifndef FASTFLOAT_ASCII_NUMBER_H
 #define FASTFLOAT_ASCII_NUMBER_H
 
-#include <cctype>
-#include <cstdint>
-#include <cstring>
-#include <iterator>
-
 #include "float_common.h"
 
 namespace fast_float {
@@ -144,7 +139,7 @@ parsed_number_string parse_number_string(const char *p, const char *pend, parse_
     return answer;
   }
   int64_t exp_number = 0;            // explicit exponential part
-  if ((fmt & chars_format::scientific) && (p != pend) && (('e' == *p) || ('E' == *p))) {
+  if (bool(fmt & chars_format::scientific) && (p != pend) && (('e' == *p) || ('E' == *p))) {
     const char * location_of_e = p;
     ++p;
     bool neg_exp = false;
@@ -155,7 +150,7 @@ parsed_number_string parse_number_string(const char *p, const char *pend, parse_
       ++p;
     }
     if ((p == pend) || !is_integer(*p)) {
-      if(!(fmt & chars_format::fixed)) {
+      if(!bool(fmt & chars_format::fixed)) {
         // We are in error.
         return answer;
       }
@@ -174,7 +169,7 @@ parsed_number_string parse_number_string(const char *p, const char *pend, parse_
     }
   } else {
     // If it scientific and not fixed, we have to bail out.
-    if((fmt & chars_format::scientific) && !(fmt & chars_format::fixed)) { return answer; }
+    if(bool(fmt & chars_format::scientific) && !bool(fmt & chars_format::fixed)) { return answer; }
   }
   answer.lastmatch = p;
   answer.valid = true;
diff --git a/libstdc++-v3/src/c++17/fast_float/bigint.h b/libstdc++-v3/src/c++17/fast_float/bigint.h
index b56cb9b03b3..5c9552cab4c 100644
--- a/libstdc++-v3/src/c++17/fast_float/bigint.h
+++ b/libstdc++-v3/src/c++17/fast_float/bigint.h
@@ -1,11 +1,6 @@
 #ifndef FASTFLOAT_BIGINT_H
 #define FASTFLOAT_BIGINT_H
 
-#include <algorithm>
-#include <cstdint>
-#include <climits>
-#include <cstring>
-
 #include "float_common.h"
 
 namespace fast_float {
diff --git a/libstdc++-v3/src/c++17/fast_float/decimal_to_binary.h b/libstdc++-v3/src/c++17/fast_float/decimal_to_binary.h
index 6da6c66a3ac..26343c4cd20 100644
--- a/libstdc++-v3/src/c++17/fast_float/decimal_to_binary.h
+++ b/libstdc++-v3/src/c++17/fast_float/decimal_to_binary.h
@@ -3,12 +3,6 @@
 
 #include "float_common.h"
 #include "fast_table.h"
-#include <cfloat>
-#include <cinttypes>
-#include <cmath>
-#include <cstdint>
-#include <cstdlib>
-#include <cstring>
 
 namespace fast_float {
 
diff --git a/libstdc++-v3/src/c++17/fast_float/digit_comparison.h b/libstdc++-v3/src/c++17/fast_float/digit_comparison.h
index 7ffe874303b..4af465420c9 100644
--- a/libstdc++-v3/src/c++17/fast_float/digit_comparison.h
+++ b/libstdc++-v3/src/c++17/fast_float/digit_comparison.h
@@ -1,11 +1,6 @@
 #ifndef FASTFLOAT_DIGIT_COMPARISON_H
 #define FASTFLOAT_DIGIT_COMPARISON_H
 
-#include <algorithm>
-#include <cstdint>
-#include <cstring>
-#include <iterator>
-
 #include "float_common.h"
 #include "bigint.h"
 #include "ascii_number.h"
diff --git a/libstdc++-v3/src/c++17/fast_float/fast_float.h b/libstdc++-v3/src/c++17/fast_float/fast_float.h
index 3c483803af3..a4b967f5dd7 100644
--- a/libstdc++-v3/src/c++17/fast_float/fast_float.h
+++ b/libstdc++-v3/src/c++17/fast_float/fast_float.h
@@ -1,21 +1,10 @@
 #ifndef FASTFLOAT_FAST_FLOAT_H
 #define FASTFLOAT_FAST_FLOAT_H
 
-#include <system_error>
-
 namespace fast_float {
-enum chars_format {
-    scientific = 1<<0,
-    fixed = 1<<2,
-    hex = 1<<3,
-    general = fixed | scientific
-};
 
-
-struct from_chars_result {
-  const char *ptr;
-  std::errc ec;
-};
+using std::chars_format;
+using std::from_chars_result;
 
 struct parse_options {
   constexpr explicit parse_options(chars_format fmt = chars_format::general,
diff --git a/libstdc++-v3/src/c++17/fast_float/fast_table.h b/libstdc++-v3/src/c++17/fast_float/fast_table.h
index 5766274ca41..5e0faf71d6a 100644
--- a/libstdc++-v3/src/c++17/fast_float/fast_table.h
+++ b/libstdc++-v3/src/c++17/fast_float/fast_table.h
@@ -1,8 +1,6 @@
 #ifndef FASTFLOAT_FAST_TABLE_H
 #define FASTFLOAT_FAST_TABLE_H
 
-#include <cstdint>
-
 namespace fast_float {
 
 /**
diff --git a/libstdc++-v3/src/c++17/fast_float/float_common.h b/libstdc++-v3/src/c++17/fast_float/float_common.h
index c8e7e4fc99e..e2b50cb3e69 100644
--- a/libstdc++-v3/src/c++17/fast_float/float_common.h
+++ b/libstdc++-v3/src/c++17/fast_float/float_common.h
@@ -1,11 +1,6 @@
 #ifndef FASTFLOAT_FLOAT_COMMON_H
 #define FASTFLOAT_FLOAT_COMMON_H
 
-#include <cfloat>
-#include <cstdint>
-#include <cassert>
-#include <cstring>
-
 #if (defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)   \
        || defined(__amd64) || defined(__aarch64__) || defined(_M_ARM64) \
        || defined(__MINGW64__)                                          \
@@ -129,7 +124,7 @@ struct value128 {
 
 /* result might be undefined when input_num is zero */
 fastfloat_really_inline int leading_zeroes(uint64_t input_num) {
-  assert(input_num > 0);
+  FASTFLOAT_DEBUG_ASSERT(input_num > 0);
 #ifdef FASTFLOAT_VISUAL_STUDIO
   #if defined(_M_X64) || defined(_M_ARM64)
   unsigned long leading_zero = 0;
diff --git a/libstdc++-v3/src/c++17/fast_float/parse_number.h b/libstdc++-v3/src/c++17/fast_float/parse_number.h
index 62ae3b039e6..86dea2287b4 100644
--- a/libstdc++-v3/src/c++17/fast_float/parse_number.h
+++ b/libstdc++-v3/src/c++17/fast_float/parse_number.h
@@ -5,11 +5,6 @@
 #include "decimal_to_binary.h"
 #include "digit_comparison.h"
 
-#include <cmath>
-#include <cstring>
-#include <limits>
-#include <system_error>
-
 namespace fast_float {
 
 
-- 
2.34.0