Changeset 2100Tweet

Timestamp:

Nov 21, 2012, 1:34:09 AM (11 years ago)

Author:

sam

Message:

core: implement String::Printf() and start working on the unit tests.
I'm gonna commit this right now though I'm not really sure whether Visual
Studio will agree to build va_copy and others.

Location:

trunk

Files:

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

trunk/src/Makefile.am

@@ -41 +41 @@
     $(bullet_sources) \
     \
-    core/hash.cpp \
+    core/hash.cpp core/string.cpp \
     \
     thread/threadbase.h thread/thread.h \

trunk/src/lol/core/string.h

@@ -71 +71 @@
     }
 
-    inline String operator +=(String const &s)
+    inline String& operator +=(String const &s)
     {
         /* Be careful, we have a trailing zero we don't want! */
@@ -85 +85 @@
     }
 
-    inline String operator +=(char c)
+    inline String& operator +=(char c)
     {
         ((Super &)*this).Last() = c;
@@ -108 +108 @@
         return !(*this == s);
     }
+
+#ifdef __GNUC__
+#   define LOL_FMT_ATTR(n, p) __attribute__((format(printf, n, p)))
+#else
+#   define LOL_FMT_ATTR(n, p)
+#endif
+    static String Printf(char const *format, ...) LOL_FMT_ATTR(1, 2);
+#undef LOL_FMT_ATTR
 };
 

trunk/src/lolcore.vcxproj

@@ -236 +236 @@
     <ClCompile Include="camera.cpp" />
     <ClCompile Include="core\hash.cpp" />
+    <ClCompile Include="core\string.cpp" />
     <ClCompile Include="debug\fps.cpp" />
     <ClCompile Include="debug\record.cpp" />

trunk/src/lolcore.vcxproj.filters

@@ -12 +12 @@
       <UniqueIdentifier>{e056731c-5484-434a-965e-801c199c0366}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\core">
+      <UniqueIdentifier>{a63b1fd6-3747-4a9f-9bd7-3f942133ad6b}</UniqueIdentifier>
+    </Filter>
     <Filter Include="src\platform">
       <UniqueIdentifier>{a11c55f8-8e10-4270-be24-38e8d4fcf589}</UniqueIdentifier>
@@ -180 +183 @@
     </ClCompile>
     <ClCompile Include="hash.cpp">
-      <Filter>src\...</Filter>
+      <Filter>src\core</Filter>
+    </ClCompile>
+    <ClCompile Include="string.cpp">
+      <Filter>src\core</Filter>
     </ClCompile>
     <ClCompile Include="layer.cpp">

trunk/test/unit/string.cpp

@@ -121 +121 @@
         LOLUNIT_ASSERT(!(s1 != s3));
     }
+
+    LOLUNIT_TEST(StringPrintf)
+    {
+        String s1 = "3a";
+        String s2 = String::Printf("%d%x", 3, 10);
+
+        LOLUNIT_ASSERT(s1 == s2);
+    }
 };