From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.151.124]) by sourceware.org (Postfix) with ESMTPS id 09F663858406 for ; Fri, 19 Nov 2021 21:47:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 09F663858406 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-2-S2X-Y6B-MeKxYsJOZodyEw-1; Fri, 19 Nov 2021 16:47:12 -0500 X-MC-Unique: S2X-Y6B-MeKxYsJOZodyEw-1 Received: by mail-qk1-f199.google.com with SMTP id u8-20020a05620a454800b00468482aac5dso8941294qkp.18 for ; Fri, 19 Nov 2021 13:47:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:to:cc:subject:in-reply-to:message-id :references:mime-version; bh=nnYk1uBuDF5tOl0aPrtZpSEaRjE7Rc6tuLjK+0w0bGw=; b=Fw+o6rMBw3529B5HzbZgmhUledgV+K3WE1D+9OXZlazUzSXt95rBTUm8vcFRK+i7Pg 1Sq36yucfT/9yYTFXwB05OXsk02L2ApgoZwtCq5WB9+hm6HSdbC2VhE6oBIaFQHf7aLl OH9pXLaVxgWkqurD8B5kdSM4Vn3WsRvVRYLd/fRVXP0gDTtIKPL0+ysBIqEMhVP8dx7p p/6DSlh4wOAvCvT1sxoEBgB1Q1G3sPqUpSqkw8sbB510JfyWralczuVUC+Hkd4N8ULjn 1uSxeO29obDA4g2Ce+/tUT8A/QCcWC3cWuSGGrEIuAGRSbK8W9ElnQl7e8i1HFaYgxNt ihWQ== X-Gm-Message-State: AOAM5320Pft6FKKW/YfbxdG9ztBKfaVkTwOKY2NfMCqqfm8qXLQh9w2G u2mZu87MOj4xbe5QH5ahKgivDRt2wTP7rCJ2c7btx4yRpoUUrQE9IatyffEbCVadiFq03TgPwCI KQyIFguc5AdQewMQ= X-Received: by 2002:a05:622a:d3:: with SMTP id p19mr9792929qtw.37.1637358432383; Fri, 19 Nov 2021 13:47:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJzqsCL676CC4itOHfYTcVSmSkM8kqjxxApgw77qlrqVhCWH8KuRiP5j8MxkSuElXTeIFfgIAg== X-Received: by 2002:a05:622a:d3:: with SMTP id p19mr9792904qtw.37.1637358432147; Fri, 19 Nov 2021 13:47:12 -0800 (PST) Received: from [192.168.1.130] (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id j20sm527503qtj.43.2021.11.19.13.47.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Nov 2021 13:47:11 -0800 (PST) From: Patrick Palka X-Google-Original-From: Patrick Palka Date: Fri, 19 Nov 2021 16:47:10 -0500 (EST) To: Patrick Palka cc: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: Re: [PATCH 2/5] libstdc++: Apply modifications to our local copy of fast_float In-Reply-To: <20211116002505.2324582-2-ppalka@redhat.com> Message-ID: <7d93f199-1c8f-3af0-cf34-3947377f8f5e@idea> References: <20211116002505.2324582-1-ppalka@redhat.com> <20211116002505.2324582-2-ppalka@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-15.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Nov 2021 21:47:17 -0000 On Mon, 15 Nov 2021, Patrick Palka wrote: > 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. v2: Now in terms of the amalgamated version of the library. -- >8 -- Subject: [PATCH 2/5] libstdc++: Apply modifications to our local copy of fast_float 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/fast_float.h: Apply local modifications. --- .../src/c++17/fast_float/LOCAL_PATCHES | 1 + .../src/c++17/fast_float/fast_float.h | 62 ++----------------- 2 files changed, 7 insertions(+), 56 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/fast_float.h b/libstdc++-v3/src/c++17/fast_float/fast_float.h index 8a45ebca8a8..c908719ec3a 100644 --- a/libstdc++-v3/src/c++17/fast_float/fast_float.h +++ b/libstdc++-v3/src/c++17/fast_float/fast_float.h @@ -42,21 +42,10 @@ #ifndef FASTFLOAT_FAST_FLOAT_H #define FASTFLOAT_FAST_FLOAT_H -#include - 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, @@ -105,11 +94,6 @@ from_chars_result from_chars_advanced(const char *first, const char *last, #ifndef FASTFLOAT_FLOAT_COMMON_H #define FASTFLOAT_FLOAT_COMMON_H -#include -#include -#include -#include - #if (defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) \ || defined(__amd64) || defined(__aarch64__) || defined(_M_ARM64) \ || defined(__MINGW64__) \ @@ -233,7 +217,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; @@ -468,11 +452,6 @@ fastfloat_really_inline void to_float(bool negative, adjusted_mantissa am, T &va #ifndef FASTFLOAT_ASCII_NUMBER_H #define FASTFLOAT_ASCII_NUMBER_H -#include -#include -#include -#include - namespace fast_float { @@ -610,7 +589,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; @@ -621,7 +600,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; } @@ -640,7 +619,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; @@ -699,8 +678,6 @@ parsed_number_string parse_number_string(const char *p, const char *pend, parse_ #ifndef FASTFLOAT_FAST_TABLE_H #define FASTFLOAT_FAST_TABLE_H -#include - namespace fast_float { /** @@ -1399,13 +1376,6 @@ using powers = powers_template<>; #ifndef FASTFLOAT_DECIMAL_TO_BINARY_H #define FASTFLOAT_DECIMAL_TO_BINARY_H -#include -#include -#include -#include -#include -#include - namespace fast_float { // This will compute or rather approximate w * 5**q and return a pair of 64-bit words approximating @@ -1592,11 +1562,6 @@ adjusted_mantissa compute_float(int64_t q, uint64_t w) noexcept { #ifndef FASTFLOAT_BIGINT_H #define FASTFLOAT_BIGINT_H -#include -#include -#include -#include - namespace fast_float { @@ -2182,11 +2147,6 @@ struct bigint { #ifndef FASTFLOAT_ASCII_NUMBER_H #define FASTFLOAT_ASCII_NUMBER_H -#include -#include -#include -#include - namespace fast_float { @@ -2413,11 +2373,6 @@ parsed_number_string parse_number_string(const char *p, const char *pend, parse_ #ifndef FASTFLOAT_DIGIT_COMPARISON_H #define FASTFLOAT_DIGIT_COMPARISON_H -#include -#include -#include -#include - namespace fast_float { @@ -2835,11 +2790,6 @@ inline adjusted_mantissa digit_comp(parsed_number_string& num, adjusted_mantissa #define FASTFLOAT_PARSE_NUMBER_H -#include -#include -#include -#include - namespace fast_float { -- 2.34.0