Implement std::string_view as described in http://wg21.link/P0254R1. Reviewed as https://reviews.llvm.org/D21459

llvm-svn: 276238

12 files changed, 840 insertions, 0 deletions

diff --git a/libcxx/test/std/strings/basic.string/string.nonmembers/string_op!=/string_string_view.pass.cpp b/libcxx/test/std/strings/basic.string/string.nonmembers/string_op!=/string_string_view.pass.cpp
new file mode 100644
index 00000000000..65649465da2
--- /dev/null
+++ b/libcxx/test/std/strings/basic.string/string.nonmembers/string_op!=/string_string_view.pass.cpp
@@ -0,0 +1,70 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <string>
+
+// we get this comparison "for free" because the string implicitly converts to the string_view
+
+#include <string>
+#include <cassert>
+
+#include "min_allocator.h"
+
+template <class S, class SV>
+void
+test(const S& lhs, SV rhs, bool x)
+{
+    assert((lhs != rhs) == x);
+}
+
+int main()
+{
+    {
+    typedef std::string S;
+    typedef std::string SV;
+    test(S(""), SV(""), false);
+    test(S(""), SV("abcde"), true);
+    test(S(""), SV("abcdefghij"), true);
+    test(S(""), SV("abcdefghijklmnopqrst"), true);
+    test(S("abcde"), SV(""), true);
+    test(S("abcde"), SV("abcde"), false);
+    test(S("abcde"), SV("abcdefghij"), true);
+    test(S("abcde"), SV("abcdefghijklmnopqrst"), true);
+    test(S("abcdefghij"), SV(""), true);
+    test(S("abcdefghij"), SV("abcde"), true);
+    test(S("abcdefghij"), SV("abcdefghij"), false);
+    test(S("abcdefghij"), SV("abcdefghijklmnopqrst"), true);
+    test(S("abcdefghijklmnopqrst"), SV(""), true);
+    test(S("abcdefghijklmnopqrst"), SV("abcde"), true);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghij"), true);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghijklmnopqrst"), false);
+    }
+#if TEST_STD_VER >= 11
+    {
+    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+    typedef std::basic_string_view<char, std::char_traits<char>> SV;
+    test(S(""), SV(""), false);
+    test(S(""), SV("abcde"), true);
+    test(S(""), SV("abcdefghij"), true);
+    test(S(""), SV("abcdefghijklmnopqrst"), true);
+    test(S("abcde"), SV(""), true);
+    test(S("abcde"), SV("abcde"), false);
+    test(S("abcde"), SV("abcdefghij"), true);
+    test(S("abcde"), SV("abcdefghijklmnopqrst"), true);
+    test(S("abcdefghij"), SV(""), true);
+    test(S("abcdefghij"), SV("abcde"), true);
+    test(S("abcdefghij"), SV("abcdefghij"), false);
+    test(S("abcdefghij"), SV("abcdefghijklmnopqrst"), true);
+    test(S("abcdefghijklmnopqrst"), SV(""), true);
+    test(S("abcdefghijklmnopqrst"), SV("abcde"), true);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghij"), true);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghijklmnopqrst"), false);
+    }
+#endif
+}
diff --git a/libcxx/test/std/strings/basic.string/string.nonmembers/string_op!=/string_view_string.pass.cpp b/libcxx/test/std/strings/basic.string/string.nonmembers/string_op!=/string_view_string.pass.cpp
new file mode 100644
index 00000000000..88c758c7aa7
--- /dev/null
+++ b/libcxx/test/std/strings/basic.string/string.nonmembers/string_op!=/string_view_string.pass.cpp
@@ -0,0 +1,70 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <string>
+
+// we get this comparison "for free" because the string implicitly converts to the string_view
+
+#include <string>
+#include <cassert>
+
+#include "min_allocator.h"
+
+template <class S, class SV>
+void
+test(SV lhs, const S& rhs, bool x)
+{
+    assert((lhs != rhs) == x);
+}
+
+int main()
+{
+    {
+    typedef std::string S;
+    typedef std::string_view SV;
+    test(SV(""), S(""), false);
+    test(SV(""), S("abcde"), true);
+    test(SV(""), S("abcdefghij"), true);
+    test(SV(""), S("abcdefghijklmnopqrst"), true);
+    test(SV("abcde"), S(""), true);
+    test(SV("abcde"), S("abcde"), false);
+    test(SV("abcde"), S("abcdefghij"), true);
+    test(SV("abcde"), S("abcdefghijklmnopqrst"), true);
+    test(SV("abcdefghij"), S(""), true);
+    test(SV("abcdefghij"), S("abcde"), true);
+    test(SV("abcdefghij"), S("abcdefghij"), false);
+    test(SV("abcdefghij"), S("abcdefghijklmnopqrst"), true);
+    test(SV("abcdefghijklmnopqrst"), S(""), true);
+    test(SV("abcdefghijklmnopqrst"), S("abcde"), true);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghij"), true);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false);
+    }
+#if TEST_STD_VER >= 11
+    {
+    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+    typedef std::basic_string_view<char, std::char_traits<char>> SV;
+    test(SV(""), S(""), false);
+    test(SV(""), S("abcde"), true);
+    test(SV(""), S("abcdefghij"), true);
+    test(SV(""), S("abcdefghijklmnopqrst"), true);
+    test(SV("abcde"), S(""), true);
+    test(SV("abcde"), S("abcde"), false);
+    test(SV("abcde"), S("abcdefghij"), true);
+    test(SV("abcde"), S("abcdefghijklmnopqrst"), true);
+    test(SV("abcdefghij"), S(""), true);
+    test(SV("abcdefghij"), S("abcde"), true);
+    test(SV("abcdefghij"), S("abcdefghij"), false);
+    test(SV("abcdefghij"), S("abcdefghijklmnopqrst"), true);
+    test(SV("abcdefghijklmnopqrst"), S(""), true);
+    test(SV("abcdefghijklmnopqrst"), S("abcde"), true);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghij"), true);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false);
+    }
+#endif
+}
diff --git a/libcxx/test/std/strings/basic.string/string.nonmembers/string_operator==/string_string_view.pass.cpp b/libcxx/test/std/strings/basic.string/string.nonmembers/string_operator==/string_string_view.pass.cpp
new file mode 100644
index 00000000000..f72d1c20a45
--- /dev/null
+++ b/libcxx/test/std/strings/basic.string/string.nonmembers/string_operator==/string_string_view.pass.cpp
@@ -0,0 +1,70 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <string>
+
+// we get this comparison "for free" because the string implicitly converts to the string_view
+                 
+#include <string>
+#include <cassert>
+
+#include "min_allocator.h"
+
+template <class S, class SV>
+void
+test(const S& lhs, SV rhs, bool x)
+{
+    assert((lhs == rhs) == x);
+}
+
+int main()
+{
+    {
+    typedef std::string S;
+    typedef std::string_view SV;
+    test(S(""), SV(""), true);
+    test(S(""), SV("abcde"), false);
+    test(S(""), SV("abcdefghij"), false);
+    test(S(""), SV("abcdefghijklmnopqrst"), false);
+    test(S("abcde"), SV(""), false);
+    test(S("abcde"), SV("abcde"), true);
+    test(S("abcde"), SV("abcdefghij"), false);
+    test(S("abcde"), SV("abcdefghijklmnopqrst"), false);
+    test(S("abcdefghij"), SV(""), false);
+    test(S("abcdefghij"), SV("abcde"), false);
+    test(S("abcdefghij"), SV("abcdefghij"), true);
+    test(S("abcdefghij"), SV("abcdefghijklmnopqrst"), false);
+    test(S("abcdefghijklmnopqrst"), SV(""), false);
+    test(S("abcdefghijklmnopqrst"), SV("abcde"), false);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghij"), false);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghijklmnopqrst"), true);
+    }
+#if TEST_STD_VER >= 11
+    {
+    typedef std::basic_string     <char, std::char_traits<char>, min_allocator<char>> S;
+    typedef std::basic_string_view<char, std::char_traits<char>> SV;
+    test(S(""), SV(""), true);
+    test(S(""), SV("abcde"), false);
+    test(S(""), SV("abcdefghij"), false);
+    test(S(""), SV("abcdefghijklmnopqrst"), false);
+    test(S("abcde"), SV(""), false);
+    test(S("abcde"), SV("abcde"), true);
+    test(S("abcde"), SV("abcdefghij"), false);
+    test(S("abcde"), SV("abcdefghijklmnopqrst"), false);
+    test(S("abcdefghij"), SV(""), false);
+    test(S("abcdefghij"), SV("abcde"), false);
+    test(S("abcdefghij"), SV("abcdefghij"), true);
+    test(S("abcdefghij"), SV("abcdefghijklmnopqrst"), false);
+    test(S("abcdefghijklmnopqrst"), SV(""), false);
+    test(S("abcdefghijklmnopqrst"), SV("abcde"), false);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghij"), false);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghijklmnopqrst"), true);
+    }
+#endif
+}
diff --git a/libcxx/test/std/strings/basic.string/string.nonmembers/string_operator==/string_view_string.pass.cpp b/libcxx/test/std/strings/basic.string/string.nonmembers/string_operator==/string_view_string.pass.cpp
new file mode 100644
index 00000000000..2cd80865905
--- /dev/null
+++ b/libcxx/test/std/strings/basic.string/string.nonmembers/string_operator==/string_view_string.pass.cpp
@@ -0,0 +1,70 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <string>
+
+// we get this comparison "for free" because the string implicitly converts to the string_view
+
+#include <string>
+#include <cassert>
+
+#include "min_allocator.h"
+
+template <class S, class SV>
+void
+test(SV lhs, const S& rhs, bool x)
+{
+    assert((lhs == rhs) == x);
+}
+
+int main()
+{
+    {
+    typedef std::string S;
+    typedef std::string_view SV;
+    test(SV(""), S(""), true);
+    test(SV(""), S("abcde"), false);
+    test(SV(""), S("abcdefghij"), false);
+    test(SV(""), S("abcdefghijklmnopqrst"), false);
+    test(SV("abcde"), S(""), false);
+    test(SV("abcde"), S("abcde"), true);
+    test(SV("abcde"), S("abcdefghij"), false);
+    test(SV("abcde"), S("abcdefghijklmnopqrst"), false);
+    test(SV("abcdefghij"), S(""), false);
+    test(SV("abcdefghij"), S("abcde"), false);
+    test(SV("abcdefghij"), S("abcdefghij"), true);
+    test(SV("abcdefghij"), S("abcdefghijklmnopqrst"), false);
+    test(SV("abcdefghijklmnopqrst"), S(""), false);
+    test(SV("abcdefghijklmnopqrst"), S("abcde"), false);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghij"), false);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true);
+    }
+#if TEST_STD_VER >= 11
+    {
+    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+    typedef std::basic_string_view<char, std::char_traits<char>> SV;
+    test(SV(""), S(""), true);
+    test(SV(""), S("abcde"), false);
+    test(SV(""), S("abcdefghij"), false);
+    test(SV(""), S("abcdefghijklmnopqrst"), false);
+    test(SV("abcde"), S(""), false);
+    test(SV("abcde"), S("abcde"), true);
+    test(SV("abcde"), S("abcdefghij"), false);
+    test(SV("abcde"), S("abcdefghijklmnopqrst"), false);
+    test(SV("abcdefghij"), S(""), false);
+    test(SV("abcdefghij"), S("abcde"), false);
+    test(SV("abcdefghij"), S("abcdefghij"), true);
+    test(SV("abcdefghij"), S("abcdefghijklmnopqrst"), false);
+    test(SV("abcdefghijklmnopqrst"), S(""), false);
+    test(SV("abcdefghijklmnopqrst"), S("abcde"), false);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghij"), false);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true);
+    }
+#endif
+}
diff --git a/libcxx/test/std/strings/basic.string/string.nonmembers/string_opgt/string_string_view.pass.cpp b/libcxx/test/std/strings/basic.string/string.nonmembers/string_opgt/string_string_view.pass.cpp
new file mode 100644
index 00000000000..d9f5d7106db
--- /dev/null
+++ b/libcxx/test/std/strings/basic.string/string.nonmembers/string_opgt/string_string_view.pass.cpp
@@ -0,0 +1,70 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <string>
+
+// we get this comparison "for free" because the string implicitly converts to the string_view
+
+#include <string>
+#include <cassert>
+
+#include "min_allocator.h"
+
+template <class S, class SV>
+void
+test(const S& lhs, SV rhs, bool x)
+{
+    assert((lhs > rhs) == x);
+}
+
+int main()
+{
+    {
+    typedef std::string S;
+    typedef std::string_view SV;
+    test(S(""), SV(""), false);
+    test(S(""), SV("abcde"), false);
+    test(S(""), SV("abcdefghij"), false);
+    test(S(""), SV("abcdefghijklmnopqrst"), false);
+    test(S("abcde"), SV(""), true);
+    test(S("abcde"), SV("abcde"), false);
+    test(S("abcde"), SV("abcdefghij"), false);
+    test(S("abcde"), SV("abcdefghijklmnopqrst"), false);
+    test(S("abcdefghij"), SV(""), true);
+    test(S("abcdefghij"), SV("abcde"), true);
+    test(S("abcdefghij"), SV("abcdefghij"), false);
+    test(S("abcdefghij"), SV("abcdefghijklmnopqrst"), false);
+    test(S("abcdefghijklmnopqrst"), SV(""), true);
+    test(S("abcdefghijklmnopqrst"), SV("abcde"), true);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghij"), true);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghijklmnopqrst"), false);
+    }
+#if TEST_STD_VER >= 11
+    {
+    typedef std::basic_string     <char, std::char_traits<char>, min_allocator<char>> S;
+    typedef std::basic_string_view<char, std::char_traits<char>> SV;
+    test(S(""), SV(""), false);
+    test(S(""), SV("abcde"), false);
+    test(S(""), SV("abcdefghij"), false);
+    test(S(""), SV("abcdefghijklmnopqrst"), false);
+    test(S("abcde"), SV(""), true);
+    test(S("abcde"), SV("abcde"), false);
+    test(S("abcde"), SV("abcdefghij"), false);
+    test(S("abcde"), SV("abcdefghijklmnopqrst"), false);
+    test(S("abcdefghij"), SV(""), true);
+    test(S("abcdefghij"), SV("abcde"), true);
+    test(S("abcdefghij"), SV("abcdefghij"), false);
+    test(S("abcdefghij"), SV("abcdefghijklmnopqrst"), false);
+    test(S("abcdefghijklmnopqrst"), SV(""), true);
+    test(S("abcdefghijklmnopqrst"), SV("abcde"), true);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghij"), true);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghijklmnopqrst"), false);
+    }
+#endif
+}
diff --git a/libcxx/test/std/strings/basic.string/string.nonmembers/string_opgt/string_view_string.pass.cpp b/libcxx/test/std/strings/basic.string/string.nonmembers/string_opgt/string_view_string.pass.cpp
new file mode 100644
index 00000000000..c685bab8fc1
--- /dev/null
+++ b/libcxx/test/std/strings/basic.string/string.nonmembers/string_opgt/string_view_string.pass.cpp
@@ -0,0 +1,70 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <string>
+
+// we get this comparison "for free" because the string implicitly converts to the string_view
+
+#include <string>
+#include <cassert>
+
+#include "min_allocator.h"
+
+template <class S, class SV>
+void
+test(SV lhs, const S& rhs, bool x)
+{
+    assert((lhs > rhs) == x);
+}
+
+int main()
+{
+    {
+    typedef std::string S;
+    typedef std::string_view SV;
+    test(SV(""), S(""), false);
+    test(SV(""), S("abcde"), false);
+    test(SV(""), S("abcdefghij"), false);
+    test(SV(""), S("abcdefghijklmnopqrst"), false);
+    test(SV("abcde"), S(""), true);
+    test(SV("abcde"), S("abcde"), false);
+    test(SV("abcde"), S("abcdefghij"), false);
+    test(SV("abcde"), S("abcdefghijklmnopqrst"), false);
+    test(SV("abcdefghij"), S(""), true);
+    test(SV("abcdefghij"), S("abcde"), true);
+    test(SV("abcdefghij"), S("abcdefghij"), false);
+    test(SV("abcdefghij"), S("abcdefghijklmnopqrst"), false);
+    test(SV("abcdefghijklmnopqrst"), S(""), true);
+    test(SV("abcdefghijklmnopqrst"), S("abcde"), true);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghij"), true);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false);
+    }
+#if TEST_STD_VER >= 11
+    {
+    typedef std::basic_string     <char, std::char_traits<char>, min_allocator<char>> S;
+    typedef std::basic_string_view<char, std::char_traits<char>> SV;
+    test(SV(""), S(""), false);
+    test(SV(""), S("abcde"), false);
+    test(SV(""), S("abcdefghij"), false);
+    test(SV(""), S("abcdefghijklmnopqrst"), false);
+    test(SV("abcde"), S(""), true);
+    test(SV("abcde"), S("abcde"), false);
+    test(SV("abcde"), S("abcdefghij"), false);
+    test(SV("abcde"), S("abcdefghijklmnopqrst"), false);
+    test(SV("abcdefghij"), S(""), true);
+    test(SV("abcdefghij"), S("abcde"), true);
+    test(SV("abcdefghij"), S("abcdefghij"), false);
+    test(SV("abcdefghij"), S("abcdefghijklmnopqrst"), false);
+    test(SV("abcdefghijklmnopqrst"), S(""), true);
+    test(SV("abcdefghijklmnopqrst"), S("abcde"), true);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghij"), true);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false);
+    }
+#endif
+}
diff --git a/libcxx/test/std/strings/basic.string/string.nonmembers/string_opgt=/string_string_view.pass.cpp b/libcxx/test/std/strings/basic.string/string.nonmembers/string_opgt=/string_string_view.pass.cpp
new file mode 100644
index 00000000000..5b9671fca1d
--- /dev/null
+++ b/libcxx/test/std/strings/basic.string/string.nonmembers/string_opgt=/string_string_view.pass.cpp
@@ -0,0 +1,70 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <string>
+
+// we get this comparison "for free" because the string implicitly converts to the string_view
+
+#include <string>
+#include <cassert>
+
+#include "min_allocator.h"
+
+template <class S, class SV>
+void
+test(const S& lhs, SV rhs, bool x)
+{
+    assert((lhs >= rhs) == x);
+}
+
+int main()
+{
+    {
+    typedef std::string S;
+    typedef std::string_view SV;
+    test(S(""), SV(""), true);
+    test(S(""), SV("abcde"), false);
+    test(S(""), SV("abcdefghij"), false);
+    test(S(""), SV("abcdefghijklmnopqrst"), false);
+    test(S("abcde"), SV(""), true);
+    test(S("abcde"), SV("abcde"), true);
+    test(S("abcde"), SV("abcdefghij"), false);
+    test(S("abcde"), SV("abcdefghijklmnopqrst"), false);
+    test(S("abcdefghij"), SV(""), true);
+    test(S("abcdefghij"), SV("abcde"), true);
+    test(S("abcdefghij"), SV("abcdefghij"), true);
+    test(S("abcdefghij"), SV("abcdefghijklmnopqrst"), false);
+    test(S("abcdefghijklmnopqrst"), SV(""), true);
+    test(S("abcdefghijklmnopqrst"), SV("abcde"), true);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghij"), true);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghijklmnopqrst"), true);
+    }
+#if TEST_STD_VER >= 11
+    {
+    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+    typedef std::basic_string_view<char, std::char_traits<char>> SV;
+    test(S(""), SV(""), true);
+    test(S(""), SV("abcde"), false);
+    test(S(""), SV("abcdefghij"), false);
+    test(S(""), SV("abcdefghijklmnopqrst"), false);
+    test(S("abcde"), SV(""), true);
+    test(S("abcde"), SV("abcde"), true);
+    test(S("abcde"), SV("abcdefghij"), false);
+    test(S("abcde"), SV("abcdefghijklmnopqrst"), false);
+    test(S("abcdefghij"), SV(""), true);
+    test(S("abcdefghij"), SV("abcde"), true);
+    test(S("abcdefghij"), SV("abcdefghij"), true);
+    test(S("abcdefghij"), SV("abcdefghijklmnopqrst"), false);
+    test(S("abcdefghijklmnopqrst"), SV(""), true);
+    test(S("abcdefghijklmnopqrst"), SV("abcde"), true);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghij"), true);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghijklmnopqrst"), true);
+    }
+#endif
+}
diff --git a/libcxx/test/std/strings/basic.string/string.nonmembers/string_opgt=/string_view_string.pass.cpp b/libcxx/test/std/strings/basic.string/string.nonmembers/string_opgt=/string_view_string.pass.cpp
new file mode 100644
index 00000000000..07c8282a740
--- /dev/null
+++ b/libcxx/test/std/strings/basic.string/string.nonmembers/string_opgt=/string_view_string.pass.cpp
@@ -0,0 +1,70 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <string>
+
+// we get this comparison "for free" because the string implicitly converts to the string_view
+
+#include <string>
+#include <cassert>
+
+#include "min_allocator.h"
+
+template <class S, class SV>
+void
+test(SV lhs, const S& rhs, bool x)
+{
+    assert((lhs >= rhs) == x);
+}
+
+int main()
+{
+    {
+    typedef std::string S;
+    typedef std::string_view SV;
+    test(SV(""), S(""), true);
+    test(SV(""), S("abcde"), false);
+    test(SV(""), S("abcdefghij"), false);
+    test(SV(""), S("abcdefghijklmnopqrst"), false);
+    test(SV("abcde"), S(""), true);
+    test(SV("abcde"), S("abcde"), true);
+    test(SV("abcde"), S("abcdefghij"), false);
+    test(SV("abcde"), S("abcdefghijklmnopqrst"), false);
+    test(SV("abcdefghij"), S(""), true);
+    test(SV("abcdefghij"), S("abcde"), true);
+    test(SV("abcdefghij"), S("abcdefghij"), true);
+    test(SV("abcdefghij"), S("abcdefghijklmnopqrst"), false);
+    test(SV("abcdefghijklmnopqrst"), S(""), true);
+    test(SV("abcdefghijklmnopqrst"), S("abcde"), true);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghij"), true);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true);
+    }
+#if TEST_STD_VER >= 11
+    {
+    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+    typedef std::basic_string_view<char, std::char_traits<char>> SV;
+    test(SV(""), S(""), true);
+    test(SV(""), S("abcde"), false);
+    test(SV(""), S("abcdefghij"), false);
+    test(SV(""), S("abcdefghijklmnopqrst"), false);
+    test(SV("abcde"), S(""), true);
+    test(SV("abcde"), S("abcde"), true);
+    test(SV("abcde"), S("abcdefghij"), false);
+    test(SV("abcde"), S("abcdefghijklmnopqrst"), false);
+    test(SV("abcdefghij"), S(""), true);
+    test(SV("abcdefghij"), S("abcde"), true);
+    test(SV("abcdefghij"), S("abcdefghij"), true);
+    test(SV("abcdefghij"), S("abcdefghijklmnopqrst"), false);
+    test(SV("abcdefghijklmnopqrst"), S(""), true);
+    test(SV("abcdefghijklmnopqrst"), S("abcde"), true);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghij"), true);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true);
+    }
+#endif
+}
diff --git a/libcxx/test/std/strings/basic.string/string.nonmembers/string_oplt/string_string_view.pass.cpp b/libcxx/test/std/strings/basic.string/string.nonmembers/string_oplt/string_string_view.pass.cpp
new file mode 100644
index 00000000000..8fef8e60a96
--- /dev/null
+++ b/libcxx/test/std/strings/basic.string/string.nonmembers/string_oplt/string_string_view.pass.cpp
@@ -0,0 +1,70 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <string>
+
+// we get this comparison "for free" because the string implicitly converts to the string_view
+
+#include <string>
+#include <cassert>
+
+#include "min_allocator.h"
+
+template <class S, class SV>
+void
+test(const S& lhs, SV rhs, bool x)
+{
+    assert((lhs < rhs) == x);
+}
+
+int main()
+{
+    {
+    typedef std::string S;
+    typedef std::string_view SV;
+    test(S(""), SV(""), false);
+    test(S(""), SV("abcde"), true);
+    test(S(""), SV("abcdefghij"), true);
+    test(S(""), SV("abcdefghijklmnopqrst"), true);
+    test(S("abcde"), SV(""), false);
+    test(S("abcde"), SV("abcde"), false);
+    test(S("abcde"), SV("abcdefghij"), true);
+    test(S("abcde"), SV("abcdefghijklmnopqrst"), true);
+    test(S("abcdefghij"), SV(""), false);
+    test(S("abcdefghij"), SV("abcde"), false);
+    test(S("abcdefghij"), SV("abcdefghij"), false);
+    test(S("abcdefghij"), SV("abcdefghijklmnopqrst"), true);
+    test(S("abcdefghijklmnopqrst"), SV(""), false);
+    test(S("abcdefghijklmnopqrst"), SV("abcde"), false);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghij"), false);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghijklmnopqrst"), false);
+    }
+#if TEST_STD_VER >= 11
+    {
+    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+    typedef std::basic_string_view<char, std::char_traits<char>> SV;
+    test(S(""), SV(""), false);
+    test(S(""), SV("abcde"), true);
+    test(S(""), SV("abcdefghij"), true);
+    test(S(""), SV("abcdefghijklmnopqrst"), true);
+    test(S("abcde"), SV(""), false);
+    test(S("abcde"), SV("abcde"), false);
+    test(S("abcde"), SV("abcdefghij"), true);
+    test(S("abcde"), SV("abcdefghijklmnopqrst"), true);
+    test(S("abcdefghij"), SV(""), false);
+    test(S("abcdefghij"), SV("abcde"), false);
+    test(S("abcdefghij"), SV("abcdefghij"), false);
+    test(S("abcdefghij"), SV("abcdefghijklmnopqrst"), true);
+    test(S("abcdefghijklmnopqrst"), SV(""), false);
+    test(S("abcdefghijklmnopqrst"), SV("abcde"), false);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghij"), false);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghijklmnopqrst"), false);
+    }
+#endif
+}
diff --git a/libcxx/test/std/strings/basic.string/string.nonmembers/string_oplt/string_view_string.pass.cpp b/libcxx/test/std/strings/basic.string/string.nonmembers/string_oplt/string_view_string.pass.cpp
new file mode 100644
index 00000000000..80da8cd0048
--- /dev/null
+++ b/libcxx/test/std/strings/basic.string/string.nonmembers/string_oplt/string_view_string.pass.cpp
@@ -0,0 +1,70 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <string>
+
+// we get this comparison "for free" because the string implicitly converts to the string_view
+
+#include <string>
+#include <cassert>
+
+#include "min_allocator.h"
+
+template <class S, class SV>
+void
+test(SV lhs, const S& rhs, bool x)
+{
+    assert((lhs < rhs) == x);
+}
+
+int main()
+{
+    {
+    typedef std::string S;
+    typedef std::string_view SV;
+    test(SV(""), S(""), false);
+    test(SV(""), S("abcde"), true);
+    test(SV(""), S("abcdefghij"), true);
+    test(SV(""), S("abcdefghijklmnopqrst"), true);
+    test(SV("abcde"), S(""), false);
+    test(SV("abcde"), S("abcde"), false);
+    test(SV("abcde"), S("abcdefghij"), true);
+    test(SV("abcde"), S("abcdefghijklmnopqrst"), true);
+    test(SV("abcdefghij"), S(""), false);
+    test(SV("abcdefghij"), S("abcde"), false);
+    test(SV("abcdefghij"), S("abcdefghij"), false);
+    test(SV("abcdefghij"), S("abcdefghijklmnopqrst"), true);
+    test(SV("abcdefghijklmnopqrst"), S(""), false);
+    test(SV("abcdefghijklmnopqrst"), S("abcde"), false);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghij"), false);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false);
+    }
+#if TEST_STD_VER >= 11
+    {
+    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+    typedef std::basic_string_view<char, std::char_traits<char>> SV;
+    test(SV(""), S(""), false);
+    test(SV(""), S("abcde"), true);
+    test(SV(""), S("abcdefghij"), true);
+    test(SV(""), S("abcdefghijklmnopqrst"), true);
+    test(SV("abcde"), S(""), false);
+    test(SV("abcde"), S("abcde"), false);
+    test(SV("abcde"), S("abcdefghij"), true);
+    test(SV("abcde"), S("abcdefghijklmnopqrst"), true);
+    test(SV("abcdefghij"), S(""), false);
+    test(SV("abcdefghij"), S("abcde"), false);
+    test(SV("abcdefghij"), S("abcdefghij"), false);
+    test(SV("abcdefghij"), S("abcdefghijklmnopqrst"), true);
+    test(SV("abcdefghijklmnopqrst"), S(""), false);
+    test(SV("abcdefghijklmnopqrst"), S("abcde"), false);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghij"), false);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false);
+    }
+#endif
+}
diff --git a/libcxx/test/std/strings/basic.string/string.nonmembers/string_oplt=/string_string_view.pass.cpp b/libcxx/test/std/strings/basic.string/string.nonmembers/string_oplt=/string_string_view.pass.cpp
new file mode 100644
index 00000000000..97a9d7cc717
--- /dev/null
+++ b/libcxx/test/std/strings/basic.string/string.nonmembers/string_oplt=/string_string_view.pass.cpp
@@ -0,0 +1,70 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <string>
+
+// we get this comparison "for free" because the string implicitly converts to the string_view
+
+#include <string>
+#include <cassert>
+
+#include "min_allocator.h"
+
+template <class S, class SV>
+void
+test(const S& lhs, SV rhs, bool x)
+{
+    assert((lhs <= rhs) == x);
+}
+
+int main()
+{
+    {
+    typedef std::string S;
+    typedef std::string_view SV;
+    test(S(""), SV(""), true);
+    test(S(""), SV("abcde"), true);
+    test(S(""), SV("abcdefghij"), true);
+    test(S(""), SV("abcdefghijklmnopqrst"), true);
+    test(S("abcde"), SV(""), false);
+    test(S("abcde"), SV("abcde"), true);
+    test(S("abcde"), SV("abcdefghij"), true);
+    test(S("abcde"), SV("abcdefghijklmnopqrst"), true);
+    test(S("abcdefghij"), SV(""), false);
+    test(S("abcdefghij"), SV("abcde"), false);
+    test(S("abcdefghij"), SV("abcdefghij"), true);
+    test(S("abcdefghij"), SV("abcdefghijklmnopqrst"), true);
+    test(S("abcdefghijklmnopqrst"), SV(""), false);
+    test(S("abcdefghijklmnopqrst"), SV("abcde"), false);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghij"), false);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghijklmnopqrst"), true);
+    }
+#if TEST_STD_VER >= 11
+    {
+    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+    typedef std::basic_string_view<char, std::char_traits<char>> SV;
+    test(S(""), SV(""), true);
+    test(S(""), SV("abcde"), true);
+    test(S(""), SV("abcdefghij"), true);
+    test(S(""), SV("abcdefghijklmnopqrst"), true);
+    test(S("abcde"), SV(""), false);
+    test(S("abcde"), SV("abcde"), true);
+    test(S("abcde"), SV("abcdefghij"), true);
+    test(S("abcde"), SV("abcdefghijklmnopqrst"), true);
+    test(S("abcdefghij"), SV(""), false);
+    test(S("abcdefghij"), SV("abcde"), false);
+    test(S("abcdefghij"), SV("abcdefghij"), true);
+    test(S("abcdefghij"), SV("abcdefghijklmnopqrst"), true);
+    test(S("abcdefghijklmnopqrst"), SV(""), false);
+    test(S("abcdefghijklmnopqrst"), SV("abcde"), false);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghij"), false);
+    test(S("abcdefghijklmnopqrst"), SV("abcdefghijklmnopqrst"), true);
+    }
+#endif
+}
diff --git a/libcxx/test/std/strings/basic.string/string.nonmembers/string_oplt=/string_view_string.pass.cpp b/libcxx/test/std/strings/basic.string/string.nonmembers/string_oplt=/string_view_string.pass.cpp
new file mode 100644
index 00000000000..f19a4aa0fd5
--- /dev/null
+++ b/libcxx/test/std/strings/basic.string/string.nonmembers/string_oplt=/string_view_string.pass.cpp
@@ -0,0 +1,70 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <string>
+
+// we get this comparison "for free" because the string implicitly converts to the string_view
+
+#include <string>
+#include <cassert>
+
+#include "min_allocator.h"
+
+template <class S, class SV>
+void
+test(SV lhs, const S& rhs, bool x)
+{
+    assert((lhs <= rhs) == x);
+}
+
+int main()
+{
+    {
+    typedef std::string S;
+    typedef std::string_view SV;
+    test(SV(""), S(""), true);
+    test(SV(""), S("abcde"), true);
+    test(SV(""), S("abcdefghij"), true);
+    test(SV(""), S("abcdefghijklmnopqrst"), true);
+    test(SV("abcde"), S(""), false);
+    test(SV("abcde"), S("abcde"), true);
+    test(SV("abcde"), S("abcdefghij"), true);
+    test(SV("abcde"), S("abcdefghijklmnopqrst"), true);
+    test(SV("abcdefghij"), S(""), false);
+    test(SV("abcdefghij"), S("abcde"), false);
+    test(SV("abcdefghij"), S("abcdefghij"), true);
+    test(SV("abcdefghij"), S("abcdefghijklmnopqrst"), true);
+    test(SV("abcdefghijklmnopqrst"), S(""), false);
+    test(SV("abcdefghijklmnopqrst"), S("abcde"), false);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghij"), false);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true);
+    }
+#if TEST_STD_VER >= 11
+    {
+    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+    typedef std::basic_string_view<char, std::char_traits<char>> SV;
+    test(SV(""), S(""), true);
+    test(SV(""), S("abcde"), true);
+    test(SV(""), S("abcdefghij"), true);
+    test(SV(""), S("abcdefghijklmnopqrst"), true);
+    test(SV("abcde"), S(""), false);
+    test(SV("abcde"), S("abcde"), true);
+    test(SV("abcde"), S("abcdefghij"), true);
+    test(SV("abcde"), S("abcdefghijklmnopqrst"), true);
+    test(SV("abcdefghij"), S(""), false);
+    test(SV("abcdefghij"), S("abcde"), false);
+    test(SV("abcdefghij"), S("abcdefghij"), true);
+    test(SV("abcdefghij"), S("abcdefghijklmnopqrst"), true);
+    test(SV("abcdefghijklmnopqrst"), S(""), false);
+    test(SV("abcdefghijklmnopqrst"), S("abcde"), false);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghij"), false);
+    test(SV("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true);
+    }
+#endif
+}