Skip to content

GitLab

T
tangled
Commit a9f4b986 authored by erikwright@chromium.org's avatar erikwright@chromium.org
Browse files
Options

Revert "Extract common code from StringPiece and StringPiece16 into a templated base class.... 

... Convert copy-and-pasted unit tests into TYPED_TESTs."

This reverts commit 20543ba5.

BUG=
TEST=

Review URL: http://codereview.chromium.org/8933012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114255 0039d316-1c4b-4281-b951-d872f2087c98
parent a21de68c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 449 additions and 339 deletions
base/i18n/case_conversion.h
View file @ a9f4b986
......@@ -7,7 +7,6 @@
#pragma once
#include "base/i18n/base_i18n_export.h"
#include "base/string16.h"
#include "base/string_piece.h"
namespace base {
......
base/logging.h
View file @ a9f4b986
......@@ -983,8 +983,7 @@ inline std::ostream& operator<<(std::ostream& out, const std::wstring& wstr) {
namespace base {
template <typename STRING_TYPE> class BasicStringPiece;
typedef BasicStringPiece<std::string> StringPiece;
class StringPiece;
// Allows StringPiece to be logged.
BASE_EXPORT std::ostream& operator<<(std::ostream& o, const StringPiece& piece);
......
base/string_piece.cc
View file @ a9f4b986
......@@ -10,17 +10,6 @@
namespace base {
// MSVC doesn't like complex extern templates and DLLs.
#if !defined(COMPILER_MSVC)
namespace internal {
template class StringPieceDetail<std::string>;
template class StringPieceDetail<string16>;
} // namespace internal
template class BasicStringPiece<std::string>;
template class BasicStringPiece<string16>;
#endif
typedef StringPiece::size_type size_type;
bool operator==(const StringPiece& x, const StringPiece& y) {
......@@ -30,25 +19,22 @@ bool operator==(const StringPiece& x, const StringPiece& y) {
return StringPiece::wordmemcmp(x.data(), y.data(), x.size()) == 0;
}
void BasicStringPiece<std::string>::CopyToString(std::string* target) const {
void StringPiece::CopyToString(std::string* target) const {
target->assign(!empty() ? data() : "", size());
}
void BasicStringPiece<std::string>::AppendToString(std::string* target) const {
void StringPiece::AppendToString(std::string* target) const {
if (!empty())
target->append(data(), size());
}
size_type BasicStringPiece<std::string>::copy(char* buf,
size_type n,
size_type pos) const {
size_type StringPiece::copy(char* buf, size_type n, size_type pos) const {
size_type ret = std::min(length_ - pos, n);
memcpy(buf, ptr_ + pos, ret);
return ret;
}
size_type BasicStringPiece<std::string>::find(const BasicStringPiece& s,
size_type pos) const {
size_type StringPiece::find(const StringPiece& s, size_type pos) const {
if (pos > length_)
return npos;
......@@ -58,7 +44,7 @@ size_type BasicStringPiece<std::string>::find(const BasicStringPiece& s,
return xpos + s.length_ <= length_ ? xpos : npos;
}
size_type BasicStringPiece<std::string>::find(char c, size_type pos) const {
size_type StringPiece::find(char c, size_type pos) const {
if (pos >= length_)
return npos;
......@@ -66,8 +52,7 @@ size_type BasicStringPiece<std::string>::find(char c, size_type pos) const {
return result != ptr_ + length_ ? static_cast<size_t>(result - ptr_) : npos;
}
size_type BasicStringPiece<std::string>::rfind(const BasicStringPiece& s,
size_type pos) const {
size_type StringPiece::rfind(const StringPiece& s, size_type pos) const {
if (length_ < s.length_)
return npos;
......@@ -79,7 +64,7 @@ size_type BasicStringPiece<std::string>::rfind(const BasicStringPiece& s,
return result != last ? static_cast<size_t>(result - ptr_) : npos;
}
size_type BasicStringPiece<std::string>::rfind(char c, size_type pos) const {
size_type StringPiece::rfind(char c, size_type pos) const {
if (length_ == 0)
return npos;
......@@ -109,8 +94,8 @@ static inline void BuildLookupTable(const StringPiece& characters_wanted,
}
}
size_type BasicStringPiece<std::string>::find_first_of(
const BasicStringPiece& s, size_type pos) const {
size_type StringPiece::find_first_of(const StringPiece& s,
size_type pos) const {
if (length_ == 0 || s.length_ == 0)
return npos;
......@@ -128,8 +113,8 @@ size_type BasicStringPiece<std::string>::find_first_of(
return npos;
}
size_type BasicStringPiece<std::string>::find_first_not_of(
const BasicStringPiece& s, size_type pos) const {
size_type StringPiece::find_first_not_of(const StringPiece& s,
size_type pos) const {
if (length_ == 0)
return npos;
......@@ -150,8 +135,7 @@ size_type BasicStringPiece<std::string>::find_first_not_of(
return npos;
}
size_type BasicStringPiece<std::string>::find_first_not_of(
char c, size_type pos) const {
size_type StringPiece::find_first_not_of(char c, size_type pos) const {
if (length_ == 0)
return npos;
......@@ -163,8 +147,7 @@ size_type BasicStringPiece<std::string>::find_first_not_of(
return npos;
}
size_type BasicStringPiece<std::string>::find_last_of(const StringPiece& s,
size_type pos) const {
size_type StringPiece::find_last_of(const StringPiece& s, size_type pos) const {
if (length_ == 0 || s.length_ == 0)
return npos;
......@@ -183,8 +166,8 @@ size_type BasicStringPiece<std::string>::find_last_of(const StringPiece& s,
return npos;
}
size_type BasicStringPiece<std::string>::find_last_not_of(
const BasicStringPiece& s, size_type pos) const {
size_type StringPiece::find_last_not_of(const StringPiece& s,
size_type pos) const {
if (length_ == 0)
return npos;
......@@ -207,8 +190,7 @@ size_type BasicStringPiece<std::string>::find_last_not_of(
return npos;
}
size_type BasicStringPiece<std::string>::find_last_not_of(char c,
size_type pos) const {
size_type StringPiece::find_last_not_of(char c, size_type pos) const {
if (length_ == 0)
return npos;
......@@ -221,11 +203,12 @@ size_type BasicStringPiece<std::string>::find_last_not_of(char c,
return npos;
}
BasicStringPiece<std::string> BasicStringPiece<std::string>::substr(
size_type pos, size_type n) const {
StringPiece StringPiece::substr(size_type pos, size_type n) const {
if (pos > length_) pos = length_;
if (n > length_ - pos) n = length_ - pos;
return StringPiece(ptr_ + pos, n);
}
const StringPiece::size_type StringPiece::npos = size_type(-1);
} // namespace base
base/string_piece.h
View file @ a9f4b986
This diff is collapsed.
base/string_piece_unittest.cc
View file @ a9f4b986
This diff is collapsed.
base/utf_offset_string_conversions.h
View file @ a9f4b986
......@@ -11,7 +11,11 @@
#include "base/base_export.h"
#include "base/string16.h"
#include "base/string_piece.h"
namespace base {
class StringPiece;
class StringPiece16;
}
// Like the conversions in utf_string_conversions.h, but also takes one or more
// offsets (|offset[s]_for_adjustment|) into the source strings, each offset
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment