diff --git a/libcxx/.clang-tidy b/libcxx/.clang-tidy --- a/libcxx/.clang-tidy +++ b/libcxx/.clang-tidy @@ -50,6 +50,10 @@ value: lower_case - key: readability-identifier-naming.LocalVariablePrefix value: __ + - key: readability-identifier-naming.PrivateMethodCase + value: lower_case + - key: readability-identifier-naming.PrivateMethodPrefix + value: __ # TODO: investigate these checks # bugprone-branch-clone, diff --git a/libcxx/include/__chrono/parser_std_format_spec.h b/libcxx/include/__chrono/parser_std_format_spec.h --- a/libcxx/include/__chrono/parser_std_format_spec.h +++ b/libcxx/include/__chrono/parser_std_format_spec.h @@ -285,11 +285,11 @@ break; case _CharT('E'): - __parse_modifier_E(__begin, __end, __flags); + __parse_modifier_e(__begin, __end, __flags); break; case _CharT('O'): - __parse_modifier_O(__begin, __end, __flags); + __parse_modifier_o(__begin, __end, __flags); break; case _CharT('z'): @@ -308,7 +308,7 @@ /// \pre *__begin == 'E' /// \post __begin is incremented by one. _LIBCPP_HIDE_FROM_ABI constexpr void - __parse_modifier_E(_ConstIterator& __begin, _ConstIterator __end, __flags __flags) { + __parse_modifier_e(_ConstIterator& __begin, _ConstIterator __end, __flags __flags) { ++__begin; if (__begin == __end) std::__throw_format_error("End of input while parsing the modifier E"); @@ -348,7 +348,7 @@ /// \pre *__begin == 'O' /// \post __begin is incremented by one. _LIBCPP_HIDE_FROM_ABI constexpr void - __parse_modifier_O(_ConstIterator& __begin, _ConstIterator __end, __flags __flags) { + __parse_modifier_o(_ConstIterator& __begin, _ConstIterator __end, __flags __flags) { ++__begin; if (__begin == __end) std::__throw_format_error("End of input while parsing the modifier O"); diff --git a/libcxx/include/__hash_table b/libcxx/include/__hash_table --- a/libcxx/include/__hash_table +++ b/libcxx/include/__hash_table @@ -934,7 +934,7 @@ // --- Member data end --- _LIBCPP_INLINE_VISIBILITY - size_type& size() _NOEXCEPT {return __p2_.first();} + size_type& __size() _NOEXCEPT {return __p2_.first();} public: _LIBCPP_INLINE_VISIBILITY size_type size() const _NOEXCEPT {return __p2_.first();} @@ -1436,7 +1436,7 @@ __bucket_list_[std::__constrain_hash(__p1_.first().__next_->__hash(), bucket_count())] = __p1_.first().__ptr(); __u.__p1_.first().__next_ = nullptr; - __u.size() = 0; + __u.__size() = 0; } } @@ -1453,14 +1453,14 @@ __bucket_list_.reset(__u.__bucket_list_.release()); __bucket_list_.get_deleter().size() = __u.__bucket_list_.get_deleter().size(); __u.__bucket_list_.get_deleter().size() = 0; - if (__u.size() > 0) + if (__u.__size() > 0) { __p1_.first().__next_ = __u.__p1_.first().__next_; __u.__p1_.first().__next_ = nullptr; __bucket_list_[std::__constrain_hash(__p1_.first().__next_->__hash(), bucket_count())] = __p1_.first().__ptr(); - size() = __u.size(); - __u.size() = 0; + size() = __u.__size(); + __u.__size() = 0; } } } @@ -1567,7 +1567,7 @@ __bucket_list_.get_deleter().size() = __u.__bucket_list_.get_deleter().size(); __u.__bucket_list_.get_deleter().size() = 0; __move_assign_alloc(__u); - size() = __u.size(); + size() = __u.__size(); hash_function() = _VSTD::move(__u.hash_function()); max_load_factor() = __u.max_load_factor(); key_eq() = _VSTD::move(__u.key_eq()); @@ -1577,7 +1577,7 @@ __bucket_list_[std::__constrain_hash(__p1_.first().__next_->__hash(), bucket_count())] = __p1_.first().__ptr(); __u.__p1_.first().__next_ = nullptr; - __u.size() = 0; + __u.__size() = 0; } std::__debug_db_swap(this, std::addressof(__u)); } @@ -1602,7 +1602,7 @@ { #endif // _LIBCPP_HAS_NO_EXCEPTIONS const_iterator __i = __u.begin(); - while (__cache != nullptr && __u.size() != 0) + while (__cache != nullptr && __u.__size() != 0) { __cache->__upcast()->__value_ = _VSTD::move(__u.remove(__i++)->__value_); @@ -1621,7 +1621,7 @@ __deallocate_node(__cache); } const_iterator __i = __u.begin(); - while (__u.size() != 0) + while (__u.__size() != 0) { __node_holder __h = __construct_node(_NodeTypes::__move(__u.remove(__i++)->__value_)); __node_insert_multi(__h.get()); @@ -2043,7 +2043,7 @@ } __nd = static_cast<__next_pointer>(__h.release()); // increment size - ++size(); + ++__size(); __inserted = true; } __done: @@ -2641,7 +2641,7 @@ if (size() > 0) __bucket_list_[std::__constrain_hash(__p1_.first().__next_->__hash(), bucket_count())] = __p1_.first().__ptr(); - if (__u.size() > 0) + if (__u.__size() > 0) __u.__bucket_list_[std::__constrain_hash(__u.__p1_.first().__next_->__hash(), __u.bucket_count())] = __u.__p1_.first().__ptr(); std::__debug_db_swap(this, std::addressof(__u)); diff --git a/libcxx/include/__locale b/libcxx/include/__locale --- a/libcxx/include/__locale +++ b/libcxx/include/__locale @@ -178,8 +178,10 @@ void __install_ctor(const locale&, facet*, long); static locale& __global(); + // NOLINTBEGIN(readability-identifier-naming) // These are in the dylib, so we can't just change the name bool has_facet(id&) const; const facet* use_facet(id&) const; + // NOLINTEND(readability-identifier-naming) template friend bool has_facet(const locale&) _NOEXCEPT; template friend const _Facet& use_facet(const locale&); diff --git a/libcxx/include/__memory_resource/memory_resource.h b/libcxx/include/__memory_resource/memory_resource.h --- a/libcxx/include/__memory_resource/memory_resource.h +++ b/libcxx/include/__memory_resource/memory_resource.h @@ -44,9 +44,11 @@ _LIBCPP_HIDE_FROM_ABI bool is_equal(const memory_resource& __other) const noexcept { return do_is_equal(__other); } private: + // NOLINTBEGIN(readability-identifier-naming) // These are visible, even though they are private virtual void* do_allocate(size_t, size_t) = 0; virtual void do_deallocate(void*, size_t, size_t) = 0; virtual bool do_is_equal(memory_resource const&) const noexcept = 0; + // NOLINTEND(readability-identifier-naming) }; // [mem.res.eq] diff --git a/libcxx/include/__random/linear_congruential_engine.h b/libcxx/include/__random/linear_congruential_engine.h --- a/libcxx/include/__random/linear_congruential_engine.h +++ b/libcxx/include/__random/linear_congruential_engine.h @@ -284,14 +284,14 @@ private: _LIBCPP_INLINE_VISIBILITY - void seed(true_type, true_type, result_type __s) {__x_ = __s == 0 ? 1 : __s;} + void __seed(true_type, true_type, result_type __s) {__x_ = __s == 0 ? 1 : __s;} _LIBCPP_INLINE_VISIBILITY - void seed(true_type, false_type, result_type __s) {__x_ = __s;} + void __seed(true_type, false_type, result_type __s) {__x_ = __s;} _LIBCPP_INLINE_VISIBILITY - void seed(false_type, true_type, result_type __s) {__x_ = __s % __m == 0 ? + void __seed(false_type, true_type, result_type __s) {__x_ = __s % __m == 0 ? 1 : __s % __m;} _LIBCPP_INLINE_VISIBILITY - void seed(false_type, false_type, result_type __s) {__x_ = __s % __m;} + void __seed(false_type, false_type, result_type __s) {__x_ = __s % __m;} template void __seed(_Sseq& __q, integral_constant); diff --git a/libcxx/include/__random/subtract_with_carry_engine.h b/libcxx/include/__random/subtract_with_carry_engine.h --- a/libcxx/include/__random/subtract_with_carry_engine.h +++ b/libcxx/include/__random/subtract_with_carry_engine.h @@ -155,8 +155,8 @@ private: - void seed(result_type __sd, integral_constant); - void seed(result_type __sd, integral_constant); + void __seed(result_type __sd, integral_constant); + void __seed(result_type __sd, integral_constant); template void __seed(_Sseq& __q, integral_constant); template @@ -178,7 +178,7 @@ template void -subtract_with_carry_engine<_UIntType, __w, __s, __r>::seed(result_type __sd, +subtract_with_carry_engine<_UIntType, __w, __s, __r>::__seed(result_type __sd, integral_constant) { linear_congruential_engine @@ -191,7 +191,7 @@ template void -subtract_with_carry_engine<_UIntType, __w, __s, __r>::seed(result_type __sd, +subtract_with_carry_engine<_UIntType, __w, __s, __r>::__seed(result_type __sd, integral_constant) { linear_congruential_engine diff --git a/libcxx/include/__tree b/libcxx/include/__tree --- a/libcxx/include/__tree +++ b/libcxx/include/__tree @@ -1085,7 +1085,7 @@ {return allocator_type(__node_alloc());} private: _LIBCPP_INLINE_VISIBILITY - size_type& size() _NOEXCEPT {return __pair3_.first();} + size_type& __size() _NOEXCEPT {return __pair3_.first();} public: _LIBCPP_INLINE_VISIBILITY const size_type& size() const _NOEXCEPT {return __pair3_.first();} @@ -1459,7 +1459,7 @@ template __node_holder __construct_node(_Args&& ...__args); - void destroy(__node_pointer __nd) _NOEXCEPT; + void __destroy(__node_pointer __nd) _NOEXCEPT; _LIBCPP_INLINE_VISIBILITY void __copy_assign_alloc(const __tree& __t) @@ -1518,11 +1518,11 @@ _LIBCPP_INLINE_VISIBILITY ~_DetachedTreeCache() { - __t_->destroy(__cache_elem_); + __t_->__destroy(__cache_elem_); if (__cache_root_) { while (__cache_root_->__parent_ != nullptr) __cache_root_ = static_cast<__node_pointer>(__cache_root_->__parent_); - __t_->destroy(__cache_root_); + __t_->__destroy(__cache_root_); } } @@ -1583,7 +1583,7 @@ __t->__begin_node() = __t->__end_node(); __t->__end_node()->__left_->__parent_ = nullptr; __t->__end_node()->__left_ = nullptr; - __t->size() = 0; + __t->__size() = 0; // __cache->__left_ == nullptr if (__cache->__right_ != nullptr) __cache = static_cast<__node_pointer>(__cache->__right_); @@ -1703,7 +1703,7 @@ __end_node()->__left_->__parent_ = static_cast<__parent_pointer>(__end_node()); __t.__begin_node() = __t.__end_node(); __t.__end_node()->__left_ = nullptr; - __t.size() = 0; + __t.__size() = 0; } } @@ -1714,17 +1714,17 @@ { if (__a == __t.__alloc()) { - if (__t.size() == 0) + if (__t.__size() == 0) __begin_node() = __end_node(); else { __begin_node() = __t.__begin_node(); __end_node()->__left_ = __t.__end_node()->__left_; __end_node()->__left_->__parent_ = static_cast<__parent_pointer>(__end_node()); - size() = __t.size(); + size() = __t.__size(); __t.__begin_node() = __t.__end_node(); __t.__end_node()->__left_ = nullptr; - __t.size() = 0; + __t.__size() = 0; } } else @@ -1739,7 +1739,7 @@ _NOEXCEPT_(is_nothrow_move_assignable::value && is_nothrow_move_assignable<__node_allocator>::value) { - destroy(static_cast<__node_pointer>(__end_node()->__left_)); + __destroy(static_cast<__node_pointer>(__end_node()->__left_)); __begin_node_ = __t.__begin_node_; __pair1_.first() = __t.__pair1_.first(); __move_assign_alloc(__t); @@ -1751,7 +1751,7 @@ __end_node()->__left_->__parent_ = static_cast<__parent_pointer>(__end_node()); __t.__begin_node() = __t.__end_node(); __t.__end_node()->__left_ = nullptr; - __t.size() = 0; + __t.__size() = 0; } } @@ -1768,13 +1768,13 @@ if (size() != 0) { _DetachedTreeCache __cache(this); - while (__cache.__get() != nullptr && __t.size() != 0) { + while (__cache.__get() != nullptr && __t.__size() != 0) { __cache.__get()->__value_ = _VSTD::move(__t.remove(__t.begin())->__value_); __node_insert_multi(__cache.__get()); __cache.__advance(); } } - while (__t.size() != 0) + while (__t.__size() != 0) __insert_multi(__e, _NodeTypes::__move(__t.remove(__t.begin())->__value_)); } } @@ -1798,17 +1798,17 @@ { static_assert((is_copy_constructible::value), "Comparator must be copy-constructible."); - destroy(__root()); + __destroy(__root()); } template void -__tree<_Tp, _Compare, _Allocator>::destroy(__node_pointer __nd) _NOEXCEPT +__tree<_Tp, _Compare, _Allocator>::__destroy(__node_pointer __nd) _NOEXCEPT { if (__nd != nullptr) { - destroy(static_cast<__node_pointer>(__nd->__left_)); - destroy(static_cast<__node_pointer>(__nd->__right_)); + __destroy(static_cast<__node_pointer>(__nd->__left_)); + __destroy(static_cast<__node_pointer>(__nd->__right_)); __node_allocator& __na = __node_alloc(); __node_traits::destroy(__na, _NodeTypes::__get_ptr(__nd->__value_)); __node_traits::deallocate(__na, __nd, 1); @@ -1837,7 +1837,7 @@ __begin_node() = __end_node(); else __end_node()->__left_->__parent_ = static_cast<__parent_pointer>(__end_node()); - if (__t.size() == 0) + if (__t.__size() == 0) __t.__begin_node() = __t.__end_node(); else __t.__end_node()->__left_->__parent_ = static_cast<__parent_pointer>(__t.__end_node()); @@ -1847,7 +1847,7 @@ void __tree<_Tp, _Compare, _Allocator>::clear() _NOEXCEPT { - destroy(__root()); + __destroy(__root()); size() = 0; __begin_node() = __end_node(); __end_node()->__left_ = nullptr; @@ -2431,7 +2431,7 @@ __node_pointer __np = __p.__get_np(); iterator __r = __remove_node_pointer(__np); __node_allocator& __na = __node_alloc(); - __node_traits::destroy(__na, _NodeTypes::__get_ptr( + __node_traits::__destroy(__na, _NodeTypes::__get_ptr( const_cast<__node_value_type&>(*__p))); __node_traits::deallocate(__na, __np, 1); return __r; diff --git a/libcxx/include/bitset b/libcxx/include/bitset --- a/libcxx/include/bitset +++ b/libcxx/include/bitset @@ -198,9 +198,9 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 void flip() _NOEXCEPT; _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 unsigned long to_ulong() const - {return to_ulong(integral_constant());} + {return __to_ulong(integral_constant());} _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 unsigned long long to_ullong() const - {return to_ullong(integral_constant());} + {return __to_ullong(integral_constant());} _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 bool all() const _NOEXCEPT; _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 bool any() const _NOEXCEPT; @@ -213,17 +213,17 @@ void __init(unsigned long long __v, true_type) _NOEXCEPT; #endif // _LIBCPP_CXX03_LANG _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 - unsigned long to_ulong(false_type) const; + unsigned long __to_ulong(false_type) const; _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 - unsigned long to_ulong(true_type) const; + unsigned long __to_ulong(true_type) const; _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 - unsigned long long to_ullong(false_type) const; + unsigned long long __to_ullong(false_type) const; _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 - unsigned long long to_ullong(true_type) const; + unsigned long long __to_ullong(true_type) const; _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_SINCE_CXX23 - unsigned long long to_ullong(true_type, false_type) const; + unsigned long long __to_ullong(true_type, false_type) const; _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 - unsigned long long to_ullong(true_type, true_type) const; + unsigned long long __to_ullong(true_type, true_type) const; }; template @@ -341,7 +341,7 @@ template _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unsigned long -__bitset<_N_words, _Size>::to_ulong(false_type) const +__bitset<_N_words, _Size>::__to_ulong(false_type) const { const_iterator __e = __make_iter(_Size); const_iterator __i = _VSTD::find(__make_iter(sizeof(unsigned long) * CHAR_BIT), __e, true); @@ -354,42 +354,42 @@ template inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unsigned long -__bitset<_N_words, _Size>::to_ulong(true_type) const +__bitset<_N_words, _Size>::__to_ulong(true_type) const { return __first_[0]; } template _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unsigned long long -__bitset<_N_words, _Size>::to_ullong(false_type) const +__bitset<_N_words, _Size>::__to_ullong(false_type) const { const_iterator __e = __make_iter(_Size); const_iterator __i = _VSTD::find(__make_iter(sizeof(unsigned long long) * CHAR_BIT), __e, true); if (__i != __e) __throw_overflow_error("bitset to_ullong overflow error"); - return to_ullong(true_type()); + return __to_ullong(true_type()); } template inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unsigned long long -__bitset<_N_words, _Size>::to_ullong(true_type) const +__bitset<_N_words, _Size>::__to_ullong(true_type) const { - return to_ullong(true_type(), integral_constant()); + return __to_ullong(true_type(), integral_constant()); } template inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unsigned long long -__bitset<_N_words, _Size>::to_ullong(true_type, false_type) const +__bitset<_N_words, _Size>::__to_ullong(true_type, false_type) const { return __first_[0]; } template _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unsigned long long -__bitset<_N_words, _Size>::to_ullong(true_type, true_type) const +__bitset<_N_words, _Size>::__to_ullong(true_type, true_type) const { unsigned long long __r = __first_[0]; for (size_t __i = 1; __i < sizeof(unsigned long long) / sizeof(__storage_type); ++__i) diff --git a/libcxx/include/experimental/memory_resource b/libcxx/include/experimental/memory_resource --- a/libcxx/include/experimental/memory_resource +++ b/libcxx/include/experimental/memory_resource @@ -123,9 +123,11 @@ // 8.5.3, memory.resource.priv private: + // NOLINTBEGIN(readability-identifier-naming) // These are visible, even though they are private virtual void* do_allocate(size_t, size_t) = 0; virtual void do_deallocate(void*, size_t, size_t) = 0; virtual bool do_is_equal(memory_resource const &) const _NOEXCEPT = 0; + // NOLINTEND(readability-identifier-naming) }; // 8.5.4, memory.resource.eq diff --git a/libcxx/include/locale b/libcxx/include/locale --- a/libcxx/include/locale +++ b/libcxx/include/locale @@ -2370,7 +2370,7 @@ time_base::dateorder __do_date_order() const; private: - void init(const ctype<_CharT>&); + void init(const ctype<_CharT>&); // NOLINT(readability-identifier-naming) // The symbol is part of the dylib string_type __analyze(char __fmt, const ctype<_CharT>&); }; @@ -2683,9 +2683,10 @@ pattern __pos_format_; pattern __neg_format_; - void init(const char*); + void init(const char*); // NOLINT(readability-identifier-naming) // The symbol is part of the dylib }; +// NOLINTBEGIN(readability-identifier-naming) // The symbols are part of the dylib template<> _LIBCPP_FUNC_VIS void moneypunct_byname::init(const char*); template<> _LIBCPP_FUNC_VIS void moneypunct_byname::init(const char*); extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS moneypunct_byname; @@ -2697,6 +2698,7 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS moneypunct_byname; extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS moneypunct_byname; #endif +// NOLINTEND(readability-identifier-naming) // money_get diff --git a/libcxx/include/regex b/libcxx/include/regex --- a/libcxx/include/regex +++ b/libcxx/include/regex @@ -2833,45 +2833,45 @@ __parse_basic_reg_exp(_ForwardIterator __first, _ForwardIterator __last); template _ForwardIterator - __parse_RE_expression(_ForwardIterator __first, _ForwardIterator __last); + __parse_re_expression(_ForwardIterator __first, _ForwardIterator __last); template _ForwardIterator - __parse_simple_RE(_ForwardIterator __first, _ForwardIterator __last); + __parse_simple_re(_ForwardIterator __first, _ForwardIterator __last); template _ForwardIterator - __parse_nondupl_RE(_ForwardIterator __first, _ForwardIterator __last); + __parse_nondupl_re(_ForwardIterator __first, _ForwardIterator __last); template _ForwardIterator - __parse_one_char_or_coll_elem_RE(_ForwardIterator __first, _ForwardIterator __last); + __parse_one_char_or_coll_elem_re(_ForwardIterator __first, _ForwardIterator __last); template _ForwardIterator - __parse_Back_open_paren(_ForwardIterator __first, _ForwardIterator __last); + __parse_back_open_paren(_ForwardIterator __first, _ForwardIterator __last); template _ForwardIterator - __parse_Back_close_paren(_ForwardIterator __first, _ForwardIterator __last); + __parse_back_close_paren(_ForwardIterator __first, _ForwardIterator __last); template _ForwardIterator - __parse_Back_open_brace(_ForwardIterator __first, _ForwardIterator __last); + __parse_back_open_brace(_ForwardIterator __first, _ForwardIterator __last); template _ForwardIterator - __parse_Back_close_brace(_ForwardIterator __first, _ForwardIterator __last); + __parse_back_close_brace(_ForwardIterator __first, _ForwardIterator __last); template _ForwardIterator - __parse_BACKREF(_ForwardIterator __first, _ForwardIterator __last); + __parse_backref(_ForwardIterator __first, _ForwardIterator __last); template _ForwardIterator - __parse_ORD_CHAR(_ForwardIterator __first, _ForwardIterator __last); + __parse_ord_char(_ForwardIterator __first, _ForwardIterator __last); template _ForwardIterator - __parse_QUOTED_CHAR(_ForwardIterator __first, _ForwardIterator __last); + __parse_quoted_char(_ForwardIterator __first, _ForwardIterator __last); template _ForwardIterator - __parse_RE_dupl_symbol(_ForwardIterator __first, _ForwardIterator __last, + __parse_re_dupl_symbol(_ForwardIterator __first, _ForwardIterator __last, __owns_one_state<_CharT>* __s, unsigned __mexp_begin, unsigned __mexp_end); template _ForwardIterator - __parse_ERE_dupl_symbol(_ForwardIterator __first, _ForwardIterator __last, + __parse_ere_dupl_symbol(_ForwardIterator __first, _ForwardIterator __last, __owns_one_state<_CharT>* __s, unsigned __mexp_begin, unsigned __mexp_end); template @@ -2899,25 +2899,25 @@ basic_string<_CharT>& __col_sym); template _ForwardIterator - __parse_DUP_COUNT(_ForwardIterator __first, _ForwardIterator __last, int& __c); + __parse_dup_count(_ForwardIterator __first, _ForwardIterator __last, int& __c); template _ForwardIterator __parse_extended_reg_exp(_ForwardIterator __first, _ForwardIterator __last); template _ForwardIterator - __parse_ERE_branch(_ForwardIterator __first, _ForwardIterator __last); + __parse_ere_branch(_ForwardIterator __first, _ForwardIterator __last); template _ForwardIterator - __parse_ERE_expression(_ForwardIterator __first, _ForwardIterator __last); + __parse_ere_expression(_ForwardIterator __first, _ForwardIterator __last); template _ForwardIterator - __parse_one_char_or_coll_elem_ERE(_ForwardIterator __first, _ForwardIterator __last); + __parse_one_char_or_coll_elem_ere(_ForwardIterator __first, _ForwardIterator __last); template _ForwardIterator - __parse_ORD_CHAR_ERE(_ForwardIterator __first, _ForwardIterator __last); + __parse_ord_char_ere(_ForwardIterator __first, _ForwardIterator __last); template _ForwardIterator - __parse_QUOTED_CHAR_ERE(_ForwardIterator __first, _ForwardIterator __last); + __parse_quoted_char_ere(_ForwardIterator __first, _ForwardIterator __last); template _ForwardIterator __parse_ecma_exp(_ForwardIterator __first, _ForwardIterator __last); @@ -3245,7 +3245,7 @@ } if (__first != __last) { - __first = __parse_RE_expression(__first, __last); + __first = __parse_re_expression(__first, __last); if (__first != __last) { _ForwardIterator __temp = _VSTD::next(__first); @@ -3269,14 +3269,14 @@ _ForwardIterator __last) { __owns_one_state<_CharT>* __sa = __end_; - _ForwardIterator __temp = __parse_ERE_branch(__first, __last); + _ForwardIterator __temp = __parse_ere_branch(__first, __last); if (__temp == __first) __throw_regex_error(); __first = __temp; while (__first != __last && *__first == '|') { __owns_one_state<_CharT>* __sb = __end_; - __temp = __parse_ERE_branch(++__first, __last); + __temp = __parse_ere_branch(++__first, __last); if (__temp == __first) __throw_regex_error(); __push_alternation(__sa, __sb); @@ -3288,16 +3288,16 @@ template template _ForwardIterator -basic_regex<_CharT, _Traits>::__parse_ERE_branch(_ForwardIterator __first, +basic_regex<_CharT, _Traits>::__parse_ere_branch(_ForwardIterator __first, _ForwardIterator __last) { - _ForwardIterator __temp = __parse_ERE_expression(__first, __last); + _ForwardIterator __temp = __parse_ere_expression(__first, __last); if (__temp == __first) __throw_regex_error(); do { __first = __temp; - __temp = __parse_ERE_expression(__first, __last); + __temp = __parse_ere_expression(__first, __last); } while (__temp != __first); return __first; } @@ -3305,12 +3305,12 @@ template template _ForwardIterator -basic_regex<_CharT, _Traits>::__parse_ERE_expression(_ForwardIterator __first, +basic_regex<_CharT, _Traits>::__parse_ere_expression(_ForwardIterator __first, _ForwardIterator __last) { __owns_one_state<_CharT>* __e = __end_; unsigned __mexp_begin = __marked_count_; - _ForwardIterator __temp = __parse_one_char_or_coll_elem_ERE(__first, __last); + _ForwardIterator __temp = __parse_one_char_or_coll_elem_ere(__first, __last); if (__temp == __first && __temp != __last) { switch (*__temp) @@ -3337,7 +3337,7 @@ } } if (__temp != __first) - __temp = __parse_ERE_dupl_symbol(__temp, __last, __e, __mexp_begin+1, + __temp = __parse_ere_dupl_symbol(__temp, __last, __e, __mexp_begin+1, __marked_count_+1); __first = __temp; return __first; @@ -3346,12 +3346,12 @@ template template _ForwardIterator -basic_regex<_CharT, _Traits>::__parse_RE_expression(_ForwardIterator __first, +basic_regex<_CharT, _Traits>::__parse_re_expression(_ForwardIterator __first, _ForwardIterator __last) { while (true) { - _ForwardIterator __temp = __parse_simple_RE(__first, __last); + _ForwardIterator __temp = __parse_simple_re(__first, __last); if (__temp == __first) break; __first = __temp; @@ -3362,16 +3362,16 @@ template template _ForwardIterator -basic_regex<_CharT, _Traits>::__parse_simple_RE(_ForwardIterator __first, +basic_regex<_CharT, _Traits>::__parse_simple_re(_ForwardIterator __first, _ForwardIterator __last) { if (__first != __last) { __owns_one_state<_CharT>* __e = __end_; unsigned __mexp_begin = __marked_count_; - _ForwardIterator __temp = __parse_nondupl_RE(__first, __last); + _ForwardIterator __temp = __parse_nondupl_re(__first, __last); if (__temp != __first) - __first = __parse_RE_dupl_symbol(__temp, __last, __e, + __first = __parse_re_dupl_symbol(__temp, __last, __e, __mexp_begin+1, __marked_count_+1); } return __first; @@ -3380,27 +3380,27 @@ template template _ForwardIterator -basic_regex<_CharT, _Traits>::__parse_nondupl_RE(_ForwardIterator __first, +basic_regex<_CharT, _Traits>::__parse_nondupl_re(_ForwardIterator __first, _ForwardIterator __last) { _ForwardIterator __temp = __first; - __first = __parse_one_char_or_coll_elem_RE(__first, __last); + __first = __parse_one_char_or_coll_elem_re(__first, __last); if (__temp == __first) { - __temp = __parse_Back_open_paren(__first, __last); + __temp = __parse_back_open_paren(__first, __last); if (__temp != __first) { __push_begin_marked_subexpression(); unsigned __temp_count = __marked_count_; - __first = __parse_RE_expression(__temp, __last); - __temp = __parse_Back_close_paren(__first, __last); + __first = __parse_re_expression(__temp, __last); + __temp = __parse_back_close_paren(__first, __last); if (__temp == __first) __throw_regex_error(); __push_end_marked_subexpression(__temp_count); __first = __temp; } else - __first = __parse_BACKREF(__first, __last); + __first = __parse_backref(__first, __last); } return __first; } @@ -3408,14 +3408,14 @@ template template _ForwardIterator -basic_regex<_CharT, _Traits>::__parse_one_char_or_coll_elem_RE( +basic_regex<_CharT, _Traits>::__parse_one_char_or_coll_elem_re( _ForwardIterator __first, _ForwardIterator __last) { - _ForwardIterator __temp = __parse_ORD_CHAR(__first, __last); + _ForwardIterator __temp = __parse_ord_char(__first, __last); if (__temp == __first) { - __temp = __parse_QUOTED_CHAR(__first, __last); + __temp = __parse_quoted_char(__first, __last); if (__temp == __first) { if (__temp != __last && *__temp == '.') @@ -3434,14 +3434,14 @@ template template _ForwardIterator -basic_regex<_CharT, _Traits>::__parse_one_char_or_coll_elem_ERE( +basic_regex<_CharT, _Traits>::__parse_one_char_or_coll_elem_ere( _ForwardIterator __first, _ForwardIterator __last) { - _ForwardIterator __temp = __parse_ORD_CHAR_ERE(__first, __last); + _ForwardIterator __temp = __parse_ord_char_ere(__first, __last); if (__temp == __first) { - __temp = __parse_QUOTED_CHAR_ERE(__first, __last); + __temp = __parse_quoted_char_ere(__first, __last); if (__temp == __first) { if (__temp != __last && *__temp == '.') @@ -3460,7 +3460,7 @@ template template _ForwardIterator -basic_regex<_CharT, _Traits>::__parse_Back_open_paren(_ForwardIterator __first, +basic_regex<_CharT, _Traits>::__parse_back_open_paren(_ForwardIterator __first, _ForwardIterator __last) { if (__first != __last) @@ -3478,7 +3478,7 @@ template template _ForwardIterator -basic_regex<_CharT, _Traits>::__parse_Back_close_paren(_ForwardIterator __first, +basic_regex<_CharT, _Traits>::__parse_back_close_paren(_ForwardIterator __first, _ForwardIterator __last) { if (__first != __last) @@ -3496,7 +3496,7 @@ template template _ForwardIterator -basic_regex<_CharT, _Traits>::__parse_Back_open_brace(_ForwardIterator __first, +basic_regex<_CharT, _Traits>::__parse_back_open_brace(_ForwardIterator __first, _ForwardIterator __last) { if (__first != __last) @@ -3514,7 +3514,7 @@ template template _ForwardIterator -basic_regex<_CharT, _Traits>::__parse_Back_close_brace(_ForwardIterator __first, +basic_regex<_CharT, _Traits>::__parse_back_close_brace(_ForwardIterator __first, _ForwardIterator __last) { if (__first != __last) @@ -3532,7 +3532,7 @@ template template _ForwardIterator -basic_regex<_CharT, _Traits>::__parse_BACKREF(_ForwardIterator __first, +basic_regex<_CharT, _Traits>::__parse_backref(_ForwardIterator __first, _ForwardIterator __last) { if (__first != __last) @@ -3547,7 +3547,7 @@ template template _ForwardIterator -basic_regex<_CharT, _Traits>::__parse_ORD_CHAR(_ForwardIterator __first, +basic_regex<_CharT, _Traits>::__parse_ord_char(_ForwardIterator __first, _ForwardIterator __last) { if (__first != __last) @@ -3567,7 +3567,7 @@ template template _ForwardIterator -basic_regex<_CharT, _Traits>::__parse_ORD_CHAR_ERE(_ForwardIterator __first, +basic_regex<_CharT, _Traits>::__parse_ord_char_ere(_ForwardIterator __first, _ForwardIterator __last) { if (__first != __last) @@ -3605,7 +3605,7 @@ template template _ForwardIterator -basic_regex<_CharT, _Traits>::__parse_QUOTED_CHAR(_ForwardIterator __first, +basic_regex<_CharT, _Traits>::__parse_quoted_char(_ForwardIterator __first, _ForwardIterator __last) { if (__first != __last) @@ -3636,7 +3636,7 @@ template template _ForwardIterator -basic_regex<_CharT, _Traits>::__parse_QUOTED_CHAR_ERE(_ForwardIterator __first, +basic_regex<_CharT, _Traits>::__parse_quoted_char_ere(_ForwardIterator __first, _ForwardIterator __last) { if (__first != __last) @@ -3680,7 +3680,7 @@ template template _ForwardIterator -basic_regex<_CharT, _Traits>::__parse_RE_dupl_symbol(_ForwardIterator __first, +basic_regex<_CharT, _Traits>::__parse_re_dupl_symbol(_ForwardIterator __first, _ForwardIterator __last, __owns_one_state<_CharT>* __s, unsigned __mexp_begin, @@ -3695,12 +3695,12 @@ } else { - _ForwardIterator __temp = __parse_Back_open_brace(__first, __last); + _ForwardIterator __temp = __parse_back_open_brace(__first, __last); if (__temp != __first) { int __min = 0; __first = __temp; - __temp = __parse_DUP_COUNT(__first, __last, __min); + __temp = __parse_dup_count(__first, __last, __min); if (__temp == __first) __throw_regex_error(); __first = __temp; @@ -3708,7 +3708,7 @@ __throw_regex_error(); if (*__first != ',') { - __temp = __parse_Back_close_brace(__first, __last); + __temp = __parse_back_close_brace(__first, __last); if (__temp == __first) __throw_regex_error(); __push_loop(__min, __min, __s, __mexp_begin, __mexp_end, @@ -3719,8 +3719,8 @@ { ++__first; // consume ',' int __max = -1; - __first = __parse_DUP_COUNT(__first, __last, __max); - __temp = __parse_Back_close_brace(__first, __last); + __first = __parse_dup_count(__first, __last, __max); + __temp = __parse_back_close_brace(__first, __last); if (__temp == __first) __throw_regex_error(); if (__max == -1) @@ -3743,7 +3743,7 @@ template template _ForwardIterator -basic_regex<_CharT, _Traits>::__parse_ERE_dupl_symbol(_ForwardIterator __first, +basic_regex<_CharT, _Traits>::__parse_ere_dupl_symbol(_ForwardIterator __first, _ForwardIterator __last, __owns_one_state<_CharT>* __s, unsigned __mexp_begin, @@ -3787,7 +3787,7 @@ case '{': { int __min; - _ForwardIterator __temp = __parse_DUP_COUNT(++__first, __last, __min); + _ForwardIterator __temp = __parse_dup_count(++__first, __last, __min); if (__temp == __first) __throw_regex_error(); __first = __temp; @@ -3823,7 +3823,7 @@ else { int __max = -1; - __temp = __parse_DUP_COUNT(__first, __last, __max); + __temp = __parse_dup_count(__first, __last, __max); if (__temp == __first) __throw_regex_error(); __first = __temp; @@ -4220,7 +4220,7 @@ template template _ForwardIterator -basic_regex<_CharT, _Traits>::__parse_DUP_COUNT(_ForwardIterator __first, +basic_regex<_CharT, _Traits>::__parse_dup_count(_ForwardIterator __first, _ForwardIterator __last, int& __c) { @@ -4296,7 +4296,7 @@ unsigned __mexp_begin = __marked_count_; __temp = __parse_atom(__first, __last); if (__temp != __first) - __first = __parse_ERE_dupl_symbol(__temp, __last, __e, + __first = __parse_ere_dupl_symbol(__temp, __last, __e, __mexp_begin+1, __marked_count_+1); } else