From 2f03003dcc402c65fc33ac6a5d28d868a27c1fdc Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 2 Mar 2018 20:38:50 +0000 Subject: [PATCH] PR libstdc++/84671 handle digit separators in duration literals PR libstdc++/84671 * include/bits/parse_numbers.h (_Number_help): Add partial specialization to handle digit separators. Adjust partial specialization for recursion temrination to require _Pow == 1ULL. * testsuite/20_util/duration/literals/84671.cc: New From-SVN: r258157 --- libstdc++-v3/ChangeLog | 8 ++++++ libstdc++-v3/include/bits/parse_numbers.h | 12 ++++++--- .../20_util/duration/literals/84671.cc | 26 +++++++++++++++++++ 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 libstdc++-v3/testsuite/20_util/duration/literals/84671.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 05deec4f98e..e38def1b850 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2018-03-02 Jonathan Wakely + + PR libstdc++/84671 + * include/bits/parse_numbers.h (_Number_help): Add partial + specialization to handle digit separators. Adjust partial + specialization for recursion temrination to require _Pow == 1ULL. + * testsuite/20_util/duration/literals/84671.cc: New + 2018-02-27 Ville Voutilainen Implement the missing bits of LWG 2769 diff --git a/libstdc++-v3/include/bits/parse_numbers.h b/libstdc++-v3/include/bits/parse_numbers.h index 51f1e42dddf..183f0e752e7 100644 --- a/libstdc++-v3/include/bits/parse_numbers.h +++ b/libstdc++-v3/include/bits/parse_numbers.h @@ -197,10 +197,16 @@ namespace __parse_int "integer literal does not fit in unsigned long long"); }; - template - struct _Number_help<_Base, _Pow, _Dig> + // Skip past digit separators: + template + struct _Number_help<_Base, _Pow, '\'', _Dig, _Digs...> + : _Number_help<_Base, _Pow, _Dig, _Digs...> + { }; + + // Terminating case for recursion: + template + struct _Number_help<_Base, 1ULL, _Dig> { - //static_assert(_Pow == 1U, "power should be one"); using type = __ull_constant<_Digit<_Base, _Dig>::value>; }; diff --git a/libstdc++-v3/testsuite/20_util/duration/literals/84671.cc b/libstdc++-v3/testsuite/20_util/duration/literals/84671.cc new file mode 100644 index 00000000000..4f50ec4c9cc --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/duration/literals/84671.cc @@ -0,0 +1,26 @@ +// Copyright (C) 2018 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-do compile { target c++14 } } + +#include + +// PR libstdc++/84671 +using namespace std::literals::chrono_literals; +constexpr auto ns_ok = 12113ns; +constexpr auto ns_fail = 12'11'3ns; +static_assert(ns_ok == ns_fail, "digit separators work in duration literals"); -- 2.30.2