From bbd8086ee3448f38026219777112e787fde8504d Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Sun, 22 Aug 2010 00:45:01 +0000 Subject: [PATCH] Fixing whitespace problems git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@111763 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/re/iterators.h | 2 +- test/re/re.alg/re.alg.match/basic.pass.cpp | 1 - test/re/re.alg/re.alg.search/basic.pass.cpp | 1 - test/re/re.const/re.err/error_type.pass.cpp | 4 +- .../re.matchflag/match_flag_type.pass.cpp | 4 +- .../re.synopt/syntax_option_type.pass.cpp | 4 +- .../re.regiter.cnstr/default.pass.cpp | 2 +- .../re.regiter.comp/tested_elsewhere.pass.cpp | 2 +- .../re.regiter.deref/deref.pass.cpp | 2 +- .../re.regiter/re.regiter.incr/post.pass.cpp | 2 +- test/re/re.iter/re.regiter/types.pass.cpp | 2 +- .../re.tokiter/re.tokiter.cnstr/init.pass.cpp | 2 +- test/re/re.iter/re.tokiter/types.pass.cpp | 2 +- .../re.regex.assign/assign.il.pass.cpp | 2 +- test/re/re.regex/re.regex.assign/il.pass.cpp | 2 +- .../re.regex.construct/il_flg.pass.cpp | 4 +- .../re.submatch.op/compare.pass.cpp | 82 +++++++++---------- test/re/re.submatch/types.pass.cpp | 2 +- test/re/re.traits/iterators.h | 2 +- test/re/re.traits/transform_primary.pass.cpp | 2 +- test/re/test_allocator.h | 6 +- 21 files changed, 65 insertions(+), 67 deletions(-) diff --git a/test/re/iterators.h b/test/re/iterators.h index 8ca5e889..3d2f5a8b 100644 --- a/test/re/iterators.h +++ b/test/re/iterators.h @@ -274,4 +274,4 @@ operator-(const random_access_iterator& x, const random_access_iterator& y return x.base() - y.base(); } -#endif +#endif // ITERATORS_H diff --git a/test/re/re.alg/re.alg.match/basic.pass.cpp b/test/re/re.alg/re.alg.match/basic.pass.cpp index 4aa66833..06880ee5 100644 --- a/test/re/re.alg/re.alg.match/basic.pass.cpp +++ b/test/re/re.alg/re.alg.match/basic.pass.cpp @@ -691,7 +691,6 @@ int main() assert(m.str(0) == s); } - { std::wcmatch m; assert(!std::regex_match(L"a", m, std::wregex())); diff --git a/test/re/re.alg/re.alg.search/basic.pass.cpp b/test/re/re.alg/re.alg.search/basic.pass.cpp index ba147b94..c4aa60e3 100644 --- a/test/re/re.alg/re.alg.search/basic.pass.cpp +++ b/test/re/re.alg/re.alg.search/basic.pass.cpp @@ -781,7 +781,6 @@ int main() assert(m.str(0) == s); } - { std::wcmatch m; assert(!std::regex_search(L"a", m, std::wregex())); diff --git a/test/re/re.const/re.err/error_type.pass.cpp b/test/re/re.const/re.err/error_type.pass.cpp index aab6d62c..06414a34 100644 --- a/test/re/re.const/re.err/error_type.pass.cpp +++ b/test/re/re.const/re.err/error_type.pass.cpp @@ -12,7 +12,7 @@ // namespace regex_constants // { -// +// // enum error_type // { // error_collate = unspecified, @@ -29,7 +29,7 @@ // error_complexity = unspecified, // error_stack = unspecified // }; -// +// // } #include diff --git a/test/re/re.const/re.matchflag/match_flag_type.pass.cpp b/test/re/re.const/re.matchflag/match_flag_type.pass.cpp index cf9a7f49..356fc572 100644 --- a/test/re/re.const/re.matchflag/match_flag_type.pass.cpp +++ b/test/re/re.const/re.matchflag/match_flag_type.pass.cpp @@ -12,7 +12,7 @@ // namespace regex_constants // { -// +// // emum match_flag_type // bitmask type // { // match_default = 0, @@ -29,7 +29,7 @@ // format_no_copy = unspecified, // format_first_only = unspecified // }; -// +// // } #include diff --git a/test/re/re.const/re.synopt/syntax_option_type.pass.cpp b/test/re/re.const/re.synopt/syntax_option_type.pass.cpp index 205ed84e..473b6e55 100644 --- a/test/re/re.const/re.synopt/syntax_option_type.pass.cpp +++ b/test/re/re.const/re.synopt/syntax_option_type.pass.cpp @@ -12,7 +12,7 @@ // namespace regex_constants // { -// +// // emum syntax_option_type // bitmask type // { // icase = unspecified, @@ -26,7 +26,7 @@ // grep = unspecified, // egrep = unspecified // }; -// +// // } #include diff --git a/test/re/re.iter/re.regiter/re.regiter.cnstr/default.pass.cpp b/test/re/re.iter/re.regiter/re.regiter.cnstr/default.pass.cpp index 33b0f7e5..126b0d55 100644 --- a/test/re/re.iter/re.regiter/re.regiter.cnstr/default.pass.cpp +++ b/test/re/re.iter/re.regiter/re.regiter.cnstr/default.pass.cpp @@ -29,4 +29,4 @@ int main() { test(); test(); -} \ No newline at end of file +} diff --git a/test/re/re.iter/re.regiter/re.regiter.comp/tested_elsewhere.pass.cpp b/test/re/re.iter/re.regiter/re.regiter.comp/tested_elsewhere.pass.cpp index aa4e662d..76ba7505 100644 --- a/test/re/re.iter/re.regiter/re.regiter.comp/tested_elsewhere.pass.cpp +++ b/test/re/re.iter/re.regiter/re.regiter.comp/tested_elsewhere.pass.cpp @@ -16,4 +16,4 @@ int main() { -} \ No newline at end of file +} diff --git a/test/re/re.iter/re.regiter/re.regiter.deref/deref.pass.cpp b/test/re/re.iter/re.regiter/re.regiter.deref/deref.pass.cpp index 8ea1c587..f68bf194 100644 --- a/test/re/re.iter/re.regiter/re.regiter.deref/deref.pass.cpp +++ b/test/re/re.iter/re.regiter/re.regiter.deref/deref.pass.cpp @@ -39,4 +39,4 @@ int main() ++i; assert(i == std::cregex_iterator()); } -} \ No newline at end of file +} diff --git a/test/re/re.iter/re.regiter/re.regiter.incr/post.pass.cpp b/test/re/re.iter/re.regiter/re.regiter.incr/post.pass.cpp index 66b3f17b..96d2b546 100644 --- a/test/re/re.iter/re.regiter/re.regiter.incr/post.pass.cpp +++ b/test/re/re.iter/re.regiter/re.regiter.incr/post.pass.cpp @@ -39,4 +39,4 @@ int main() i++; assert(i == std::cregex_iterator()); } -} \ No newline at end of file +} diff --git a/test/re/re.iter/re.regiter/types.pass.cpp b/test/re/re.iter/re.regiter/types.pass.cpp index b89e29a9..1d088030 100644 --- a/test/re/re.iter/re.regiter/types.pass.cpp +++ b/test/re/re.iter/re.regiter/types.pass.cpp @@ -42,4 +42,4 @@ int main() { test(); test(); -} \ No newline at end of file +} diff --git a/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp b/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp index de74babf..8c03334e 100644 --- a/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp +++ b/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp @@ -60,5 +60,5 @@ int main() ++i; assert(i == std::cregex_token_iterator()); } -#endif +#endif // _LIBCPP_MOVE } diff --git a/test/re/re.iter/re.tokiter/types.pass.cpp b/test/re/re.iter/re.tokiter/types.pass.cpp index 75cdae8d..8245b7e8 100644 --- a/test/re/re.iter/re.tokiter/types.pass.cpp +++ b/test/re/re.iter/re.tokiter/types.pass.cpp @@ -42,4 +42,4 @@ int main() { test(); test(); -} \ No newline at end of file +} diff --git a/test/re/re.regex/re.regex.assign/assign.il.pass.cpp b/test/re/re.regex/re.regex.assign/assign.il.pass.cpp index c97a6fae..d8b395fc 100644 --- a/test/re/re.regex/re.regex.assign/assign.il.pass.cpp +++ b/test/re/re.regex/re.regex.assign/assign.il.pass.cpp @@ -29,5 +29,5 @@ int main() r2.assign({'(', 'a', '(', '[', 'b', 'c', ']', ')', ')'}, std::regex::extended); assert(r2.flags() == std::regex::extended); assert(r2.mark_count() == 2); -#endif +#endif // _LIBCPP_MOVE } diff --git a/test/re/re.regex/re.regex.assign/il.pass.cpp b/test/re/re.regex/re.regex.assign/il.pass.cpp index 5a9dc0c6..ad91d86b 100644 --- a/test/re/re.regex/re.regex.assign/il.pass.cpp +++ b/test/re/re.regex/re.regex.assign/il.pass.cpp @@ -23,5 +23,5 @@ int main() r2 = {'(', 'a', '(', '[', 'b', 'c', ']', ')', ')'}; assert(r2.flags() == std::regex::ECMAScript); assert(r2.mark_count() == 2); -#endif +#endif // _LIBCPP_MOVE } diff --git a/test/re/re.regex/re.regex.construct/il_flg.pass.cpp b/test/re/re.regex/re.regex.construct/il_flg.pass.cpp index 6ced811a..553b0449 100644 --- a/test/re/re.regex/re.regex.construct/il_flg.pass.cpp +++ b/test/re/re.regex/re.regex.construct/il_flg.pass.cpp @@ -27,7 +27,7 @@ test(std::initializer_list il, std::regex_constants::syntax_option_type f, assert(r.mark_count() == mc); } -#endif +#endif // _LIBCPP_MOVE int main() { @@ -66,5 +66,5 @@ int main() test({'\\', '(', 'a', '[', 'b', 'c', ']', '\\', ')'}, std::regex_constants::egrep, 0); test({'\\', '(', 'a', '\\', '(', '[', 'b', 'c', ']', '\\', ')', '\\', ')'}, std::regex_constants::egrep, 0); test({'(', 'a', '(', '[', 'b', 'c', ']', ')', ')'}, std::regex_constants::egrep, 2); -#endif +#endif // _LIBCPP_MOVE } diff --git a/test/re/re.submatch/re.submatch.op/compare.pass.cpp b/test/re/re.submatch/re.submatch.op/compare.pass.cpp index 404a6c08..8c4544de 100644 --- a/test/re/re.submatch/re.submatch.op/compare.pass.cpp +++ b/test/re/re.submatch/re.submatch.op/compare.pass.cpp @@ -14,200 +14,200 @@ // template // bool // operator==(const sub_match& lhs, const sub_match& rhs); -// +// // template // bool // operator!=(const sub_match& lhs, const sub_match& rhs); -// +// // template // bool // operator<(const sub_match& lhs, const sub_match& rhs); -// +// // template // bool // operator<=(const sub_match& lhs, const sub_match& rhs); -// +// // template // bool // operator>=(const sub_match& lhs, const sub_match& rhs); -// +// // template // bool // operator>(const sub_match& lhs, const sub_match& rhs); -// +// // template // bool // operator==(const basic_string::value_type, ST, SA>& lhs, // const sub_match& rhs); -// +// // template // bool // operator!=(const basic_string::value_type, ST, SA>& lhs, // const sub_match& rhs); -// +// // template // bool // operator<(const basic_string::value_type, ST, SA>& lhs, // const sub_match& rhs); -// +// // template // bool // operator>(const basic_string::value_type, ST, SA>& lhs, // const sub_match& rhs); -// +// // template // bool operator>=(const basic_string::value_type, ST, SA>& lhs, // const sub_match& rhs); -// +// // template // bool // operator<=(const basic_string::value_type, ST, SA>& lhs, // const sub_match& rhs); -// +// // template // bool // operator==(const sub_match& lhs, // const basic_string::value_type, ST, SA>& rhs); -// +// // template // bool // operator!=(const sub_match& lhs, // const basic_string::value_type, ST, SA>& rhs); -// +// // template // bool // operator<(const sub_match& lhs, // const basic_string::value_type, ST, SA>& rhs); -// +// // template // bool operator>(const sub_match& lhs, // const basic_string::value_type, ST, SA>& rhs); -// +// // template // bool // operator>=(const sub_match& lhs, // const basic_string::value_type, ST, SA>& rhs); -// +// // template // bool // operator<=(const sub_match& lhs, // const basic_string::value_type, ST, SA>& rhs); -// +// // template // bool // operator==(typename iterator_traits::value_type const* lhs, // const sub_match& rhs); -// +// // template // bool // operator!=(typename iterator_traits::value_type const* lhs, // const sub_match& rhs); -// +// // template // bool // operator<(typename iterator_traits::value_type const* lhs, // const sub_match& rhs); -// +// // template // bool // operator>(typename iterator_traits::value_type const* lhs, // const sub_match& rhs); -// +// // template // bool // operator>=(typename iterator_traits::value_type const* lhs, // const sub_match& rhs); -// +// // template // bool // operator<=(typename iterator_traits::value_type const* lhs, // const sub_match& rhs); -// +// // template // bool // operator==(const sub_match& lhs, // typename iterator_traits::value_type const* rhs); -// +// // template // bool // operator!=(const sub_match& lhs, // typename iterator_traits::value_type const* rhs); -// +// // template // bool // operator<(const sub_match& lhs, // typename iterator_traits::value_type const* rhs); -// +// // template // bool // operator>(const sub_match& lhs, // typename iterator_traits::value_type const* rhs); -// +// // template // bool // operator>=(const sub_match& lhs, // typename iterator_traits::value_type const* rhs); -// +// // template // bool // operator<=(const sub_match& lhs, // typename iterator_traits::value_type const* rhs); -// +// // template // bool // operator==(typename iterator_traits::value_type const& lhs, // const sub_match& rhs); -// +// // template // bool // operator!=(typename iterator_traits::value_type const& lhs, // const sub_match& rhs); -// +// // template // bool // operator<(typename iterator_traits::value_type const& lhs, // const sub_match& rhs); -// +// // template // bool // operator>(typename iterator_traits::value_type const& lhs, // const sub_match& rhs); -// +// // template // bool // operator>=(typename iterator_traits::value_type const& lhs, // const sub_match& rhs); -// +// // template // bool // operator<=(typename iterator_traits::value_type const& lhs, // const sub_match& rhs); -// +// // template // bool // operator==(const sub_match& lhs, // typename iterator_traits::value_type const& rhs); -// +// // template // bool // operator!=(const sub_match& lhs, // typename iterator_traits::value_type const& rhs); -// +// // template // bool // operator<(const sub_match& lhs, // typename iterator_traits::value_type const& rhs); -// +// // template // bool // operator>(const sub_match& lhs, // typename iterator_traits::value_type const& rhs); -// +// // template // bool // operator>=(const sub_match& lhs, // typename iterator_traits::value_type const& rhs); -// +// // template // bool // operator<=(const sub_match& lhs, diff --git a/test/re/re.submatch/types.pass.cpp b/test/re/re.submatch/types.pass.cpp index 358380ba..2436d181 100644 --- a/test/re/re.submatch/types.pass.cpp +++ b/test/re/re.submatch/types.pass.cpp @@ -18,7 +18,7 @@ // typedef typename iterator_traits::value_type value_type; // typedef typename iterator_traits::difference_type difference_type; // typedef basic_string string_type; -// +// // bool matched; // ... // }; diff --git a/test/re/re.traits/iterators.h b/test/re/re.traits/iterators.h index 85332ac7..bbdeede9 100644 --- a/test/re/re.traits/iterators.h +++ b/test/re/re.traits/iterators.h @@ -248,4 +248,4 @@ operator-(const random_access_iterator& x, const random_access_iterator& y return x.base() - y.base(); } -#endif +#endif // ITERATORS_H diff --git a/test/re/re.traits/transform_primary.pass.cpp b/test/re/re.traits/transform_primary.pass.cpp index 06fe5e75..c9ea1eb6 100644 --- a/test/re/re.traits/transform_primary.pass.cpp +++ b/test/re/re.traits/transform_primary.pass.cpp @@ -27,7 +27,7 @@ int main() const char A[] = "A"; const char Aacute[] = "\xC1"; typedef forward_iterator F; - assert(t.transform_primary(F(A), F(A+1)) != + assert(t.transform_primary(F(A), F(A+1)) != t.transform_primary(F(Aacute), F(Aacute+1))); t.imbue(std::locale("cs_CZ.ISO8859-2")); assert(t.transform_primary(F(A), F(A+1)) == diff --git a/test/re/test_allocator.h b/test/re/test_allocator.h index 898c0900..1c0f163d 100644 --- a/test/re/test_allocator.h +++ b/test/re/test_allocator.h @@ -62,7 +62,7 @@ public: #ifdef _LIBCPP_MOVE void construct(pointer p, T&& val) {::new(p) T(std::move(val));} -#endif +#endif // _LIBCPP_MOVE void destroy(pointer p) {p->~T();} friend bool operator==(const test_allocator& x, const test_allocator& y) @@ -105,8 +105,8 @@ public: #ifdef _LIBCPP_HAS_NO_ADVANCED_SFINAE std::size_t max_size() const {return UINT_MAX / sizeof(T);} -#endif +#endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE }; -#endif +#endif // TEST_ALLOCATOR_H