Restoring authorship annotation for Vlad Yaroslavlev <vladon@vladon.com>. Commit 1 of 2.

1 files changed, 264 insertions, 264 deletions

diff --git a/library/cpp/charset/ci_string.h b/library/cpp/charset/ci_string.h
index edf24c1b6f..aaa1e5627c 100644
--- a/library/cpp/charset/ci_string.h
+++ b/library/cpp/charset/ci_string.h
@@ -1,280 +1,280 @@
-#pragma once
-
-#include "codepage.h"
-
-#include <util/generic/string.h>
-#include <util/str_stl.h>
-
-// Same as TString but uses CASE INSENSITIVE comparator and hash. Use with care.
-class TCiString: public TString {
-public:
-    TCiString() {
-    }
-
-    TCiString(const TString& s)
-        : TString(s)
-    {
-    }
-
-    TCiString(const TString& s, size_t pos, size_t n)
-        : TString(s, pos, n)
-    {
-    }
-
-    TCiString(const char* pc)
-        : TString(pc)
-    {
-    }
-
-    TCiString(const char* pc, size_t n)
-        : TString(pc, n)
-    {
-    }
-
-    TCiString(const char* pc, size_t pos, size_t n)
-        : TString(pc, pos, n)
-    {
-    }
-
-    TCiString(size_t n, char c)
-        : TString(n, c)
-    {
-    }
-
-    TCiString(const TUninitialized& uninitialized)
-        : TString(uninitialized)
-    {
-    }
-
-    TCiString(const char* b, const char* e)
-        : TString(b, e)
-    {
-    }
-
+#pragma once 
+ 
+#include "codepage.h" 
+ 
+#include <util/generic/string.h> 
+#include <util/str_stl.h> 
+ 
+// Same as TString but uses CASE INSENSITIVE comparator and hash. Use with care. 
+class TCiString: public TString { 
+public: 
+    TCiString() { 
+    } 
+ 
+    TCiString(const TString& s) 
+        : TString(s) 
+    { 
+    } 
+ 
+    TCiString(const TString& s, size_t pos, size_t n) 
+        : TString(s, pos, n) 
+    { 
+    } 
+ 
+    TCiString(const char* pc) 
+        : TString(pc) 
+    { 
+    } 
+ 
+    TCiString(const char* pc, size_t n) 
+        : TString(pc, n) 
+    { 
+    } 
+ 
+    TCiString(const char* pc, size_t pos, size_t n) 
+        : TString(pc, pos, n) 
+    { 
+    } 
+ 
+    TCiString(size_t n, char c) 
+        : TString(n, c) 
+    { 
+    } 
+ 
+    TCiString(const TUninitialized& uninitialized) 
+        : TString(uninitialized) 
+    { 
+    } 
+ 
+    TCiString(const char* b, const char* e) 
+        : TString(b, e) 
+    { 
+    } 
+ 
     explicit TCiString(const TStringBuf& s)
-        : TString(s)
-    {
-    }
-
-    // ~~~ Comparison ~~~ : FAMILY0(int, compare)
-    static int compare(const TCiString& s1, const TCiString& s2, const CodePage& cp = csYandex);
-    static int compare(const char* p, const TCiString& s2, const CodePage& cp = csYandex);
-    static int compare(const TCiString& s1, const char* p, const CodePage& cp = csYandex);
+        : TString(s) 
+    { 
+    } 
+ 
+    // ~~~ Comparison ~~~ : FAMILY0(int, compare) 
+    static int compare(const TCiString& s1, const TCiString& s2, const CodePage& cp = csYandex); 
+    static int compare(const char* p, const TCiString& s2, const CodePage& cp = csYandex); 
+    static int compare(const TCiString& s1, const char* p, const CodePage& cp = csYandex); 
     static int compare(const TStringBuf& p1, const TStringBuf& p2, const CodePage& cp = csYandex);
-
+ 
     // TODO: implement properly in TString via enum ECaseSensitivity
     static bool is_prefix(const TStringBuf& what, const TStringBuf& of, const CodePage& cp = csYandex);
     static bool is_suffix(const TStringBuf& what, const TStringBuf& of, const CodePage& cp = csYandex);
-
+ 
     bool StartsWith(const TStringBuf& s, const CodePage& cp = csYandex) const {
-        return is_prefix(s, *this, cp);
-    }
-
+        return is_prefix(s, *this, cp); 
+    } 
+ 
     bool EndsWith(const TStringBuf& s, const CodePage& cp = csYandex) const {
-        return is_suffix(s, *this, cp);
-    }
-
-    friend bool operator==(const TCiString& s1, const TCiString& s2) {
-        return TCiString::compare(s1, s2) == 0;
-    }
-
-    friend bool operator==(const TCiString& s, const char* pc) {
-        return TCiString::compare(s, pc) == 0;
-    }
-
-    friend bool operator==(const char* pc, const TCiString& s) {
-        return TCiString::compare(pc, s) == 0;
-    }
-
-    template <typename TDerived2, typename TTraits2>
-    friend bool operator==(const TCiString& s, const TStringBase<TDerived2, TChar, TTraits2>& pc) {
-        return TCiString::compare(s, pc) == 0;
-    }
-
-    template <typename TDerived2, typename TTraits2>
-    friend bool operator==(const TStringBase<TDerived2, TChar, TTraits2>& pc, const TCiString& s) {
-        return TCiString::compare(pc, s) == 0;
-    }
-
-    friend bool operator!=(const TCiString& s1, const TCiString& s2) {
-        return TCiString::compare(s1, s2) != 0;
-    }
-
-    friend bool operator!=(const TCiString& s, const char* pc) {
-        return TCiString::compare(s, pc) != 0;
-    }
-
-    friend bool operator!=(const char* pc, const TCiString& s) {
-        return TCiString::compare(pc, s) != 0;
-    }
-
-    template <typename TDerived2, typename TTraits2>
-    friend bool operator!=(const TCiString& s, const TStringBase<TDerived2, TChar, TTraits2>& pc) {
-        return TCiString::compare(s, pc) != 0;
-    }
-
-    template <typename TDerived2, typename TTraits2>
-    friend bool operator!=(const TStringBase<TDerived2, TChar, TTraits2>& pc, const TCiString& s) {
-        return TCiString::compare(pc, s) != 0;
-    }
-
-    friend bool operator<(const TCiString& s1, const TCiString& s2) {
-        return TCiString::compare(s1, s2) < 0;
-    }
-
-    friend bool operator<(const TCiString& s, const char* pc) {
-        return TCiString::compare(s, pc) < 0;
-    }
-
-    friend bool operator<(const char* pc, const TCiString& s) {
-        return TCiString::compare(pc, s) < 0;
-    }
-
-    template <typename TDerived2, typename TTraits2>
-    friend bool operator<(const TCiString& s, const TStringBase<TDerived2, TChar, TTraits2>& pc) {
-        return TCiString::compare(s, pc) < 0;
-    }
-
-    template <typename TDerived2, typename TTraits2>
-    friend bool operator<(const TStringBase<TDerived2, TChar, TTraits2>& pc, const TCiString& s) {
-        return TCiString::compare(pc, s) < 0;
-    }
-
-    friend bool operator<=(const TCiString& s1, const TCiString& s2) {
-        return TCiString::compare(s1, s2) <= 0;
-    }
-
-    friend bool operator<=(const TCiString& s, const char* pc) {
-        return TCiString::compare(s, pc) <= 0;
-    }
-
-    friend bool operator<=(const char* pc, const TCiString& s) {
-        return TCiString::compare(pc, s) <= 0;
-    }
-
-    template <typename TDerived2, typename TTraits2>
-    friend bool operator<=(const TCiString& s, const TStringBase<TDerived2, TChar, TTraits2>& pc) {
-        return TCiString::compare(s, pc) <= 0;
-    }
-
-    template <typename TDerived2, typename TTraits2>
-    friend bool operator<=(const TStringBase<TDerived2, TChar, TTraits2>& pc, const TCiString& s) {
-        return TCiString::compare(pc, s) <= 0;
-    }
-
-    friend bool operator>(const TCiString& s1, const TCiString& s2) {
-        return TCiString::compare(s1, s2) > 0;
-    }
-
-    friend bool operator>(const TCiString& s, const char* pc) {
-        return TCiString::compare(s, pc) > 0;
-    }
-
-    friend bool operator>(const char* pc, const TCiString& s) {
-        return TCiString::compare(pc, s) > 0;
-    }
-
-    template <typename TDerived2, typename TTraits2>
-    friend bool operator>(const TCiString& s, const TStringBase<TDerived2, TChar, TTraits2>& pc) noexcept {
-        return TCiString::compare(s, pc) > 0;
-    }
-
-    template <typename TDerived2, typename TTraits2>
-    friend bool operator>(const TStringBase<TDerived2, TChar, TTraits2>& pc, const TCiString& s) noexcept {
-        return TCiString::compare(pc, s) > 0;
-    }
-
-    friend bool operator>=(const TCiString& s1, const TCiString& s2) {
-        return TCiString::compare(s1, s2) >= 0;
-    }
-
-    friend bool operator>=(const TCiString& s, const char* pc) {
-        return TCiString::compare(s, pc) >= 0;
-    }
-
-    friend bool operator>=(const char* pc, const TCiString& s) {
-        return TCiString::compare(pc, s) >= 0;
-    }
-
-    template <typename TDerived2, typename TTraits2>
-    friend bool operator>=(const TCiString& s, const TStringBase<TDerived2, TChar, TTraits2>& pc) {
-        return TCiString::compare(s, pc) >= 0;
-    }
-
-    template <typename TDerived2, typename TTraits2>
-    friend bool operator>=(const TStringBase<TDerived2, TChar, TTraits2>& pc, const TCiString& s) {
-        return TCiString::compare(pc, s) >= 0;
-    }
-
-    static size_t hashVal(const char* pc, size_t len, const CodePage& cp = csYandex);
-
-    size_t hash() const {
+        return is_suffix(s, *this, cp); 
+    } 
+ 
+    friend bool operator==(const TCiString& s1, const TCiString& s2) { 
+        return TCiString::compare(s1, s2) == 0; 
+    } 
+ 
+    friend bool operator==(const TCiString& s, const char* pc) { 
+        return TCiString::compare(s, pc) == 0; 
+    } 
+ 
+    friend bool operator==(const char* pc, const TCiString& s) { 
+        return TCiString::compare(pc, s) == 0; 
+    } 
+ 
+    template <typename TDerived2, typename TTraits2> 
+    friend bool operator==(const TCiString& s, const TStringBase<TDerived2, TChar, TTraits2>& pc) { 
+        return TCiString::compare(s, pc) == 0; 
+    } 
+ 
+    template <typename TDerived2, typename TTraits2> 
+    friend bool operator==(const TStringBase<TDerived2, TChar, TTraits2>& pc, const TCiString& s) { 
+        return TCiString::compare(pc, s) == 0; 
+    } 
+ 
+    friend bool operator!=(const TCiString& s1, const TCiString& s2) { 
+        return TCiString::compare(s1, s2) != 0; 
+    } 
+ 
+    friend bool operator!=(const TCiString& s, const char* pc) { 
+        return TCiString::compare(s, pc) != 0; 
+    } 
+ 
+    friend bool operator!=(const char* pc, const TCiString& s) { 
+        return TCiString::compare(pc, s) != 0; 
+    } 
+ 
+    template <typename TDerived2, typename TTraits2> 
+    friend bool operator!=(const TCiString& s, const TStringBase<TDerived2, TChar, TTraits2>& pc) { 
+        return TCiString::compare(s, pc) != 0; 
+    } 
+ 
+    template <typename TDerived2, typename TTraits2> 
+    friend bool operator!=(const TStringBase<TDerived2, TChar, TTraits2>& pc, const TCiString& s) { 
+        return TCiString::compare(pc, s) != 0; 
+    } 
+ 
+    friend bool operator<(const TCiString& s1, const TCiString& s2) { 
+        return TCiString::compare(s1, s2) < 0; 
+    } 
+ 
+    friend bool operator<(const TCiString& s, const char* pc) { 
+        return TCiString::compare(s, pc) < 0; 
+    } 
+ 
+    friend bool operator<(const char* pc, const TCiString& s) { 
+        return TCiString::compare(pc, s) < 0; 
+    } 
+ 
+    template <typename TDerived2, typename TTraits2> 
+    friend bool operator<(const TCiString& s, const TStringBase<TDerived2, TChar, TTraits2>& pc) { 
+        return TCiString::compare(s, pc) < 0; 
+    } 
+ 
+    template <typename TDerived2, typename TTraits2> 
+    friend bool operator<(const TStringBase<TDerived2, TChar, TTraits2>& pc, const TCiString& s) { 
+        return TCiString::compare(pc, s) < 0; 
+    } 
+ 
+    friend bool operator<=(const TCiString& s1, const TCiString& s2) { 
+        return TCiString::compare(s1, s2) <= 0; 
+    } 
+ 
+    friend bool operator<=(const TCiString& s, const char* pc) { 
+        return TCiString::compare(s, pc) <= 0; 
+    } 
+ 
+    friend bool operator<=(const char* pc, const TCiString& s) { 
+        return TCiString::compare(pc, s) <= 0; 
+    } 
+ 
+    template <typename TDerived2, typename TTraits2> 
+    friend bool operator<=(const TCiString& s, const TStringBase<TDerived2, TChar, TTraits2>& pc) { 
+        return TCiString::compare(s, pc) <= 0; 
+    } 
+ 
+    template <typename TDerived2, typename TTraits2> 
+    friend bool operator<=(const TStringBase<TDerived2, TChar, TTraits2>& pc, const TCiString& s) { 
+        return TCiString::compare(pc, s) <= 0; 
+    } 
+ 
+    friend bool operator>(const TCiString& s1, const TCiString& s2) { 
+        return TCiString::compare(s1, s2) > 0; 
+    } 
+ 
+    friend bool operator>(const TCiString& s, const char* pc) { 
+        return TCiString::compare(s, pc) > 0; 
+    } 
+ 
+    friend bool operator>(const char* pc, const TCiString& s) { 
+        return TCiString::compare(pc, s) > 0; 
+    } 
+ 
+    template <typename TDerived2, typename TTraits2> 
+    friend bool operator>(const TCiString& s, const TStringBase<TDerived2, TChar, TTraits2>& pc) noexcept { 
+        return TCiString::compare(s, pc) > 0; 
+    } 
+ 
+    template <typename TDerived2, typename TTraits2> 
+    friend bool operator>(const TStringBase<TDerived2, TChar, TTraits2>& pc, const TCiString& s) noexcept { 
+        return TCiString::compare(pc, s) > 0; 
+    } 
+ 
+    friend bool operator>=(const TCiString& s1, const TCiString& s2) { 
+        return TCiString::compare(s1, s2) >= 0; 
+    } 
+ 
+    friend bool operator>=(const TCiString& s, const char* pc) { 
+        return TCiString::compare(s, pc) >= 0; 
+    } 
+ 
+    friend bool operator>=(const char* pc, const TCiString& s) { 
+        return TCiString::compare(pc, s) >= 0; 
+    } 
+ 
+    template <typename TDerived2, typename TTraits2> 
+    friend bool operator>=(const TCiString& s, const TStringBase<TDerived2, TChar, TTraits2>& pc) { 
+        return TCiString::compare(s, pc) >= 0; 
+    } 
+ 
+    template <typename TDerived2, typename TTraits2> 
+    friend bool operator>=(const TStringBase<TDerived2, TChar, TTraits2>& pc, const TCiString& s) { 
+        return TCiString::compare(pc, s) >= 0; 
+    } 
+ 
+    static size_t hashVal(const char* pc, size_t len, const CodePage& cp = csYandex); 
+ 
+    size_t hash() const { 
         return TCiString::hashVal(data(), length());
-    }
-};
-
-struct ci_hash {
-    inline size_t operator()(const char* s) const {
-        return TCiString::hashVal(s, strlen(s));
-    }
+    } 
+}; 
+ 
+struct ci_hash { 
+    inline size_t operator()(const char* s) const { 
+        return TCiString::hashVal(s, strlen(s)); 
+    } 
     inline size_t operator()(const TStringBuf& s) const {
         return TCiString::hashVal(s.data(), s.size());
-    }
-};
-
-struct ci_hash32 { // not the same as ci_hash under 64-bit
-    inline ui32 operator()(const char* s) const {
-        return (ui32)TCiString::hashVal(s, strlen(s));
-    }
-};
-
-//template <class T> struct hash;
-
-template <>
-struct hash<TCiString>: public ci_hash {
-};
-
-template <class T>
-struct TCIHash {
-};
-
-template <>
-struct TCIHash<const char*> {
+    } 
+}; 
+ 
+struct ci_hash32 { // not the same as ci_hash under 64-bit 
+    inline ui32 operator()(const char* s) const { 
+        return (ui32)TCiString::hashVal(s, strlen(s)); 
+    } 
+}; 
+ 
+//template <class T> struct hash; 
+ 
+template <> 
+struct hash<TCiString>: public ci_hash { 
+}; 
+ 
+template <class T> 
+struct TCIHash { 
+}; 
+ 
+template <> 
+struct TCIHash<const char*> { 
     inline size_t operator()(const TStringBuf& s) const {
         return TCiString::hashVal(s.data(), s.size());
-    }
-};
-
-template <>
-struct TCIHash<TStringBuf> {
-    inline size_t operator()(const TStringBuf& s) const {
+    } 
+}; 
+ 
+template <> 
+struct TCIHash<TStringBuf> { 
+    inline size_t operator()(const TStringBuf& s) const { 
         return TCiString::hashVal(s.data(), s.size());
-    }
-};
-
-template <>
-struct TCIHash<TString> {
-    inline size_t operator()(const TString& s) const {
+    } 
+}; 
+ 
+template <> 
+struct TCIHash<TString> { 
+    inline size_t operator()(const TString& s) const { 
         return TCiString::hashVal(s.data(), s.size());
-    }
-};
-
-struct ci_less {
-    inline bool operator()(const char* x, const char* y) const {
-        return csYandex.stricmp(x, y) < 0;
-    }
-};
-
-struct ci_equal_to {
-    inline bool operator()(const char* x, const char* y) const {
-        return csYandex.stricmp(x, y) == 0;
-    }
-    // this implementation is not suitable for strings with zero characters inside, sorry
+    } 
+}; 
+ 
+struct ci_less { 
+    inline bool operator()(const char* x, const char* y) const { 
+        return csYandex.stricmp(x, y) < 0; 
+    } 
+}; 
+ 
+struct ci_equal_to { 
+    inline bool operator()(const char* x, const char* y) const { 
+        return csYandex.stricmp(x, y) == 0; 
+    } 
+    // this implementation is not suitable for strings with zero characters inside, sorry 
     bool operator()(const TStringBuf& x, const TStringBuf& y) const {
         return x.size() == y.size() && csYandex.strnicmp(x.data(), y.data(), y.size()) == 0;
-    }
-};
-
-template <>
-struct TEqualTo<TCiString>: public ci_equal_to {
-};
+    } 
+}; 
+ 
+template <> 
+struct TEqualTo<TCiString>: public ci_equal_to { 
+};