Merge remote-tracking branch 'origin/master' into fcitx

Author: Fcitx Bot

src/base/singleton.h

@@ -30,10 +30,8 @@
 #ifndef MOZC_BASE_SINGLETON_H_
 #define MOZC_BASE_SINGLETON_H_
 
-#include <atomic>
 
 #include "absl/base/const_init.h"
-#include "absl/base/no_destructor.h"
 #include "absl/base/thread_annotations.h"
 #include "absl/synchronization/mutex.h"
 
@@ -94,37 +92,6 @@ class Singleton {
   constinit static inline T* instance_ ABSL_GUARDED_BY(mutex_) = nullptr;
 };
 
-// SingletonMockable class.
-// Usage: (quote from clock.cc)
-//
-//   using ClockSingleton = SingletonMockable<ClockInterface, ClockImpl>;
-//
-//   uint64_t Clock::GetTime() {
-//     return ClockSingleton::Get()->GetTime();
-//   }
-//
-//   void Clock::SetClockForUnitTest(ClockInterface *clock_mock) {
-//    ClockSingleton::SetMock(clock_mock);
-//   }
-template <class Interface, class Impl>
-class SingletonMockable {
- public:
-  static Interface* Get() {
-    if (Interface* mock = mock_.load(std::memory_order_acquire);
-        mock != nullptr) {
-      return mock;
-    }
-    static absl::NoDestructor<Impl> impl;
-    return impl.get();
-  }
-
-  static void SetMock(Interface* mock) {
-    mock_.store(mock, std::memory_order_release);
-  }
-
- private:
-  constinit static inline std::atomic<Interface*> mock_ = nullptr;
-};
 
 }  // namespace mozc
 

src/converter/BUILD.bazel

@@ -169,6 +169,7 @@ mozc_cc_test(
         ":segments",
         ":segments_matchers",
         "//testing:gunit_main",
+        "@com_google_absl//absl/strings:string_view",
         "@com_google_absl//absl/types:span",
     ],
 )
@@ -823,6 +824,7 @@ mozc_cc_library(
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/functional:any_invocable",
         "@com_google_absl//absl/log:check",
+        "@com_google_absl//absl/strings:string_view",
     ],
 )
 

src/converter/converter_main.cc

@@ -75,7 +75,6 @@
 #define MOZC_DEBUG
 #endif  // NDEBUG
 
-
 ABSL_FLAG(int32_t, max_conversion_candidates_size, 200,
           "maximum candidates size");
 ABSL_FLAG(std::string, user_profile_dir, "", "path to user profile directory");
@@ -235,7 +234,7 @@ void PrintCandidate(const Segment& parent, size_t candidates_size, int num,
   lines.push_back("rid: " + PosIdPrintUtil::IdToString(cand.rid));
   lines.push_back("attr: " + CandidateAttributesToString(cand.attributes));
   lines.push_back("num_style: " + NumberStyleToString(cand.style));
-  const std::string& segbdd_str = InnerSegmentBoundaryToString(cand);
+  const std::string segbdd_str = InnerSegmentBoundaryToString(cand);
   if (!segbdd_str.empty()) {
     lines.push_back("segbdd: " + segbdd_str);
   }
@@ -348,7 +347,7 @@ bool ConverterMain::ExecCommand(absl::string_view line, Segments* segments) {
       .create_partial_candidates = request_.auto_partial_suggestion(),
   };
 
-  const std::string& func = fields[0];
+  absl::string_view func = fields[0];
   if (func == "startconversion" || func == "start" || func == "s") {
     options.request_type = ConversionRequest::CONVERSION;
     options.create_partial_candidates = false;
@@ -411,8 +410,8 @@ bool ConverterMain::ExecCommand(absl::string_view line, Segments* segments) {
   } else if (func == "commitsegmentvalue" || func == "commit" || func == "c") {
     CHECK_FIELDS_LENGTH(3);
     return converter_->CommitSegmentValue(segments,
-                                        NumberUtil::SimpleAtoi(fields[1]),
-                                        NumberUtil::SimpleAtoi(fields[2]));
+                                          NumberUtil::SimpleAtoi(fields[1]),
+                                          NumberUtil::SimpleAtoi(fields[2]));
   } else if (func == "commitallandfinish") {
     for (int i = 0; i < segments->conversion_segments_size(); ++i) {
       if (segments->conversion_segment(i).segment_type() !=
@@ -433,8 +432,8 @@ bool ConverterMain::ExecCommand(absl::string_view line, Segments* segments) {
   } else if (func == "focussegmentvalue" || func == "focus") {
     CHECK_FIELDS_LENGTH(3);
     return converter_->FocusSegmentValue(segments,
-                                       NumberUtil::SimpleAtoi(fields[1]),
-                                       NumberUtil::SimpleAtoi(fields[2]));
+                                         NumberUtil::SimpleAtoi(fields[1]),
+                                         NumberUtil::SimpleAtoi(fields[2]));
   } else if (func == "commitfirstsegment") {
     CHECK_FIELDS_LENGTH(2);
     std::vector<size_t> singleton_vector;
@@ -451,8 +450,8 @@ bool ConverterMain::ExecCommand(absl::string_view line, Segments* segments) {
             .Build();
     if (fields.size() == 3) {
       return converter_->ResizeSegment(segments, conversion_request,
-                                     NumberUtil::SimpleAtoi(fields[1]),
-                                     NumberUtil::SimpleAtoi(fields[2]));
+                                       NumberUtil::SimpleAtoi(fields[1]),
+                                       NumberUtil::SimpleAtoi(fields[2]));
     }
   } else if (func == "resizesegments" || func == "resizes") {
     options.request_type = ConversionRequest::CONVERSION;
@@ -470,8 +469,8 @@ bool ConverterMain::ExecCommand(absl::string_view line, Segments* segments) {
             static_cast<uint8_t>(NumberUtil::SimpleAtoi(fields[i])));
       }
       return converter_->ResizeSegments(segments, conversion_request,
-                                      NumberUtil::SimpleAtoi(fields[1]),
-                                      new_arrays);
+                                        NumberUtil::SimpleAtoi(fields[1]),
+                                        new_arrays);
     }
   } else if (func == "disableuserhistory") {
     config_.set_history_learning_level(config::Config::NO_HISTORY);
@@ -526,7 +525,7 @@ std::string ConverterMain::ExecCommandToString(absl::string_view line) {
 }
 
 std::pair<std::string, std::string> SelectDataFileFromName(
-    const std::string& mozc_runfiles_dir, const std::string& engine_name) {
+    absl::string_view mozc_runfiles_dir, absl::string_view engine_name) {
   struct {
     absl::string_view engine_name;
     absl::string_view path;
@@ -545,8 +544,8 @@ std::pair<std::string, std::string> SelectDataFileFromName(
   return std::pair<std::string, std::string>("", "");
 }
 
-std::string SelectIdDefFromName(const std::string& mozc_runfiles_dir,
-                                const std::string& engine_name) {
+std::string SelectIdDefFromName(absl::string_view mozc_runfiles_dir,
+                                absl::string_view engine_name) {
   struct {
     absl::string_view engine_name;
     absl::string_view path;
@@ -658,7 +657,7 @@ int main(int argc, char** argv) {
                << absl::GetFlag(FLAGS_engine_type);
   }
 
-  if (const std::string& textproto =
+  if (const std::string textproto =
           absl::GetFlag(FLAGS_decoder_experiment_params);
       !textproto.empty()) {
     mozc::commands::DecoderExperimentParams params;

src/converter/converter_test.cc

@@ -425,9 +425,9 @@ TEST_F(ConverterTest, ConvertTest) {
 }
 
 namespace {
-std::string ContextAwareConvert(const std::string& first_key,
-                                const std::string& first_value,
-                                const std::string& second_key) {
+std::string ContextAwareConvert(absl::string_view first_key,
+                                absl::string_view first_value,
+                                absl::string_view second_key) {
   std::unique_ptr<Engine> engine = MockDataEngineFactory::Create().value();
   std::shared_ptr<const ConverterInterface> converter = engine->GetConverter();
   CHECK(converter);
@@ -442,7 +442,7 @@ std::string ContextAwareConvert(const std::string& first_key,
     int position = -1;
     for (size_t i = 0; i < segments.segment(segment_num).candidates_size();
          ++i) {
-      const std::string& value =
+      absl::string_view value =
           segments.segment(segment_num).candidate(i).value;
       if (first_value.substr(converted.size(), value.size()) == value) {
         position = static_cast<int>(i);
@@ -1218,14 +1218,14 @@ TEST_F(ConverterTest, StartReverseConversion) {
   const std::shared_ptr<const ConverterInterface> converter =
       engine->GetConverter();
 
-  const std::string kHonKanji = "本";
-  const std::string kHonHiragana = "ほん";
-  const std::string kMuryouKanji = "無料";
-  const std::string kMuryouHiragana = "むりょう";
-  const std::string kFullWidthSpace = "　";  // full-width space
+  constexpr absl::string_view kHonKanji = "本";
+  constexpr absl::string_view kHonHiragana = "ほん";
+  constexpr absl::string_view kMuryouKanji = "無料";
+  constexpr absl::string_view kMuryouHiragana = "むりょう";
+  constexpr absl::string_view kFullWidthSpace = "　";  // full-width space
   {
     // Test for single Kanji character.
-    const std::string& kInput = kHonKanji;
+    absl::string_view kInput = kHonKanji;
     Segments segments;
     EXPECT_TRUE(converter->StartReverseConversion(&segments, kInput));
     ASSERT_EQ(segments.segments_size(), 1);
@@ -1234,7 +1234,7 @@ TEST_F(ConverterTest, StartReverseConversion) {
   }
   {
     // Test for multi-Kanji character.
-    const std::string& kInput = kMuryouKanji;
+    absl::string_view kInput = kMuryouKanji;
     Segments segments;
     EXPECT_TRUE(converter->StartReverseConversion(&segments, kInput));
     ASSERT_EQ(segments.segments_size(), 1);
@@ -1258,7 +1258,7 @@ TEST_F(ConverterTest, StartReverseConversion) {
   }
   {
     // Test for multi terms separated by multiple spaces.
-    const std::string kInput = kHonKanji + "   " + kMuryouKanji;
+    const std::string kInput = absl::StrCat(kHonKanji, "   ", kMuryouKanji);
     Segments segments;
     EXPECT_TRUE(converter->StartReverseConversion(&segments, kInput));
     ASSERT_EQ(segments.segments_size(), 3);
@@ -1272,7 +1272,7 @@ TEST_F(ConverterTest, StartReverseConversion) {
   }
   {
     // Test for leading white spaces.
-    const std::string kInput = "  " + kHonKanji;
+    const std::string kInput = absl::StrCat("  ", kHonKanji);
     Segments segments;
     EXPECT_TRUE(converter->StartReverseConversion(&segments, kInput));
     ASSERT_EQ(segments.segments_size(), 2);
@@ -1283,7 +1283,7 @@ TEST_F(ConverterTest, StartReverseConversion) {
   }
   {
     // Test for trailing white spaces.
-    const std::string kInput = kMuryouKanji + "  ";
+    const std::string kInput = absl::StrCat(kMuryouKanji, "  ");
     Segments segments;
     EXPECT_TRUE(converter->StartReverseConversion(&segments, kInput));
     ASSERT_EQ(segments.segments_size(), 2);
@@ -1295,7 +1295,8 @@ TEST_F(ConverterTest, StartReverseConversion) {
   }
   {
     // Test for multi terms separated by a full-width space.
-    const std::string kInput = kHonKanji + kFullWidthSpace + kMuryouKanji;
+    const std::string kInput =
+        absl::StrCat(kHonKanji, kFullWidthSpace, kMuryouKanji);
     Segments segments;
     EXPECT_TRUE(converter->StartReverseConversion(&segments, kInput));
     ASSERT_EQ(segments.segments_size(), 3);
@@ -1310,8 +1311,10 @@ TEST_F(ConverterTest, StartReverseConversion) {
   }
   {
     // Test for multi terms separated by two full-width spaces.
-    const std::string kFullWidthSpace2 = kFullWidthSpace + kFullWidthSpace;
-    const std::string kInput = kHonKanji + kFullWidthSpace2 + kMuryouKanji;
+    const std::string kFullWidthSpace2 =
+        absl::StrCat(kFullWidthSpace, kFullWidthSpace);
+    const std::string kInput =
+        absl::StrCat(kHonKanji, kFullWidthSpace2, kMuryouKanji);
     Segments segments;
     EXPECT_TRUE(converter->StartReverseConversion(&segments, kInput));
     ASSERT_EQ(segments.segments_size(), 3);
@@ -1326,8 +1329,9 @@ TEST_F(ConverterTest, StartReverseConversion) {
   }
   {
     // Test for multi terms separated by the mix of full- and half-width spaces.
-    const std::string kFullWidthSpace2 = kFullWidthSpace + " ";
-    const std::string kInput = kHonKanji + kFullWidthSpace2 + kMuryouKanji;
+    const std::string kFullWidthSpace2 = absl::StrCat(kFullWidthSpace, " ");
+    const std::string kInput =
+        absl::StrCat(kHonKanji, kFullWidthSpace2, kMuryouKanji);
     Segments segments;
     EXPECT_TRUE(converter->StartReverseConversion(&segments, kInput));
     ASSERT_EQ(segments.segments_size(), 3);

src/converter/gen_segmenter_bitarray.cc

@@ -45,6 +45,7 @@
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/log/check.h"
+#include "absl/strings/string_view.h"
 #include "base/container/bitarray.h"
 #include "base/file_stream.h"
 #include "protocol/segmenter_data.pb.h"
@@ -115,8 +116,8 @@ class StateTable {
 
 void SegmenterBitarrayGenerator::GenerateBitarray(
     int lsize, int rsize, IsBoundaryFunc is_boundary,
-    const std::string& output_size_info, const std::string& output_ltable,
-    const std::string& output_rtable, const std::string& output_bitarray) {
+    absl::string_view output_size_info, absl::string_view output_ltable,
+    absl::string_view output_rtable, absl::string_view output_bitarray) {
   // Load the original matrix into an array
   std::vector<uint8_t> array((lsize + 1) * (rsize + 1));
 

src/converter/gen_segmenter_bitarray.h

@@ -34,6 +34,7 @@
 #include <string>
 
 #include "absl/functional/any_invocable.h"
+#include "absl/strings/string_view.h"
 
 namespace mozc {
 
@@ -45,10 +46,10 @@ class SegmenterBitarrayGenerator {
   SegmenterBitarrayGenerator& operator=(const SegmenterBitarrayGenerator&) =
       delete;
   static void GenerateBitarray(int lsize, int rsize, IsBoundaryFunc is_boundary,
-                               const std::string& output_size_info,
-                               const std::string& output_ltable,
-                               const std::string& output_rtable,
-                               const std::string& output_bitarray);
+                               absl::string_view output_size_info,
+                               absl::string_view output_ltable,
+                               absl::string_view output_rtable,
+                               absl::string_view output_bitarray);
 };
 
 }  // namespace mozc

src/converter/immutable_converter_main.cc

@@ -197,7 +197,7 @@ std::string DumpNodes(const Lattice& lattice) {
 }
 
 bool ExecCommand(const ImmutableConverter& immutable_converter,
-                 absl::string_view query, const std::string& output) {
+                 absl::string_view query, absl::string_view output) {
   ConversionRequest::Options options = {
       .request_type = ConversionRequest::CONVERSION,
       .use_actual_converter_for_realtime_conversion = true,
@@ -222,7 +222,7 @@ bool ExecCommand(const ImmutableConverter& immutable_converter,
 }
 
 std::unique_ptr<const DataManager> CreateDataManager(
-    const std::string& dictionary) {
+    absl::string_view dictionary) {
   if (dictionary == "oss") {
     return std::make_unique<const oss::OssDataManager>();
   }

src/converter/quality_regression_test_lib.cc

@@ -70,7 +70,7 @@ absl::Status QualityRegressionTest::RunTestForPlatform(
     if (i % 1000 == 0) {
       LOG(INFO) << "Testing: " << i << " " << kTestData[i].line;
     }
-    const std::string& tsv_line = kTestData[i].line;
+    absl::string_view tsv_line = kTestData[i].line;
     QualityRegressionUtil::TestItem item;
     if (!item.ParseFromTSV(tsv_line).ok()) {
       return absl::FailedPreconditionError(
@@ -98,7 +98,7 @@ absl::Status QualityRegressionTest::RunTestForPlatform(
       table = &disabled_results;
     }
 
-    const std::string& label = item.label;
+    absl::string_view label = item.label;
     std::string line = absl::StrCat(tsv_line, "\tActual: ", actual_value);
     if (*test_result) {
       // use "-1.0" as a dummy expected ratio