[cfe-commits] [libcxx] r140271 - in /libcxx/trunk/test/re/re.iter/re.tokiter: re.tokiter.cnstr/array.pass.cpp re.tokiter.cnstr/init.pass.cpp re.tokiter.cnstr/int.pass.cpp re.tokiter.cnstr/vector.pass.cpp re.tokiter.comp/equal.pass.cpp re.tokiter.deref/deref.pass.cpp re.tokiter.incr/post.pass.cpp

Howard Hinnant hhinnant at apple.com
Wed Sep 21 11:33:46 PDT 2011


Author: hhinnant
Date: Wed Sep 21 13:33:46 2011
New Revision: 140271

URL: http://llvm.org/viewvc/llvm-project?rev=140271&view=rev
Log:
Fix test bugs found by David Chisnall

Modified:
    libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/array.pass.cpp
    libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp
    libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/int.pass.cpp
    libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.pass.cpp
    libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.comp/equal.pass.cpp
    libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.deref/deref.pass.cpp
    libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.incr/post.pass.cpp

Modified: libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/array.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/array.pass.cpp?rev=140271&r1=140270&r2=140271&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/array.pass.cpp (original)
+++ libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/array.pass.cpp Wed Sep 21 13:33:46 2011
@@ -27,7 +27,7 @@
         std::regex phone_numbers("\\d{3}-(\\d{4})");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
         const int indices[] = {-1, 0, 1};
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, indices);
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "start ");

Modified: libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp?rev=140271&r1=140270&r2=140271&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp (original)
+++ libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp Wed Sep 21 13:33:46 2011
@@ -26,7 +26,7 @@
     {
         std::regex phone_numbers("\\d{3}-(\\d{4})");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, {-1, 0, 1});
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "start ");

Modified: libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/int.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/int.pass.cpp?rev=140271&r1=140270&r2=140271&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/int.pass.cpp (original)
+++ libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/int.pass.cpp Wed Sep 21 13:33:46 2011
@@ -24,7 +24,7 @@
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, -1);
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "start ");
@@ -43,7 +43,7 @@
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers);
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "555-1234");
@@ -59,7 +59,7 @@
     {
         std::regex phone_numbers("\\d{3}-(\\d{4})");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, 1);
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "1234");

Modified: libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.pass.cpp?rev=140271&r1=140270&r2=140271&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.pass.cpp (original)
+++ libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.pass.cpp Wed Sep 21 13:33:46 2011
@@ -28,7 +28,7 @@
         std::vector<int> v;
         v.push_back(-1);
         v.push_back(-1);
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, v);
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "start ");
@@ -59,7 +59,7 @@
         std::vector<int> v;
         v.push_back(-1);
         v.push_back(0);
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, v);
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "start ");
@@ -91,7 +91,7 @@
         v.push_back(-1);
         v.push_back(0);
         v.push_back(1);
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, v);
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "start ");

Modified: libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.comp/equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.comp/equal.pass.cpp?rev=140271&r1=140270&r2=140271&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.comp/equal.pass.cpp (original)
+++ libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.comp/equal.pass.cpp Wed Sep 21 13:33:46 2011
@@ -22,7 +22,7 @@
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, -1);
         assert(i != std::cregex_token_iterator());
         assert(!(i == std::cregex_token_iterator()));

Modified: libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.deref/deref.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.deref/deref.pass.cpp?rev=140271&r1=140270&r2=140271&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.deref/deref.pass.cpp (original)
+++ libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.deref/deref.pass.cpp Wed Sep 21 13:33:46 2011
@@ -21,7 +21,7 @@
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, -1);
         assert(i != std::cregex_token_iterator());
         assert((*i).str() == "start ");
@@ -40,7 +40,7 @@
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers);
         assert(i != std::cregex_token_iterator());
         assert((*i).str() == "555-1234");
@@ -56,7 +56,7 @@
     {
         std::regex phone_numbers("\\d{3}-(\\d{4})");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, 1);
         assert(i != std::cregex_token_iterator());
         assert((*i).str() == "1234");

Modified: libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.incr/post.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.incr/post.pass.cpp?rev=140271&r1=140270&r2=140271&view=diff
==============================================================================
--- libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.incr/post.pass.cpp (original)
+++ libcxx/trunk/test/re/re.iter/re.tokiter/re.tokiter.incr/post.pass.cpp Wed Sep 21 13:33:46 2011
@@ -21,7 +21,7 @@
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, -1);
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "start ");
@@ -40,7 +40,7 @@
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers);
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "555-1234");
@@ -56,7 +56,7 @@
     {
         std::regex phone_numbers("\\d{3}-(\\d{4})");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, 1);
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "1234");





More information about the cfe-commits mailing list