diff options
Diffstat (limited to 'libcxx/include/regex')
| -rw-r--r-- | libcxx/include/regex | 103 |
1 files changed, 51 insertions, 52 deletions
diff --git a/libcxx/include/regex b/libcxx/include/regex index 3c33cc8504c..25aab82cb8e 100644 --- a/libcxx/include/regex +++ b/libcxx/include/regex @@ -1273,7 +1273,6 @@ else return os; } - // __node template <class _CharT> @@ -2267,7 +2266,7 @@ public: #ifndef _LIBCPP_NO_EXCEPTIONS if (__b.size() != 1 || __e.size() != 1) throw regex_error(regex_constants::error_collate); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS if (__icase_) { __b[0] = __traits_.translate_nocase(__b[0]); @@ -2850,7 +2849,7 @@ private: friend bool regex_search(const basic_string<_C, _ST, _SA>& __s, - match_results<typename basic_string<_C, _ST, _SA>::const_iterator, _A>&, + match_results<typename basic_string<_C, _ST, _SA>::const_iterator, _A>&, const basic_regex<_C, _T>& __e, regex_constants::match_flag_type __flags); @@ -2965,7 +2964,7 @@ basic_regex<_CharT, _Traits>::__parse(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS default: throw regex_error(regex_constants::__re_err_grammar); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS } return __first; } @@ -2999,7 +2998,7 @@ basic_regex<_CharT, _Traits>::__parse_basic_reg_exp(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__first != __last) throw regex_error(regex_constants::__re_err_empty); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS } return __first; } @@ -3015,7 +3014,7 @@ basic_regex<_CharT, _Traits>::__parse_extended_reg_exp(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__temp == __first) throw regex_error(regex_constants::__re_err_empty); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __first = __temp; while (__first != __last && *__first == '|') { @@ -3024,7 +3023,7 @@ basic_regex<_CharT, _Traits>::__parse_extended_reg_exp(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__temp == __first) throw regex_error(regex_constants::__re_err_empty); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __push_alternation(__sa, __sb); __first = __temp; } @@ -3041,7 +3040,7 @@ basic_regex<_CharT, _Traits>::__parse_ERE_branch(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__temp == __first) throw regex_error(regex_constants::__re_err_empty); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS do { __first = __temp; @@ -3079,7 +3078,7 @@ basic_regex<_CharT, _Traits>::__parse_ERE_expression(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__temp == __last || *__temp != ')') throw regex_error(regex_constants::error_paren); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __push_end_marked_subexpression(__temp_count); --__open_count_; ++__temp; @@ -3147,7 +3146,7 @@ basic_regex<_CharT, _Traits>::__parse_nondupl_RE(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__temp == __first) throw regex_error(regex_constants::error_paren); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __push_end_marked_subexpression(__temp_count); __first = __temp; } @@ -3459,19 +3458,19 @@ basic_regex<_CharT, _Traits>::__parse_RE_dupl_symbol(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__temp == __first) throw regex_error(regex_constants::error_badbrace); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __first = __temp; #ifndef _LIBCPP_NO_EXCEPTIONS if (__first == __last) throw regex_error(regex_constants::error_brace); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS if (*__first != ',') { __temp = __parse_Back_close_brace(__first, __last); #ifndef _LIBCPP_NO_EXCEPTIONS if (__temp == __first) throw regex_error(regex_constants::error_brace); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __push_loop(__min, __min, __s, __mexp_begin, __mexp_end, true); __first = __temp; @@ -3485,7 +3484,7 @@ basic_regex<_CharT, _Traits>::__parse_RE_dupl_symbol(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__temp == __first) throw regex_error(regex_constants::error_brace); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS if (__max == -1) __push_greedy_inf_repeat(__min, __s, __mexp_begin, __mexp_end); else @@ -3493,7 +3492,7 @@ basic_regex<_CharT, _Traits>::__parse_RE_dupl_symbol(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__max < __min) throw regex_error(regex_constants::error_badbrace); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __push_loop(__min, __max, __s, __mexp_begin, __mexp_end, true); } @@ -3556,12 +3555,12 @@ basic_regex<_CharT, _Traits>::__parse_ERE_dupl_symbol(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__temp == __first) throw regex_error(regex_constants::error_badbrace); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __first = __temp; #ifndef _LIBCPP_NO_EXCEPTIONS if (__first == __last) throw regex_error(regex_constants::error_brace); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS switch (*__first) { case '}': @@ -3579,7 +3578,7 @@ basic_regex<_CharT, _Traits>::__parse_ERE_dupl_symbol(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__first == __last) throw regex_error(regex_constants::error_badbrace); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS if (*__first == '}') { ++__first; @@ -3598,17 +3597,17 @@ basic_regex<_CharT, _Traits>::__parse_ERE_dupl_symbol(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__temp == __first) throw regex_error(regex_constants::error_brace); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __first = __temp; #ifndef _LIBCPP_NO_EXCEPTIONS if (__first == __last || *__first != '}') throw regex_error(regex_constants::error_brace); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS ++__first; #ifndef _LIBCPP_NO_EXCEPTIONS if (__max < __min) throw regex_error(regex_constants::error_badbrace); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS if (__grammar == ECMAScript && __first != __last && *__first == '?') { ++__first; @@ -3621,7 +3620,7 @@ basic_regex<_CharT, _Traits>::__parse_ERE_dupl_symbol(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS default: throw regex_error(regex_constants::error_badbrace); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS } } break; @@ -3642,7 +3641,7 @@ basic_regex<_CharT, _Traits>::__parse_bracket_expression(_ForwardIterator __firs #ifndef _LIBCPP_NO_EXCEPTIONS if (__first == __last) throw regex_error(regex_constants::error_brack); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS bool __negate = false; if (*__first == '^') { @@ -3654,7 +3653,7 @@ basic_regex<_CharT, _Traits>::__parse_bracket_expression(_ForwardIterator __firs #ifndef _LIBCPP_NO_EXCEPTIONS if (__first == __last) throw regex_error(regex_constants::error_brack); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS if ((__flags_ & 0x1F0) != ECMAScript && *__first == ']') { __ml->__add_char(']'); @@ -3664,7 +3663,7 @@ basic_regex<_CharT, _Traits>::__parse_bracket_expression(_ForwardIterator __firs #ifndef _LIBCPP_NO_EXCEPTIONS if (__first == __last) throw regex_error(regex_constants::error_brack); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS if (*__first == '-') { __ml->__add_char('-'); @@ -3673,7 +3672,7 @@ basic_regex<_CharT, _Traits>::__parse_bracket_expression(_ForwardIterator __firs #ifndef _LIBCPP_NO_EXCEPTIONS if (__first == __last || *__first != ']') throw regex_error(regex_constants::error_brack); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS ++__first; } return __first; @@ -3796,7 +3795,7 @@ basic_regex<_CharT, _Traits>::__parse_class_escape(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__first == __last) throw regex_error(regex_constants::error_escape); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS switch (*__first) { case 0: @@ -3840,7 +3839,7 @@ basic_regex<_CharT, _Traits>::__parse_awk_escape(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__first == __last) throw regex_error(regex_constants::error_escape); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS switch (*__first) { case '\\': @@ -3911,7 +3910,7 @@ basic_regex<_CharT, _Traits>::__parse_awk_escape(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS else throw regex_error(regex_constants::error_escape); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS return __first; } @@ -3930,7 +3929,7 @@ basic_regex<_CharT, _Traits>::__parse_equivalence_class(_ForwardIterator __first #ifndef _LIBCPP_NO_EXCEPTIONS if (__temp == __last) throw regex_error(regex_constants::error_brack); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS // [__first, __temp) contains all text in [= ... =] typedef typename _Traits::string_type string_type; string_type __collate_name = @@ -3938,7 +3937,7 @@ basic_regex<_CharT, _Traits>::__parse_equivalence_class(_ForwardIterator __first #ifndef _LIBCPP_NO_EXCEPTIONS if (__collate_name.empty()) throw regex_error(regex_constants::error_collate); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS string_type __equiv_name = __traits_.transform_primary(__collate_name.begin(), __collate_name.end()); @@ -3957,7 +3956,7 @@ basic_regex<_CharT, _Traits>::__parse_equivalence_class(_ForwardIterator __first #ifndef _LIBCPP_NO_EXCEPTIONS default: throw regex_error(regex_constants::error_collate); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS } } __first = next(__temp, 2); @@ -3979,7 +3978,7 @@ basic_regex<_CharT, _Traits>::__parse_character_class(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__temp == __last) throw regex_error(regex_constants::error_brack); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS // [__first, __temp) contains all text in [: ... :] typedef typename _Traits::char_class_type char_class_type; char_class_type __class_type = @@ -3987,7 +3986,7 @@ basic_regex<_CharT, _Traits>::__parse_character_class(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__class_type == 0) throw regex_error(regex_constants::error_brack); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __ml->__add_class(__class_type); __first = next(__temp, 2); return __first; @@ -4008,7 +4007,7 @@ basic_regex<_CharT, _Traits>::__parse_collating_symbol(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__temp == __last) throw regex_error(regex_constants::error_brack); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS // [__first, __temp) contains all text in [. ... .] typedef typename _Traits::string_type string_type; __col_sym = __traits_.lookup_collatename(__first, __temp); @@ -4020,7 +4019,7 @@ basic_regex<_CharT, _Traits>::__parse_collating_symbol(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS default: throw regex_error(regex_constants::error_collate); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS } __first = next(__temp, 2); return __first; @@ -4161,7 +4160,7 @@ basic_regex<_CharT, _Traits>::__parse_assertion(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__temp == __last || *__temp != ')') throw regex_error(regex_constants::error_paren); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __first = ++__temp; } break; @@ -4175,7 +4174,7 @@ basic_regex<_CharT, _Traits>::__parse_assertion(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__temp == __last || *__temp != ')') throw regex_error(regex_constants::error_paren); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __first = ++__temp; } break; @@ -4215,7 +4214,7 @@ basic_regex<_CharT, _Traits>::__parse_atom(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__first == __last) throw regex_error(regex_constants::error_paren); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS _ForwardIterator __temp = _STD::next(__first); if (__temp != __last && *__first == '?' && *__temp == ':') { @@ -4224,7 +4223,7 @@ basic_regex<_CharT, _Traits>::__parse_atom(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__first == __last || *__first != ')') throw regex_error(regex_constants::error_paren); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS --__open_count_; ++__first; } @@ -4237,7 +4236,7 @@ basic_regex<_CharT, _Traits>::__parse_atom(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__first == __last || *__first != ')') throw regex_error(regex_constants::error_paren); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __push_end_marked_subexpression(__temp_count); --__open_count_; ++__first; @@ -4301,7 +4300,7 @@ basic_regex<_CharT, _Traits>::__parse_decimal_escape(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__v > mark_count()) throw regex_error(regex_constants::error_backref); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __push_back_ref(__v); } } @@ -4423,23 +4422,23 @@ basic_regex<_CharT, _Traits>::__parse_character_escape(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__first == __last) throw regex_error(regex_constants::error_escape); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __hd = __traits_.value(*__first, 16); #ifndef _LIBCPP_NO_EXCEPTIONS if (__hd == -1) throw regex_error(regex_constants::error_escape); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __sum = 16 * __sum + __hd; ++__first; #ifndef _LIBCPP_NO_EXCEPTIONS if (__first == __last) throw regex_error(regex_constants::error_escape); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __hd = __traits_.value(*__first, 16); #ifndef _LIBCPP_NO_EXCEPTIONS if (__hd == -1) throw regex_error(regex_constants::error_escape); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __sum = 16 * __sum + __hd; // drop through case 'x': @@ -4447,23 +4446,23 @@ basic_regex<_CharT, _Traits>::__parse_character_escape(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS if (__first == __last) throw regex_error(regex_constants::error_escape); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __hd = __traits_.value(*__first, 16); #ifndef _LIBCPP_NO_EXCEPTIONS if (__hd == -1) throw regex_error(regex_constants::error_escape); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __sum = 16 * __sum + __hd; ++__first; #ifndef _LIBCPP_NO_EXCEPTIONS if (__first == __last) throw regex_error(regex_constants::error_escape); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __hd = __traits_.value(*__first, 16); #ifndef _LIBCPP_NO_EXCEPTIONS if (__hd == -1) throw regex_error(regex_constants::error_escape); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS __sum = 16 * __sum + __hd; if (__str) *__str = _CharT(__sum); @@ -4483,7 +4482,7 @@ basic_regex<_CharT, _Traits>::__parse_character_escape(_ForwardIterator __first, #ifndef _LIBCPP_NO_EXCEPTIONS else if (__str) throw regex_error(regex_constants::error_escape); -#endif +#endif // _LIBCPP_NO_EXCEPTIONS break; } } @@ -5189,7 +5188,7 @@ public: #ifdef _LIBCPP_MOVE // match_results(match_results&& __m) = default; // match_results& operator=(match_results&& __m) = default; -#endif +#endif // _LIBCPP_MOVE // ~match_results() = default; // size: |
