New ast module for for npc parsing

Will eventually put most/all parsers there.

2 files changed, 21 insertions, 7 deletions

diff --git a/src/strings/rstring.cpp b/src/strings/rstring.cpp
index e74d1d5..5675935 100644
--- a/src/strings/rstring.cpp
+++ b/src/strings/rstring.cpp
@@ -58,13 +58,18 @@ namespace strings
     }
     RString& RString::operator = (const RString& r)
     {
-        // order important for self-assign
-        if (!r.maybe_end)
-            r.u.owned->count++;
-        if (!maybe_end && !u.owned->count--)
-            ::operator delete(u.owned);
-        u = r.u;
-        maybe_end = r.maybe_end;
+        // this turns out to be a win
+        // certain callers end up needing to do self-assignment a *lot*,
+        // leading to pointless ++,--s
+        if (this->u.owned != r.u.owned)
+        {
+            if (!r.maybe_end)
+                r.u.owned->count++;
+            if (!maybe_end && !u.owned->count--)
+                ::operator delete(u.owned);
+            u = r.u;
+            maybe_end = r.maybe_end;
+        }
         return *this;
     }
     RString& RString::operator = (RString&& r)
diff --git a/src/strings/strings2_test.cpp b/src/strings/strings2_test.cpp
index 8ac8482..8b91306 100644
--- a/src/strings/strings2_test.cpp
+++ b/src/strings/strings2_test.cpp
@@ -228,4 +228,13 @@ TEST(StringTests, rlong)
     EXPECT_EQ(&*r.begin(), &*r3.begin());
     EXPECT_EQ(&*a.begin(), &*a3.begin());
 }
+
+TEST(StringTest, rself)
+{
+    // force dynamic allocation; valgrind will check for memory errors
+    RString r = XString("foo bar baz"_s);
+    RString r2 = r;
+    r = r;
+    r = r2;
+}
 } // namespace tmwa