Merge pull request #2449 from TurkeyMan/string_view_tidy

Tidied up core.stdcpp.string_view a bit.

Author: thewilsonator

src/core/stdcpp/string_view.d

@@ -34,12 +34,16 @@ else
 }
 
 extern(C++, (StdNamespace)):
+@nogc:
 
 ///
 alias string_view = basic_string_view!char;
-//alias u16string_view = basic_string_view!wchar; // TODO: can't mangle these yet either...
-//alias u32string_view = basic_string_view!dchar;
-//alias wstring_view = basic_string_view!wchar_t; // TODO: we can't mangle wchar_t properly (yet?)
+///
+alias u16string_view = basic_string_view!wchar;
+///
+alias u32string_view = basic_string_view!dchar;
+///
+alias wstring_view = basic_string_view!wchar_t;
 
 
 /**
@@ -58,6 +62,7 @@ extern(C++, class) struct basic_string_view(T, Traits = char_traits!T)
 {
 extern(D):
 pragma(inline, true):
+pure nothrow @nogc:
 
     ///
     enum size_type npos = size_type.max;
@@ -76,75 +81,51 @@ pragma(inline, true):
     ///
     alias as_array this;
 
+    ///
+    this(const(T)[] str) @trusted                   { __data = str.ptr; __size = str.length; }
+
     ///
     alias length = size;
     ///
     alias opDollar = length;
     ///
-    bool empty() const nothrow @safe @nogc                          { return size() == 0; }
+    size_type size() const @safe                    { return __size; }
+    ///
+    bool empty() const @safe                        { return __size == 0; }
 
     ///
-    ref const(T) front() const nothrow @safe @nogc                  { return this[0]; }
+    const(T)* data() const @safe                    { return __data; }
     ///
-    ref const(T) back() const nothrow @safe @nogc                   { return this[$-1]; }
+    const(T)[] as_array() const @trusted            { return __data[0 .. __size]; }
 
+    ///
+    ref const(T) at(size_type i) const @trusted     { return __data[0 .. __size][i]; }
+
+    ///
+    ref const(T) front() const @safe                { return this[0]; }
+    ///
+    ref const(T) back() const @safe                 { return this[$-1]; }
+
+private:
+    // use the proper field names from C++ so debugging doesn't get weird
     version (CppRuntime_Windows)
     {
-        ///
-        this(const(T)[] str) nothrow @trusted @nogc                 { _Mydata = str.ptr; _Mysize = str.length; }
-
-        ///
-        size_type size() const nothrow @safe @nogc                  { return _Mysize; }
-        ///
-        const(T)* data() const nothrow @safe @nogc                  { return _Mydata; }
-        ///
-        const(T)[] as_array() const inout @trusted @nogc            { return _Mydata[0 .. _Mysize]; }
-        ///
-        ref const(T) at(size_type i) const nothrow @trusted @nogc   { return _Mydata[0 .. _Mysize][i]; }
-
-        version (CppRuntime_Microsoft)
-        {
-            import core.stdcpp.xutility : MSVCLinkDirectives;
-            mixin MSVCLinkDirectives!false;
-        }
-
-    private:
         const_pointer _Mydata;
         size_type _Mysize;
+
+        alias __data = _Mydata;
+        alias __size = _Mysize;
     }
     else version (CppRuntime_Gcc)
     {
-        ///
-        this(const(T)[] str) nothrow @trusted @nogc                 { _M_str = str.ptr; _M_len = str.length; }
-
-        ///
-        size_type size() const nothrow @safe @nogc                  { return _M_len; }
-        ///
-        const(T)* data() const nothrow @safe @nogc                  { return _M_str; }
-        ///
-        const(T)[] as_array() const nothrow @trusted @nogc          { return _M_str[0 .. _M_len]; }
-        ///
-        ref const(T) at(size_type i) const nothrow @trusted @nogc   { return _M_str[0 .. _M_len][i]; }
-
-    private:
         size_t _M_len;
         const(T)* _M_str;
+
+        alias __data = _M_str;
+        alias __size = _M_len;
     }
     else version (CppRuntime_Clang)
     {
-        ///
-        this(const(T)[] str) nothrow @trusted @nogc                 { __data = str.ptr; __size = str.length; }
-
-        ///
-        size_type size() const nothrow @safe @nogc                  { return __size; }
-        ///
-        const(T)* data() const nothrow @safe @nogc                  { return __data; }
-        ///
-        const(T)[] as_array() const nothrow @trusted @nogc          { return __data[0 .. __size]; }
-        ///
-        ref const(T) at(size_type i) const nothrow @trusted @nogc   { return __data[0 .. __size][i]; }
-
-    private:
         const value_type* __data;
         size_type __size;
     }