Make StringPiece to be std::string_view alias
Bug: 237583012
Test: build + boot + UTs
Change-Id: I849831f4466d3b9c7ec842b75256e7fcba77a0c0
diff --git a/tools/aapt2/compile/NinePatch.cpp b/tools/aapt2/compile/NinePatch.cpp
index c931da4..4538ecc 100644
--- a/tools/aapt2/compile/NinePatch.cpp
+++ b/tools/aapt2/compile/NinePatch.cpp
@@ -218,11 +218,9 @@
static bool PopulateBounds(const std::vector<Range>& padding,
const std::vector<Range>& layout_bounds,
- const std::vector<Range>& stretch_regions,
- const int32_t length, int32_t* padding_start,
- int32_t* padding_end, int32_t* layout_start,
- int32_t* layout_end, const StringPiece& edge_name,
- std::string* out_err) {
+ const std::vector<Range>& stretch_regions, const int32_t length,
+ int32_t* padding_start, int32_t* padding_end, int32_t* layout_start,
+ int32_t* layout_end, StringPiece edge_name, std::string* out_err) {
if (padding.size() > 1) {
std::stringstream err_stream;
err_stream << "too many padding sections on " << edge_name << " border";
diff --git a/tools/aapt2/compile/Png.h b/tools/aapt2/compile/Png.h
index 7f8d923..a8b7dd1 100644
--- a/tools/aapt2/compile/Png.h
+++ b/tools/aapt2/compile/Png.h
@@ -59,7 +59,7 @@
*/
class PngChunkFilter : public io::InputStream {
public:
- explicit PngChunkFilter(const android::StringPiece& data);
+ explicit PngChunkFilter(android::StringPiece data);
virtual ~PngChunkFilter() = default;
bool Next(const void** buffer, size_t* len) override;
diff --git a/tools/aapt2/compile/PngChunkFilter.cpp b/tools/aapt2/compile/PngChunkFilter.cpp
index 4db2392..2e55d0c 100644
--- a/tools/aapt2/compile/PngChunkFilter.cpp
+++ b/tools/aapt2/compile/PngChunkFilter.cpp
@@ -70,7 +70,7 @@
}
}
-PngChunkFilter::PngChunkFilter(const StringPiece& data) : data_(data) {
+PngChunkFilter::PngChunkFilter(StringPiece data) : data_(data) {
if (util::StartsWith(data_, kPngSignature)) {
window_start_ = 0;
window_end_ = kPngSignatureSize;
diff --git a/tools/aapt2/compile/Pseudolocalizer.cpp b/tools/aapt2/compile/Pseudolocalizer.cpp
index 3a515fa..463ce78 100644
--- a/tools/aapt2/compile/Pseudolocalizer.cpp
+++ b/tools/aapt2/compile/Pseudolocalizer.cpp
@@ -20,36 +20,42 @@
using android::StringPiece;
+using namespace std::literals;
+
namespace aapt {
// String basis to generate expansion
-static const std::string kExpansionString =
+static constexpr auto kExpansionString =
"one two three "
"four five six seven eight nine ten eleven twelve thirteen "
- "fourteen fiveteen sixteen seventeen nineteen twenty";
+ "fourteen fiveteen sixteen seventeen nineteen twenty"sv;
// Special unicode characters to override directionality of the words
-static const std::string kRlm = "\u200f";
-static const std::string kRlo = "\u202e";
-static const std::string kPdf = "\u202c";
+static constexpr auto kRlm = "\u200f"sv;
+static constexpr auto kRlo = "\u202e"sv;
+static constexpr auto kPdf = "\u202c"sv;
// Placeholder marks
-static const std::string kPlaceholderOpen = "\u00bb";
-static const std::string kPlaceholderClose = "\u00ab";
+static constexpr auto kPlaceholderOpen = "\u00bb"sv;
+static constexpr auto kPlaceholderClose = "\u00ab"sv;
static const char kArgStart = '{';
static const char kArgEnd = '}';
class PseudoMethodNone : public PseudoMethodImpl {
public:
- std::string Text(const StringPiece& text) override { return text.to_string(); }
- std::string Placeholder(const StringPiece& text) override { return text.to_string(); }
+ std::string Text(StringPiece text) override {
+ return std::string(text);
+ }
+ std::string Placeholder(StringPiece text) override {
+ return std::string(text);
+ }
};
class PseudoMethodBidi : public PseudoMethodImpl {
public:
- std::string Text(const StringPiece& text) override;
- std::string Placeholder(const StringPiece& text) override;
+ std::string Text(StringPiece text) override;
+ std::string Placeholder(StringPiece text) override;
};
class PseudoMethodAccent : public PseudoMethodImpl {
@@ -57,8 +63,8 @@
PseudoMethodAccent() : depth_(0), word_count_(0), length_(0) {}
std::string Start() override;
std::string End() override;
- std::string Text(const StringPiece& text) override;
- std::string Placeholder(const StringPiece& text) override;
+ std::string Text(StringPiece text) override;
+ std::string Placeholder(StringPiece text) override;
private:
size_t depth_;
@@ -84,7 +90,7 @@
}
}
-std::string Pseudolocalizer::Text(const StringPiece& text) {
+std::string Pseudolocalizer::Text(StringPiece text) {
std::string out;
size_t depth = last_depth_;
size_t lastpos, pos;
@@ -116,7 +122,7 @@
}
size_t size = nextpos - lastpos;
if (size) {
- std::string chunk = text.substr(lastpos, size).to_string();
+ std::string chunk(text.substr(lastpos, size));
if (pseudo) {
chunk = impl_->Text(chunk);
} else if (str[lastpos] == kArgStart && str[nextpos - 1] == kArgEnd) {
@@ -301,21 +307,23 @@
}
static std::string PseudoGenerateExpansion(const unsigned int length) {
- std::string result = kExpansionString;
- const char* s = result.data();
+ std::string result(kExpansionString);
if (result.size() < length) {
result += " ";
result += PseudoGenerateExpansion(length - result.size());
} else {
int ext = 0;
// Should contain only whole words, so looking for a space
- for (unsigned int i = length + 1; i < result.size(); ++i) {
- ++ext;
- if (s[i] == ' ') {
- break;
+ {
+ const char* const s = result.data();
+ for (unsigned int i = length + 1; i < result.size(); ++i) {
+ ++ext;
+ if (s[i] == ' ') {
+ break;
+ }
}
}
- result = result.substr(0, length + ext);
+ result.resize(length + ext);
}
return result;
}
@@ -349,7 +357,7 @@
*
* Note: This leaves placeholder syntax untouched.
*/
-std::string PseudoMethodAccent::Text(const StringPiece& source) {
+std::string PseudoMethodAccent::Text(StringPiece source) {
const char* s = source.data();
std::string result;
const size_t I = source.size();
@@ -435,12 +443,12 @@
return result;
}
-std::string PseudoMethodAccent::Placeholder(const StringPiece& source) {
+std::string PseudoMethodAccent::Placeholder(StringPiece source) {
// Surround a placeholder with brackets
- return kPlaceholderOpen + source.to_string() + kPlaceholderClose;
+ return (std::string(kPlaceholderOpen) += source) += kPlaceholderClose;
}
-std::string PseudoMethodBidi::Text(const StringPiece& source) {
+std::string PseudoMethodBidi::Text(StringPiece source) {
const char* s = source.data();
std::string result;
bool lastspace = true;
@@ -456,10 +464,10 @@
space = (!escape && isspace(c)) || (escape && (c == 'n' || c == 't'));
if (lastspace && !space) {
// Word start
- result += kRlm + kRlo;
+ (result += kRlm) += kRlo;
} else if (!lastspace && space) {
// Word end
- result += kPdf + kRlm;
+ (result += kPdf) += kRlm;
}
lastspace = space;
if (escape) {
@@ -470,14 +478,14 @@
}
if (!lastspace) {
// End of last word
- result += kPdf + kRlm;
+ (result += kPdf) += kRlm;
}
return result;
}
-std::string PseudoMethodBidi::Placeholder(const StringPiece& source) {
+std::string PseudoMethodBidi::Placeholder(StringPiece source) {
// Surround a placeholder with directionality change sequence
- return kRlm + kRlo + source.to_string() + kPdf + kRlm;
+ return (((std::string(kRlm) += kRlo) += source) += kPdf) += kRlm;
}
} // namespace aapt
diff --git a/tools/aapt2/compile/Pseudolocalizer.h b/tools/aapt2/compile/Pseudolocalizer.h
index 4dedc70..2b94bcc 100644
--- a/tools/aapt2/compile/Pseudolocalizer.h
+++ b/tools/aapt2/compile/Pseudolocalizer.h
@@ -31,8 +31,8 @@
virtual ~PseudoMethodImpl() {}
virtual std::string Start() { return {}; }
virtual std::string End() { return {}; }
- virtual std::string Text(const android::StringPiece& text) = 0;
- virtual std::string Placeholder(const android::StringPiece& text) = 0;
+ virtual std::string Text(android::StringPiece text) = 0;
+ virtual std::string Placeholder(android::StringPiece text) = 0;
};
class Pseudolocalizer {
@@ -47,7 +47,7 @@
void SetMethod(Method method);
std::string Start() { return impl_->Start(); }
std::string End() { return impl_->End(); }
- std::string Text(const android::StringPiece& text);
+ std::string Text(android::StringPiece text);
private:
std::unique_ptr<PseudoMethodImpl> impl_;