| Message ID | 20190103203846.GA30508@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | PR libstdc++/88607 replace or remove unnecessary UTF-8 characters | expand |
On 03/01/19 20:38 +0000, Jonathan Wakely wrote: >There are a number of UTF-8 characters in comments which add no value >and can be replaced with ASCII equivalents, or removed entirely for the >section sign (U+00A7). > > PR libstdc++/88607 > * include/bits/forward_list.h: Replace UTF-8 "ligature fi" character. > * include/debug/forward_list: Likewise. > * include/experimental/bits/shared_ptr.h: Remove UTF-8 "section sign" > character. > * include/experimental/chrono: Likewise. > * include/experimental/functional: Likewise. > * include/experimental/ratio: Likewise. > * include/experimental/system_error: Likewise. > * include/experimental/tuple: Likewise. > * include/experimental/type_traits: Likewise. > * include/parallel/workstealing.h: Replace UTF-8 "en dash" character. > * include/parallel/multiseq_selection.h: Likewise. This replaces some more non-ASCII characters. Tested powerpc64-linux, committed to trunk. commit e539e235bc31bfe1011ad3cd5df14d827f387c33 Author: Jonathan Wakely <jwakely@redhat.com> Date: Thu Jan 3 21:56:50 2019 +0000 PR libstdc++/88607 replace some more UTF-8 characters 2019-01-03 Jonathan Wakely <jwakely@redhat.com> Jakub Jelinek <jakub@redhat.com> PR libstdc++/88607 * include/experimental/memory: Replace UTF-8 quote characters. * include/std/future: Replace UTF-8 "em dash" characters. diff --git a/libstdc++-v3/include/experimental/memory b/libstdc++-v3/include/experimental/memory index 955f83072b9..b8faeb23eef 100644 --- a/libstdc++-v3/include/experimental/memory +++ b/libstdc++-v3/include/experimental/memory @@ -63,12 +63,12 @@ inline namespace fundamentals_v2 using __reference = add_lvalue_reference_t<_Tp>; // exposition-only // 3.2.2, observer_ptr constructors - // default c’tor + // default c'tor constexpr observer_ptr() noexcept : __t() { } - // pointer-accepting c’tors + // pointer-accepting c'tors constexpr observer_ptr(nullptr_t) noexcept : __t() { } @@ -77,7 +77,7 @@ inline namespace fundamentals_v2 : __t(__p) { } - // copying c’tors (in addition to compiler-generated copy c’tor) + // copying c'tors (in addition to compiler-generated copy c'tor) template <typename _Up, typename = typename enable_if< is_convertible<typename add_pointer<_Up>::type, __pointer diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index 2b60c58f3bc..6cafde5ee6a 100644 --- a/libstdc++-v3/include/std/future +++ b/libstdc++-v3/include/std/future @@ -1629,11 +1629,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // // [futures.async]: // - // — a call to a waiting function on an asynchronous return object that + // - a call to a waiting function on an asynchronous return object that // shares the shared state created by this async call shall block until // the associated thread has completed, as if joined, or else time out. // - // — the associated thread completion synchronizes with the return from + // - the associated thread completion synchronizes with the return from // the first function that successfully detects the ready status of the // shared state or with the return from the last function that releases // the shared state, whichever happens first.
On 03/01/19 22:07 +0000, Jonathan Wakely wrote: >On 03/01/19 20:38 +0000, Jonathan Wakely wrote: >>There are a number of UTF-8 characters in comments which add no value >>and can be replaced with ASCII equivalents, or removed entirely for the >>section sign (U+00A7). >> >> PR libstdc++/88607 >> * include/bits/forward_list.h: Replace UTF-8 "ligature fi" character. >> * include/debug/forward_list: Likewise. >> * include/experimental/bits/shared_ptr.h: Remove UTF-8 "section sign" >> character. >> * include/experimental/chrono: Likewise. >> * include/experimental/functional: Likewise. >> * include/experimental/ratio: Likewise. >> * include/experimental/system_error: Likewise. >> * include/experimental/tuple: Likewise. >> * include/experimental/type_traits: Likewise. >> * include/parallel/workstealing.h: Replace UTF-8 "en dash" character. >> * include/parallel/multiseq_selection.h: Likewise. > >This replaces some more non-ASCII characters. > >Tested powerpc64-linux, committed to trunk. The tests added by this patch would probably be a good idea, but I'm not sure if -finput-charset=ascii works for all targets. commit 53a31b41d06059fdaf1f09fd66f5d9e219246759 Author: Jonathan Wakely <jwakely@redhat.com> Date: Thu Jan 3 22:18:14 2019 +0000 PR libstdc++/88607 add tests using -finput-charset=ascii This verifies that the <bits/extc++.h> header can be compiled with ASCII as the input character set. PR libstdc++/88607 * testsuite/17_intro/headers/c++1998/charset.cc: New test. * testsuite/17_intro/headers/c++2011/charset.cc: New test. * testsuite/17_intro/headers/c++2014/charset.cc: New test. * testsuite/17_intro/headers/c++2017/charset.cc: New test. * testsuite/17_intro/headers/c++2020/charset.cc: New test. diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++1998/charset.cc b/libstdc++-v3/testsuite/17_intro/headers/c++1998/charset.cc new file mode 100644 index 00000000000..864c64ef831 --- /dev/null +++ b/libstdc++-v3/testsuite/17_intro/headers/c++1998/charset.cc @@ -0,0 +1,4 @@ +// { dg-options "-finput-charset=ascii" } +// { dg-do compile } + +#include <bits/extc++.h> diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2011/charset.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2011/charset.cc new file mode 100644 index 00000000000..864c64ef831 --- /dev/null +++ b/libstdc++-v3/testsuite/17_intro/headers/c++2011/charset.cc @@ -0,0 +1,4 @@ +// { dg-options "-finput-charset=ascii" } +// { dg-do compile } + +#include <bits/extc++.h> diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2014/charset.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2014/charset.cc new file mode 100644 index 00000000000..864c64ef831 --- /dev/null +++ b/libstdc++-v3/testsuite/17_intro/headers/c++2014/charset.cc @@ -0,0 +1,4 @@ +// { dg-options "-finput-charset=ascii" } +// { dg-do compile } + +#include <bits/extc++.h> diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2017/charset.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2017/charset.cc new file mode 100644 index 00000000000..864c64ef831 --- /dev/null +++ b/libstdc++-v3/testsuite/17_intro/headers/c++2017/charset.cc @@ -0,0 +1,4 @@ +// { dg-options "-finput-charset=ascii" } +// { dg-do compile } + +#include <bits/extc++.h> diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2020/charset.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2020/charset.cc new file mode 100644 index 00000000000..864c64ef831 --- /dev/null +++ b/libstdc++-v3/testsuite/17_intro/headers/c++2020/charset.cc @@ -0,0 +1,4 @@ +// { dg-options "-finput-charset=ascii" } +// { dg-do compile } + +#include <bits/extc++.h>
On 03/01/19 22:44 +0000, Jonathan Wakely wrote: >On 03/01/19 22:07 +0000, Jonathan Wakely wrote: >>On 03/01/19 20:38 +0000, Jonathan Wakely wrote: >>>There are a number of UTF-8 characters in comments which add no value >>>and can be replaced with ASCII equivalents, or removed entirely for the >>>section sign (U+00A7). >>> >>> PR libstdc++/88607 >>> * include/bits/forward_list.h: Replace UTF-8 "ligature fi" character. >>> * include/debug/forward_list: Likewise. >>> * include/experimental/bits/shared_ptr.h: Remove UTF-8 "section sign" >>> character. >>> * include/experimental/chrono: Likewise. >>> * include/experimental/functional: Likewise. >>> * include/experimental/ratio: Likewise. >>> * include/experimental/system_error: Likewise. >>> * include/experimental/tuple: Likewise. >>> * include/experimental/type_traits: Likewise. >>> * include/parallel/workstealing.h: Replace UTF-8 "en dash" character. >>> * include/parallel/multiseq_selection.h: Likewise. >> >>This replaces some more non-ASCII characters. >> >>Tested powerpc64-linux, committed to trunk. > >The tests added by this patch would probably be a good idea, but I'm >not sure if -finput-charset=ascii works for all targets. This is committed to trunk now. If some targets fail the test we can deal with them as needed. >commit 53a31b41d06059fdaf1f09fd66f5d9e219246759 >Author: Jonathan Wakely <jwakely@redhat.com> >Date: Thu Jan 3 22:18:14 2019 +0000 > > PR libstdc++/88607 add tests using -finput-charset=ascii > > This verifies that the <bits/extc++.h> header can be compiled with ASCII > as the input character set. > > PR libstdc++/88607 > * testsuite/17_intro/headers/c++1998/charset.cc: New test. > * testsuite/17_intro/headers/c++2011/charset.cc: New test. > * testsuite/17_intro/headers/c++2014/charset.cc: New test. > * testsuite/17_intro/headers/c++2017/charset.cc: New test. > * testsuite/17_intro/headers/c++2020/charset.cc: New test. > >diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++1998/charset.cc b/libstdc++-v3/testsuite/17_intro/headers/c++1998/charset.cc >new file mode 100644 >index 00000000000..864c64ef831 >--- /dev/null >+++ b/libstdc++-v3/testsuite/17_intro/headers/c++1998/charset.cc >@@ -0,0 +1,4 @@ >+// { dg-options "-finput-charset=ascii" } >+// { dg-do compile } >+ >+#include <bits/extc++.h> >diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2011/charset.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2011/charset.cc >new file mode 100644 >index 00000000000..864c64ef831 >--- /dev/null >+++ b/libstdc++-v3/testsuite/17_intro/headers/c++2011/charset.cc >@@ -0,0 +1,4 @@ >+// { dg-options "-finput-charset=ascii" } >+// { dg-do compile } >+ >+#include <bits/extc++.h> >diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2014/charset.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2014/charset.cc >new file mode 100644 >index 00000000000..864c64ef831 >--- /dev/null >+++ b/libstdc++-v3/testsuite/17_intro/headers/c++2014/charset.cc >@@ -0,0 +1,4 @@ >+// { dg-options "-finput-charset=ascii" } >+// { dg-do compile } >+ >+#include <bits/extc++.h> >diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2017/charset.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2017/charset.cc >new file mode 100644 >index 00000000000..864c64ef831 >--- /dev/null >+++ b/libstdc++-v3/testsuite/17_intro/headers/c++2017/charset.cc >@@ -0,0 +1,4 @@ >+// { dg-options "-finput-charset=ascii" } >+// { dg-do compile } >+ >+#include <bits/extc++.h> >diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2020/charset.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2020/charset.cc >new file mode 100644 >index 00000000000..864c64ef831 >--- /dev/null >+++ b/libstdc++-v3/testsuite/17_intro/headers/c++2020/charset.cc >@@ -0,0 +1,4 @@ >+// { dg-options "-finput-charset=ascii" } >+// { dg-do compile } >+ >+#include <bits/extc++.h>
diff --git a/libstdc++-v3/include/bits/forward_list.h b/libstdc++-v3/include/bits/forward_list.h index 1ccad5f6f21..4741c43376c 100644 --- a/libstdc++-v3/include/bits/forward_list.h +++ b/libstdc++-v3/include/bits/forward_list.h @@ -809,7 +809,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER return *__front->_M_valptr(); } - // 23.3.4.5 modifiers: + // 23.3.4.5 modifiers: /** * @brief Constructs object in %forward_list at the front of the diff --git a/libstdc++-v3/include/debug/forward_list b/libstdc++-v3/include/debug/forward_list index 1af792c9798..e30b000009e 100644 --- a/libstdc++-v3/include/debug/forward_list +++ b/libstdc++-v3/include/debug/forward_list @@ -369,7 +369,7 @@ namespace __debug return _Base::front(); } - // modifiers: + // modifiers: using _Base::emplace_front; using _Base::push_front; diff --git a/libstdc++-v3/include/experimental/bits/shared_ptr.h b/libstdc++-v3/include/experimental/bits/shared_ptr.h index 01962f2c07a..65df4dd7e3b 100644 --- a/libstdc++-v3/include/experimental/bits/shared_ptr.h +++ b/libstdc++-v3/include/experimental/bits/shared_ptr.h @@ -157,10 +157,10 @@ inline namespace fundamentals_v2 constexpr shared_ptr(nullptr_t __p) : _Base_type(__p) { } - // C++14 §20.8.2.2 + // C++14 20.8.2.2 ~shared_ptr() = default; - // C++14 §20.8.2.3 + // C++14 20.8.2.3 shared_ptr& operator=(const shared_ptr&) noexcept = default; template <typename _Tp1> @@ -204,7 +204,7 @@ inline namespace fundamentals_v2 return *this; } - // C++14 §20.8.2.2.4 + // C++14 20.8.2.2.4 // swap & reset // 8.2.1.2 shared_ptr observers // in __shared_ptr @@ -255,7 +255,7 @@ inline namespace fundamentals_v2 { } }; - // C++14 §20.8.2.2.7 //DOING + // C++14 20.8.2.2.7 template<typename _Tp1, typename _Tp2> bool operator==(const shared_ptr<_Tp1>& __a, const shared_ptr<_Tp2>& __b) noexcept @@ -368,7 +368,7 @@ inline namespace fundamentals_v2 operator>=(nullptr_t, const shared_ptr<_Tp>& __a) noexcept { return !(nullptr < __a); } - // C++14 §20.8.2.2.8 + // C++14 20.8.2.2.8 template<typename _Tp> inline void swap(shared_ptr<_Tp>& __a, shared_ptr<_Tp>& __b) noexcept @@ -409,7 +409,7 @@ inline namespace fundamentals_v2 return shared_ptr<_Tp>(__r, reinterpret_cast<__elem_t*>(__r.get())); } - // C++14 §20.8.2.3 + // C++14 20.8.2.3 template<typename _Tp> class weak_ptr : public __weak_ptr<_Tp> { @@ -474,19 +474,19 @@ inline namespace fundamentals_v2 friend class enable_shared_from_this<_Tp>; }; - // C++14 §20.8.2.3.6 + // C++14 20.8.2.3.6 template<typename _Tp> inline void swap(weak_ptr<_Tp>& __a, weak_ptr<_Tp>& __b) noexcept { __a.swap(__b); } - /// C++14 §20.8.2.2.10 + /// C++14 20.8.2.2.10 template<typename _Del, typename _Tp> inline _Del* get_deleter(const shared_ptr<_Tp>& __p) noexcept { return std::get_deleter<_Del>(__p); } - // C++14 §20.8.2.2.11 + // C++14 20.8.2.2.11 template<typename _Ch, typename _Tr, typename _Tp> inline std::basic_ostream<_Ch, _Tr>& operator<<(std::basic_ostream<_Ch, _Tr>& __os, const shared_ptr<_Tp>& __p) @@ -495,7 +495,7 @@ inline namespace fundamentals_v2 return __os; } - // C++14 §20.8.2.4 + // C++14 20.8.2.4 template<typename _Tp = void> class owner_less; /// Partial specialization of owner_less for shared_ptr. @@ -540,7 +540,7 @@ inline namespace fundamentals_v2 typedef void is_transparent; }; - // C++14 §20.8.2.6 + // C++14 20.8.2.6 template<typename _Tp> inline bool atomic_is_lock_free(const shared_ptr<_Tp>* __p) diff --git a/libstdc++-v3/include/experimental/chrono b/libstdc++-v3/include/experimental/chrono index 1870abcf34d..90fb39f7582 100644 --- a/libstdc++-v3/include/experimental/chrono +++ b/libstdc++-v3/include/experimental/chrono @@ -49,7 +49,7 @@ namespace experimental { inline namespace fundamentals_v1 { -// See C++14 §20.12.4, customization traits +// See C++14 20.12.4, customization traits template <typename _Rep> constexpr bool treat_as_floating_point_v = treat_as_floating_point<_Rep>::value; diff --git a/libstdc++-v3/include/experimental/functional b/libstdc++-v3/include/experimental/functional index 3b36898cb3f..90f2652c29b 100644 --- a/libstdc++-v3/include/experimental/functional +++ b/libstdc++-v3/include/experimental/functional @@ -53,7 +53,7 @@ namespace experimental { inline namespace fundamentals_v1 { - // See C++14 §20.9.9, Function object binders + // See C++14 20.9.9, Function object binders /// Variable template for std::is_bind_expression template<typename _Tp> diff --git a/libstdc++-v3/include/experimental/ratio b/libstdc++-v3/include/experimental/ratio index 2aa877ba191..6129d1ea36a 100644 --- a/libstdc++-v3/include/experimental/ratio +++ b/libstdc++-v3/include/experimental/ratio @@ -48,7 +48,7 @@ namespace experimental { inline namespace fundamentals_v1 { -// See C++14 §20.11.5, ratio comparison +// See C++14 20.11.5, ratio comparison template <typename _R1, typename _R2> constexpr bool ratio_equal_v = ratio_equal<_R1, _R2>::value; template <typename _R1, typename _R2> diff --git a/libstdc++-v3/include/experimental/system_error b/libstdc++-v3/include/experimental/system_error index 63c2073e15b..73640a40161 100644 --- a/libstdc++-v3/include/experimental/system_error +++ b/libstdc++-v3/include/experimental/system_error @@ -48,7 +48,7 @@ namespace experimental { inline namespace fundamentals_v1 { -// See C++14 §19.5, System error support +// See C++14 19.5, System error support template <typename _Tp> constexpr bool is_error_code_enum_v = is_error_code_enum<_Tp>::value; template <typename _Tp> diff --git a/libstdc++-v3/include/experimental/tuple b/libstdc++-v3/include/experimental/tuple index 2649daf3b3a..be42b588131 100644 --- a/libstdc++-v3/include/experimental/tuple +++ b/libstdc++-v3/include/experimental/tuple @@ -45,7 +45,7 @@ namespace experimental { inline namespace fundamentals_v1 { - // See C++14 §20.4.2.5, tuple helper classes + // See C++14 20.4.2.5, tuple helper classes template <typename _Tp> constexpr size_t tuple_size_v = tuple_size<_Tp>::value; diff --git a/libstdc++-v3/include/experimental/type_traits b/libstdc++-v3/include/experimental/type_traits index d52cf0682cb..ab1ba92c3c6 100644 --- a/libstdc++-v3/include/experimental/type_traits +++ b/libstdc++-v3/include/experimental/type_traits @@ -50,7 +50,7 @@ inline namespace fundamentals_v1 { #define __cpp_lib_experimental_type_trait_variable_templates 201402 -// See C++14 §20.10.4.1, primary type categories +// See C++14 20.10.4.1, primary type categories template <typename _Tp> constexpr bool is_void_v = is_void<_Tp>::value; template <typename _Tp> @@ -82,7 +82,7 @@ template <typename _Tp> template <typename _Tp> constexpr bool is_function_v = is_function<_Tp>::value; -// See C++14 §20.10.4.2, composite type categories +// See C++14 20.10.4.2, composite type categories template <typename _Tp> constexpr bool is_reference_v = is_reference<_Tp>::value; template <typename _Tp> @@ -98,7 +98,7 @@ template <typename _Tp> template <typename _Tp> constexpr bool is_member_pointer_v = is_member_pointer<_Tp>::value; -// See C++14 §20.10.4.3, type properties +// See C++14 20.10.4.3, type properties template <typename _Tp> constexpr bool is_const_v = is_const<_Tp>::value; template <typename _Tp> @@ -194,7 +194,7 @@ template <typename _Tp> constexpr bool has_virtual_destructor_v = has_virtual_destructor<_Tp>::value; -// See C++14 §20.10.5, type property queries +// See C++14 20.10.5, type property queries template <typename _Tp> constexpr size_t alignment_of_v = alignment_of<_Tp>::value; template <typename _Tp> @@ -202,7 +202,7 @@ template <typename _Tp> template <typename _Tp, unsigned _Idx = 0> constexpr size_t extent_v = extent<_Tp, _Idx>::value; -// See C++14 §20.10.6, type relations +// See C++14 20.10.6, type relations template <typename _Tp, typename _Up> constexpr bool is_same_v = is_same<_Tp, _Up>::value; template <typename _Base, typename _Derived> diff --git a/libstdc++-v3/include/parallel/multiseq_selection.h b/libstdc++-v3/include/parallel/multiseq_selection.h index 9988636e9b9..1f1678b1fe1 100644 --- a/libstdc++-v3/include/parallel/multiseq_selection.h +++ b/libstdc++-v3/include/parallel/multiseq_selection.h @@ -31,7 +31,7 @@ * * P. J. Varman, S. D. Scheufler, B. R. Iyer, and G. R. Ricard. * Merging Multiple Lists on Hierarchical-Memory Multiprocessors. - * Journal of Parallel and Distributed Computing, 12(2):171–177, 1991. + * Journal of Parallel and Distributed Computing, 12(2):171-177, 1991. * * This file is a GNU parallel extension to the Standard C++ Library. */ diff --git a/libstdc++-v3/include/parallel/workstealing.h b/libstdc++-v3/include/parallel/workstealing.h index 6049d0fb496..de7283b456d 100644 --- a/libstdc++-v3/include/parallel/workstealing.h +++ b/libstdc++-v3/include/parallel/workstealing.h @@ -30,7 +30,7 @@ * * R. D. Blumofe and C. E. Leiserson. * Scheduling multithreaded computations by work stealing. - * Journal of the ACM, 46(5):720–748, 1999. + * Journal of the ACM, 46(5):720-748, 1999. * * This file is a GNU parallel extension to the Standard C++ Library. */
There are a number of UTF-8 characters in comments which add no value and can be replaced with ASCII equivalents, or removed entirely for the section sign (U+00A7). PR libstdc++/88607 * include/bits/forward_list.h: Replace UTF-8 "ligature fi" character. * include/debug/forward_list: Likewise. * include/experimental/bits/shared_ptr.h: Remove UTF-8 "section sign" character. * include/experimental/chrono: Likewise. * include/experimental/functional: Likewise. * include/experimental/ratio: Likewise. * include/experimental/system_error: Likewise. * include/experimental/tuple: Likewise. * include/experimental/type_traits: Likewise. * include/parallel/workstealing.h: Replace UTF-8 "en dash" character. * include/parallel/multiseq_selection.h: Likewise. Tested powerpc64-linux, committed to trunk. commit 5b93c250295edf46bc7e69b64fb4304e2ade4a1d Author: Jonathan Wakely <jwakely@redhat.com> Date: Thu Jan 3 20:22:30 2019 +0000 PR libstdc++/88607 replace or remove unnecessary UTF-8 characters There are a number of UTF-8 characters in comments which add no value and can be replaced with ASCII equivalents, or removed entirely for the section sign (U+00A7). PR libstdc++/88607 * include/bits/forward_list.h: Replace UTF-8 "ligature fi" character. * include/debug/forward_list: Likewise. * include/experimental/bits/shared_ptr.h: Remove UTF-8 "section sign" character. * include/experimental/chrono: Likewise. * include/experimental/functional: Likewise. * include/experimental/ratio: Likewise. * include/experimental/system_error: Likewise. * include/experimental/tuple: Likewise. * include/experimental/type_traits: Likewise. * include/parallel/workstealing.h: Replace UTF-8 "en dash" character. * include/parallel/multiseq_selection.h: Likewise.