浏览代码

AK: Made Strings reversible

`AK::String` can now be reversed via AK::String::reverse(). This makes
life a lot easier for functions like `itoa()`, where the output
ends up being backwards. Very much not like the normal STL
(which requires an `std::reverse` object) way of doing things.

A call to reverse returns a new `AK::String` so as to not upset any
of the possible references to the same `StringImpl` shared between
Strings.
Jesse Buhagiar 5 年之前
父节点
当前提交
26e81ad574
共有 4 个文件被更改,包括 28 次插入4 次删除
  1. 8 2
      AK/String.h
  2. 16 1
      AK/StringImpl.cpp
  3. 3 1
      AK/StringImpl.h
  4. 1 0
      AK/Tests/TestString.cpp

+ 8 - 2
AK/String.h

@@ -110,6 +110,13 @@ public:
         return m_impl->to_uppercase();
         return m_impl->to_uppercase();
     }
     }
 
 
+    String reversed() const
+    {
+        if (!m_impl)
+            return String();
+        return m_impl->reversed();
+    }
+
     Vector<String> split_limit(char separator, int limit) const;
     Vector<String> split_limit(char separator, int limit) const;
     Vector<String> split(char separator) const;
     Vector<String> split(char separator) const;
     String substring(int start, int length) const;
     String substring(int start, int length) const;
@@ -227,7 +234,6 @@ struct Traits<String> : public GenericTraits<String> {
 struct CaseInsensitiveStringTraits : public AK::Traits<String> {
 struct CaseInsensitiveStringTraits : public AK::Traits<String> {
     static unsigned hash(const String& s) { return s.impl() ? s.to_lowercase().impl()->hash() : 0; }
     static unsigned hash(const String& s) { return s.impl() ? s.to_lowercase().impl()->hash() : 0; }
     static bool equals(const String& a, const String& b) { return a.to_lowercase() == b.to_lowercase(); }
     static bool equals(const String& a, const String& b) { return a.to_lowercase() == b.to_lowercase(); }
-
 };
 };
 
 
 inline bool operator<(const char* characters, const String& string)
 inline bool operator<(const char* characters, const String& string)
@@ -264,5 +270,5 @@ inline bool operator<=(const char* characters, const String& string)
 
 
 }
 }
 
 
-using AK::String;
 using AK::CaseInsensitiveStringTraits;
 using AK::CaseInsensitiveStringTraits;
+using AK::String;

+ 16 - 1
AK/StringImpl.cpp

@@ -4,7 +4,7 @@
 #include "kmalloc.h"
 #include "kmalloc.h"
 
 
 #ifndef __serenity__
 #ifndef __serenity__
-#include <new>
+#    include <new>
 #endif
 #endif
 
 
 //#define DEBUG_STRINGIMPL
 //#define DEBUG_STRINGIMPL
@@ -172,4 +172,19 @@ void StringImpl::compute_hash() const
     m_has_hash = true;
     m_has_hash = true;
 }
 }
 
 
+NonnullRefPtr<StringImpl> StringImpl::reversed() const
+{
+    if (m_length == 0)
+        return the_empty_stringimpl();
+
+    char* buffer;
+    const char* pos = &m_inline_buffer[m_length - 1];
+    auto new_impl = create_uninitialized(m_length, buffer);
+
+    for (int i = 0; i < m_length; i++)
+        buffer[i] = *pos--;
+
+    return new_impl;
+}
+
 }
 }

+ 3 - 1
AK/StringImpl.h

@@ -1,7 +1,7 @@
 #pragma once
 #pragma once
 
 
-#include <AK/RefPtr.h>
 #include <AK/RefCounted.h>
 #include <AK/RefCounted.h>
+#include <AK/RefPtr.h>
 #include <AK/Types.h>
 #include <AK/Types.h>
 #include <AK/kmalloc.h>
 #include <AK/kmalloc.h>
 
 
@@ -44,6 +44,8 @@ public:
         return m_hash;
         return m_hash;
     }
     }
 
 
+    NonnullRefPtr<StringImpl> reversed() const;
+
 private:
 private:
     enum ConstructTheEmptyStringImplTag {
     enum ConstructTheEmptyStringImplTag {
         ConstructTheEmptyStringImpl
         ConstructTheEmptyStringImpl

+ 1 - 0
AK/Tests/TestString.cpp

@@ -41,6 +41,7 @@ TEST_CASE(compare)
     EXPECT(!("a" >= String("b")));
     EXPECT(!("a" >= String("b")));
     EXPECT("a" <= String("a"));
     EXPECT("a" <= String("a"));
     EXPECT(!("b" <= String("a")));
     EXPECT(!("b" <= String("a")));
+    EXPECT(!strcmp(test_string.reversed().characters(), "FEDCBA"));
 }
 }
 
 
 TEST_CASE(index_access)
 TEST_CASE(index_access)