From 5b7a3334e7d4054c7bdccae60aa5408003961293 Mon Sep 17 00:00:00 2001 From: Hiroyuki Komatsu Date: Tue, 7 Jan 2025 09:06:03 +0000 Subject: [PATCH] Remove Converter argument from the Rewriter constructor. It is no longer used. #codehealth PiperOrigin-RevId: 712810236 --- src/converter/converter.cc | 2 +- src/converter/converter.h | 2 +- src/converter/converter_test.cc | 10 ++++------ src/engine/engine.cc | 5 ++--- src/rewriter/rewriter.cc | 4 +--- src/rewriter/rewriter.h | 4 +--- src/rewriter/rewriter_test.cc | 4 +--- 7 files changed, 11 insertions(+), 20 deletions(-) diff --git a/src/converter/converter.cc b/src/converter/converter.cc index 421e98687..527fd2a34 100644 --- a/src/converter/converter.cc +++ b/src/converter/converter.cc @@ -154,7 +154,7 @@ Converter::Converter( general_noun_id_(pos_matcher_.GetGeneralNounId()) { DCHECK(immutable_converter_); predictor_ = predictor_factory(*modules_, this, immutable_converter_.get()); - rewriter_ = rewriter_factory(*modules_, this); + rewriter_ = rewriter_factory(*modules_); DCHECK(predictor_); DCHECK(rewriter_); } diff --git a/src/converter/converter.h b/src/converter/converter.h index 080961930..e3966278b 100644 --- a/src/converter/converter.h +++ b/src/converter/converter.h @@ -67,7 +67,7 @@ class Converter final : public ConverterInterface { const ImmutableConverterInterface *immutable_converter)>; using RewriterFactory = std::function( - const engine::Modules &modules, const ConverterInterface *converter)>; + const engine::Modules &modules)>; // Converter is initialized with the factory methods of ImmutableConverter, // Predictor and Rewriter, so that all these sub components share the diff --git a/src/converter/converter_test.cc b/src/converter/converter_test.cc index deb8040f9..4814c58a1 100644 --- a/src/converter/converter_test.cc +++ b/src/converter/converter_test.cc @@ -326,8 +326,7 @@ class ConverterTest : public testing::TestWithTempUserProfile { return CreatePredictor(modules, predictor_type, converter, immutable_converter); }, - [&](const engine::Modules &modules, - const ConverterInterface *converter) { + [&](const engine::Modules &modules) { return std::move(rewriter); }); } @@ -1253,8 +1252,8 @@ TEST_F(ConverterTest, VariantExpansionForSuggestion) { immutable_converter), std::make_unique(modules, false), converter); }, - [](const engine::Modules &modules, const ConverterInterface *converter) { - return std::make_unique(modules, *converter); + [](const engine::Modules &modules) { + return std::make_unique(modules); }); Segments segments; @@ -1942,8 +1941,7 @@ TEST_F(ConverterTest, RevertConversion) { const ImmutableConverterInterface *immutable_converter) { return std::move(mock_predictor); }, - [&mock_rewriter](const engine::Modules &modules, - const ConverterInterface *converter) { + [&mock_rewriter](const engine::Modules &modules) { return std::move(mock_rewriter); }); diff --git a/src/engine/engine.cc b/src/engine/engine.cc index aa43238c0..09c92f227 100644 --- a/src/engine/engine.cc +++ b/src/engine/engine.cc @@ -133,9 +133,8 @@ absl::Status Engine::Init(std::unique_ptr modules, std::move(user_history_predictor), converter); }; - auto rewriter_factory = [](const engine::Modules &modules, - const ConverterInterface *converter) { - return std::make_unique(modules, *converter); + auto rewriter_factory = [](const engine::Modules &modules) { + return std::make_unique(modules); }; auto converter = std::make_unique( diff --git a/src/rewriter/rewriter.cc b/src/rewriter/rewriter.cc index 34b33df8d..d1772c7d2 100644 --- a/src/rewriter/rewriter.cc +++ b/src/rewriter/rewriter.cc @@ -32,7 +32,6 @@ #include #include "absl/flags/flag.h" -#include "converter/converter_interface.h" #include "data_manager/data_manager.h" #include "dictionary/dictionary_interface.h" #include "dictionary/pos_group.h" @@ -85,8 +84,7 @@ ABSL_FLAG(bool, use_history_rewriter, true, "Use history rewriter or not."); namespace mozc { -Rewriter::Rewriter(const engine::Modules &modules, - const ConverterInterface &parent_converter) { +Rewriter::Rewriter(const engine::Modules &modules) { const DataManager *data_manager = &modules.GetDataManager(); const dictionary::DictionaryInterface *dictionary = modules.GetDictionary(); const dictionary::PosMatcher &pos_matcher = *modules.GetPosMatcher(); diff --git a/src/rewriter/rewriter.h b/src/rewriter/rewriter.h index 796797686..3d83cbd7e 100644 --- a/src/rewriter/rewriter.h +++ b/src/rewriter/rewriter.h @@ -30,7 +30,6 @@ #ifndef MOZC_REWRITER_REWRITER_H_ #define MOZC_REWRITER_REWRITER_H_ -#include "converter/converter_interface.h" #include "engine/modules.h" #include "rewriter/merger_rewriter.h" @@ -38,8 +37,7 @@ namespace mozc { class Rewriter : public MergerRewriter { public: - Rewriter(const engine::Modules &modules, - const ConverterInterface &parent_converter); + explicit Rewriter(const engine::Modules &modules); Rewriter(const Rewriter &) = delete; Rewriter &operator=(const Rewriter &) = delete; }; diff --git a/src/rewriter/rewriter_test.cc b/src/rewriter/rewriter_test.cc index 5f6e9eef0..c22128986 100644 --- a/src/rewriter/rewriter_test.cc +++ b/src/rewriter/rewriter_test.cc @@ -34,7 +34,6 @@ #include #include "absl/log/check.h" -#include "converter/converter_mock.h" #include "converter/segments.h" #include "data_manager/testing/mock_data_manager.h" #include "engine/modules.h" @@ -64,13 +63,12 @@ class RewriterTest : public testing::TestWithTempUserProfile { void SetUp() override { modules_ = std::make_unique(); CHECK_OK(modules_->Init(std::make_unique())); - rewriter_ = std::make_unique(*modules_, mock_converter_); + rewriter_ = std::make_unique(*modules_); } const RewriterInterface *GetRewriter() const { return rewriter_.get(); } std::unique_ptr modules_; - MockConverter mock_converter_; std::unique_ptr rewriter_; };