Skip to content

Remove Singleton from converter_main.cc #1498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hiroyuki-komatsu merged 1 commit into from
May 13, 2026
Merged

Remove Singleton from converter_main.cc #1498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/converter/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,6 @@ mozc_cc_binary(
"//base:file_util",
"//base:init_mozc",
"//base:number_util",
"//base:singleton",
"//base:system_util",
"//base/container:flat_set",
"//base/protobuf:text_format",
Expand All @@ -761,6 +760,7 @@ mozc_cc_binary(
"//protocol:engine_builder_cc_proto",
"//request:conversion_request",
"//request:request_test_util",
"@com_google_absl//absl/base:no_destructor",
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/log",
"@com_google_absl//absl/log:check",
Expand Down
38 changes: 11 additions & 27 deletions src/converter/converter_main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#include <utility>
#include <vector>

#include "absl/base/no_destructor.h"
#include "absl/flags/flag.h"
#include "absl/log/check.h"
#include "absl/log/log.h"
Expand All @@ -53,7 +54,6 @@
#include "base/init_mozc.h"
#include "base/number_util.h"
#include "base/protobuf/text_format.h"
#include "base/singleton.h"
#include "base/system_util.h"
#include "composer/composer.h"
#include "config/config_handler.h"
Expand Down Expand Up @@ -112,31 +112,15 @@ int FindCandidate(const Segment& segment, absl::string_view value) {
return -1;
}

// Wrapper class for pos id printing
class PosIdPrintUtil {
public:
PosIdPrintUtil(const PosIdPrintUtil&) = delete;
PosIdPrintUtil& operator=(const PosIdPrintUtil&) = delete;
static std::string IdToString(int id) {
return Singleton<PosIdPrintUtil>::get()->IdToStringInternal(id);
}

private:
PosIdPrintUtil()
: pos_id_printer_(InputFileStream(absl::GetFlag(FLAGS_id_def))) {}

std::string IdToStringInternal(int id) const {
const absl::string_view pos_string = pos_id_printer_.IdToString(id);
if (pos_string.empty()) {
return absl::StrCat(id);
}
return absl::StrFormat("%s (%d)", pos_string, id);
std::string IdToString(int id) {
static const absl::NoDestructor<internal::PosIdPrinter> printer(
internal::PosIdPrinter(InputFileStream(absl::GetFlag(FLAGS_id_def))));
const absl::string_view pos_string = printer->IdToString(id);
if (pos_string.empty()) {
return absl::StrCat(id);
}

internal::PosIdPrinter pos_id_printer_;

friend class Singleton<PosIdPrintUtil>;
};
return absl::StrFormat("%s (%d)", pos_string, id);
}

std::string SegmentTypeToString(Segment::SegmentType type) {
#define RETURN_STR(val) \
Expand Down Expand Up @@ -230,8 +214,8 @@ void PrintCandidate(const Segment& parent, size_t candidates_size, int num,
cand.content_key);
lines.push_back(absl::StrFormat("cost: %d scost: %d wcost: %d", cand.cost,
cand.structure_cost, cand.wcost));
lines.push_back("lid: " + PosIdPrintUtil::IdToString(cand.lid));
lines.push_back("rid: " + PosIdPrintUtil::IdToString(cand.rid));
lines.push_back("lid: " + IdToString(cand.lid));
lines.push_back("rid: " + 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);
Expand Down