Changeset 2096Tweet

Timestamp:

Nov 20, 2012, 1:23:09 AM (9 years ago)

Author:

sam

Message:

core: more string concatenation and comparison methods, plus a lot
of unit tests for the String class.

Location:

trunk

Files:

• src/Makefile.am (modified) (1 diff)
• src/lol/core/string.h (modified) (3 diffs)
• test/Makefile.am (modified) (1 diff)
• test/unit/string.cpp (added)

trunk/src/Makefile.am

@@ -18 +18 @@
     \
     lol/unit.h lol/debug.h \
+    lol/core/array.h lol/core/string.h \
     lol/math/vector.h lol/math/half.h lol/math/real.h lol/math/remez.h \
     lol/math/math.h \

trunk/src/lol/core/string.h

@@ -45 +45 @@
     }
 
+    inline String(String const &s)
+      : Super((Super const &)s)
+    {
+    }
+
     inline char &operator [](int n)
     {
@@ -55 +60 @@
     }
 
-    inline String operator +(String const &s)
+    inline int Count() const
+    {
+        return ((Super const &)*this).Count() - 1;
+    }
+
+    inline String operator +(String const &s) const
     {
         String ret(*this);
@@ -68 +78 @@
         return *this;
     }
+
+    inline String operator +(char c) const
+    {
+        String ret(*this);
+        return ret += c;
+    }
+
+    inline String operator +=(char c)
+    {
+        ((Super &)*this).Last() = c;
+        ((Super &)*this).Push('\0');
+        return *this;
+    }
+
+    inline bool operator ==(String const &s) const
+    {
+        if (this->m_count != s.m_count)
+            return false;
+
+        for (int i = 0; i < this->m_count; ++i)
+            if ((*this)[i] != s[i])
+                return false;
+
+        return true;
+    }
+
+    inline bool operator !=(String const &s) const
+    {
+        return !(*this == s);
+    }
 };
 

trunk/test/Makefile.am

@@ -23 +23 @@
     unit/vector.cpp unit/matrix.cpp unit/half.cpp unit/trig.cpp \
     unit/build.cpp unit/real.cpp unit/image.cpp unit/quat.cpp unit/cmplx.cpp \
-    unit/array.cpp unit/rotation.cpp
+    unit/array.cpp unit/rotation.cpp unit/string.cpp
 testsuite_CPPFLAGS = @LOL_CFLAGS@
 testsuite_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@