Skip to content

Commit cf6fcf7

Browse files
hiroyuki-komatsuhiroyuki-komatsu
committed
Rename functions of Converter.
Since the functions with ForRequest (e.g. StartConversionForRequest) are main functions, rename them to the shorter one. * StartConversionForRequest(request, *segments) → StartConversion(request, *segments) * StartConversion(*segments, key) → StartConversionWithKey(*segments, key) This is a preparation for the main issue (b/326840183). #codehealth PiperOrigin-RevId: 610773962
1 parent 03d3c24 commit cf6fcf7

16 files changed

+366
-360
lines changed

‎src/converter/BUILD.bazel

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,6 @@ mozc_cc_library(
422422
":immutable_converter_interface",
423423
":segments",
424424
"//base:japanese_util",
425-
"//base:logging",
426425
"//base:util",
427426
"//base:vlog",
428427
"//base/strings:assign",
@@ -438,6 +437,8 @@ mozc_cc_library(
438437
"//transliteration",
439438
"//usage_stats",
440439
"@com_google_absl//absl/base:core_headers",
440+
"@com_google_absl//absl/log",
441+
"@com_google_absl//absl/log:check",
441442
"@com_google_absl//absl/strings",
442443
"@com_google_absl//absl/types:span",
443444
],
@@ -644,7 +645,11 @@ mozc_cc_library(
644645
hdrs = ["converter_mock.h"],
645646
deps = [
646647
":converter_interface",
648+
":segments",
649+
"//request:conversion_request",
647650
"//testing:gunit",
651+
"@com_google_absl//absl/strings",
652+
"@com_google_absl//absl/types:span",
648653
],
649654
)
650655

‎src/converter/converter.cc

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@
3737
#include <utility>
3838
#include <vector>
3939

40+
#include "absl/log/check.h"
41+
#include "absl/log/log.h"
4042
#include "absl/strings/string_view.h"
4143
#include "absl/types/span.h"
4244
#include "base/japanese_util.h"
43-
#include "base/logging.h"
4445
#include "base/strings/assign.h"
4546
#include "base/util.h"
4647
#include "base/vlog.h"
@@ -273,8 +274,8 @@ void Converter::Init(const engine::Modules &modules,
273274
general_noun_id_ = pos_matcher_->GetGeneralNounId();
274275
}
275276

276-
bool Converter::StartConversionForRequest(
277-
const ConversionRequest &original_request, Segments *segments) const {
277+
bool Converter::StartConversion(const ConversionRequest &original_request,
278+
Segments *segments) const {
278279
ConversionRequest request = CreateConversionRequestWithType(
279280
original_request, ConversionRequest::CONVERSION);
280281
if (!request.has_composer()) {
@@ -300,8 +301,8 @@ bool Converter::StartConversionForRequest(
300301
return Convert(request, conversion_key, segments);
301302
}
302303

303-
bool Converter::StartConversion(Segments *segments,
304-
const absl::string_view key) const {
304+
bool Converter::StartConversionWithKey(Segments *segments,
305+
const absl::string_view key) const {
305306
if (key.empty()) {
306307
return false;
307308
}
@@ -425,8 +426,8 @@ bool Converter::Predict(const ConversionRequest &request,
425426
return IsValidSegments(request, *segments);
426427
}
427428

428-
bool Converter::StartPredictionForRequest(
429-
const ConversionRequest &original_request, Segments *segments) const {
429+
bool Converter::StartPrediction(const ConversionRequest &original_request,
430+
Segments *segments) const {
430431
ConversionRequest request = CreateConversionRequestWithType(
431432
original_request, ConversionRequest::PREDICTION);
432433
if (!request.has_composer()) {
@@ -438,44 +439,44 @@ bool Converter::StartPredictionForRequest(
438439
return Predict(request, prediction_key, segments);
439440
}
440441

441-
bool Converter::StartPrediction(Segments *segments,
442-
const absl::string_view key) const {
442+
bool Converter::StartPredictionWithKey(Segments *segments,
443+
const absl::string_view key) const {
443444
ConversionRequest default_request;
444445
default_request.set_request_type(ConversionRequest::PREDICTION);
445446
return Predict(default_request, key, segments);
446447
}
447448

448-
bool Converter::StartSuggestion(Segments *segments,
449-
const absl::string_view key) const {
449+
bool Converter::StartSuggestionWithKey(Segments *segments,
450+
const absl::string_view key) const {
450451
ConversionRequest default_request;
451452
default_request.set_request_type(ConversionRequest::SUGGESTION);
452453
return Predict(default_request, key, segments);
453454
}
454455

455-
bool Converter::StartSuggestionForRequest(
456-
const ConversionRequest &original_request, Segments *segments) const {
456+
bool Converter::StartSuggestion(const ConversionRequest &original_request,
457+
Segments *segments) const {
457458
ConversionRequest request = CreateConversionRequestWithType(
458459
original_request, ConversionRequest::SUGGESTION);
459460
DCHECK(request.has_composer());
460461
std::string prediction_key = request.composer().GetQueryForPrediction();
461462
return Predict(request, prediction_key, segments);
462463
}
463464

464-
bool Converter::StartPartialSuggestion(Segments *segments,
465-
const absl::string_view key) const {
465+
bool Converter::StartPartialSuggestionWithKey(
466+
Segments *segments, const absl::string_view key) const {
466467
ConversionRequest default_request;
467468
default_request.set_request_type(ConversionRequest::PARTIAL_SUGGESTION);
468469
return Predict(default_request, key, segments);
469470
}
470471

471-
bool Converter::StartPartialSuggestionForRequest(
472+
bool Converter::StartPartialSuggestion(
472473
const ConversionRequest &original_request, Segments *segments) const {
473474
ConversionRequest request = CreateConversionRequestWithType(
474475
original_request, ConversionRequest::PARTIAL_SUGGESTION);
475476
DCHECK(request.has_composer());
476477
const size_t cursor = request.composer().GetCursor();
477478
if (cursor == 0 || cursor == request.composer().GetLength()) {
478-
return StartSuggestionForRequest(request, segments);
479+
return StartSuggestion(request, segments);
479480
}
480481

481482
std::string conversion_key = request.composer().GetQueryForConversion();
@@ -484,21 +485,21 @@ bool Converter::StartPartialSuggestionForRequest(
484485
return Predict(request, conversion_key, segments);
485486
}
486487

487-
bool Converter::StartPartialPrediction(Segments *segments,
488-
const absl::string_view key) const {
488+
bool Converter::StartPartialPredictionWithKey(
489+
Segments *segments, const absl::string_view key) const {
489490
ConversionRequest default_request;
490491
default_request.set_request_type(ConversionRequest::PARTIAL_PREDICTION);
491492
return Predict(default_request, key, segments);
492493
}
493494

494-
bool Converter::StartPartialPredictionForRequest(
495+
bool Converter::StartPartialPrediction(
495496
const ConversionRequest &original_request, Segments *segments) const {
496497
ConversionRequest request = CreateConversionRequestWithType(
497498
original_request, ConversionRequest::PARTIAL_PREDICTION);
498499
DCHECK(request.has_composer());
499500
const size_t cursor = request.composer().GetCursor();
500501
if (cursor == 0 || cursor == request.composer().GetLength()) {
501-
return StartPredictionForRequest(request, segments);
502+
return StartPrediction(request, segments);
502503
}
503504

504505
std::string conversion_key = request.composer().GetQueryForConversion();

‎src/converter/converter.h

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -64,38 +64,38 @@ class Converter final : public ConverterInterface {
6464
ImmutableConverterInterface *immutable_converter);
6565

6666
ABSL_MUST_USE_RESULT
67-
bool StartConversionForRequest(const ConversionRequest &request,
68-
Segments *segments) const override;
67+
bool StartConversion(const ConversionRequest &request,
68+
Segments *segments) const override;
6969
ABSL_MUST_USE_RESULT
70-
bool StartConversion(Segments *segments,
71-
absl::string_view key) const override;
70+
bool StartConversionWithKey(Segments *segments,
71+
absl::string_view key) const override;
7272
ABSL_MUST_USE_RESULT
7373
bool StartReverseConversion(Segments *segments,
7474
absl::string_view key) const override;
7575
ABSL_MUST_USE_RESULT
76-
bool StartPredictionForRequest(const ConversionRequest &request,
77-
Segments *segments) const override;
76+
bool StartPrediction(const ConversionRequest &request,
77+
Segments *segments) const override;
7878
ABSL_MUST_USE_RESULT
79-
bool StartPrediction(Segments *segments,
80-
absl::string_view key) const override;
79+
bool StartPredictionWithKey(Segments *segments,
80+
absl::string_view key) const override;
8181
ABSL_MUST_USE_RESULT
82-
bool StartSuggestionForRequest(const ConversionRequest &request,
83-
Segments *segments) const override;
82+
bool StartSuggestion(const ConversionRequest &request,
83+
Segments *segments) const override;
8484
ABSL_MUST_USE_RESULT
85-
bool StartSuggestion(Segments *segments,
86-
absl::string_view key) const override;
85+
bool StartSuggestionWithKey(Segments *segments,
86+
absl::string_view key) const override;
8787
ABSL_MUST_USE_RESULT
88-
bool StartPartialPredictionForRequest(const ConversionRequest &request,
89-
Segments *segments) const override;
88+
bool StartPartialPrediction(const ConversionRequest &request,
89+
Segments *segments) const override;
9090
ABSL_MUST_USE_RESULT
91-
bool StartPartialPrediction(Segments *segments,
92-
absl::string_view key) const override;
91+
bool StartPartialPredictionWithKey(Segments *segments,
92+
absl::string_view key) const override;
9393
ABSL_MUST_USE_RESULT
94-
bool StartPartialSuggestionForRequest(const ConversionRequest &request,
95-
Segments *segments) const override;
94+
bool StartPartialSuggestion(const ConversionRequest &request,
95+
Segments *segments) const override;
9696
ABSL_MUST_USE_RESULT
97-
bool StartPartialSuggestion(Segments *segments,
98-
absl::string_view key) const override;
97+
bool StartPartialSuggestionWithKey(Segments *segments,
98+
absl::string_view key) const override;
9999

100100
void FinishConversion(const ConversionRequest &request,
101101
Segments *segments) const override;

‎src/converter/converter_interface.h

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ class ConverterInterface {
5656

5757
// Starts conversion for given request.
5858
ABSL_MUST_USE_RESULT
59-
virtual bool StartConversionForRequest(const ConversionRequest &request,
60-
Segments *segments) const = 0;
59+
virtual bool StartConversion(const ConversionRequest &request,
60+
Segments *segments) const = 0;
6161

6262
// Start conversion with key.
6363
// key is a request written in Hiragana sequence
6464
ABSL_MUST_USE_RESULT
65-
virtual bool StartConversion(Segments *segments,
66-
absl::string_view key) const = 0;
65+
virtual bool StartConversionWithKey(Segments *segments,
66+
absl::string_view key) const = 0;
6767

6868
// Start reverse conversion with key.
6969
ABSL_MUST_USE_RESULT
@@ -72,43 +72,43 @@ class ConverterInterface {
7272

7373
// Starts prediction for given request.
7474
ABSL_MUST_USE_RESULT
75-
virtual bool StartPredictionForRequest(const ConversionRequest &request,
76-
Segments *segments) const = 0;
75+
virtual bool StartPrediction(const ConversionRequest &request,
76+
Segments *segments) const = 0;
7777

7878
// Start prediction with key (request_type = PREDICTION)
7979
ABSL_MUST_USE_RESULT
80-
virtual bool StartPrediction(Segments *segments,
81-
absl::string_view key) const = 0;
80+
virtual bool StartPredictionWithKey(Segments *segments,
81+
absl::string_view key) const = 0;
8282

8383
// Starts suggestion for given request.
8484
ABSL_MUST_USE_RESULT
85-
virtual bool StartSuggestionForRequest(const ConversionRequest &request,
86-
Segments *segments) const = 0;
85+
virtual bool StartSuggestion(const ConversionRequest &request,
86+
Segments *segments) const = 0;
8787

8888
// Start suggestion with key (request_type = SUGGESTION)
8989
ABSL_MUST_USE_RESULT
90-
virtual bool StartSuggestion(Segments *segments,
91-
absl::string_view key) const = 0;
90+
virtual bool StartSuggestionWithKey(Segments *segments,
91+
absl::string_view key) const = 0;
9292

9393
// Starts partial prediction for given request.
9494
ABSL_MUST_USE_RESULT
95-
virtual bool StartPartialPredictionForRequest(
96-
const ConversionRequest &request, Segments *segments) const = 0;
95+
virtual bool StartPartialPrediction(const ConversionRequest &request,
96+
Segments *segments) const = 0;
9797

9898
// Start prediction with key (request_type = PARTIAL_PREDICTION)
9999
ABSL_MUST_USE_RESULT
100-
virtual bool StartPartialPrediction(Segments *segments,
101-
absl::string_view key) const = 0;
100+
virtual bool StartPartialPredictionWithKey(Segments *segments,
101+
absl::string_view key) const = 0;
102102

103103
// Starts partial suggestion for given request.
104104
ABSL_MUST_USE_RESULT
105-
virtual bool StartPartialSuggestionForRequest(
106-
const ConversionRequest &request, Segments *segments) const = 0;
105+
virtual bool StartPartialSuggestion(const ConversionRequest &request,
106+
Segments *segments) const = 0;
107107

108108
// Start suggestion with key (request_type = PARTIAL_SUGGESTION)
109109
ABSL_MUST_USE_RESULT
110-
virtual bool StartPartialSuggestion(Segments *segments,
111-
absl::string_view key) const = 0;
110+
virtual bool StartPartialSuggestionWithKey(Segments *segments,
111+
absl::string_view key) const = 0;
112112

113113
// Finish conversion.
114114
// Segments are cleared. Context is not cleared

‎src/converter/converter_main.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -296,14 +296,14 @@ bool ExecCommand(const ConverterInterface &converter, const std::string &line,
296296
if (func == "startconversion" || func == "start" || func == "s") {
297297
CHECK_FIELDS_LENGTH(2);
298298
composer.SetPreeditTextForTestOnly(fields[1]);
299-
return converter.StartConversionForRequest(*conversion_request, segments);
299+
return converter.StartConversion(*conversion_request, segments);
300300
} else if (func == "convertwithnodeinfo" || func == "cn") {
301301
CHECK_FIELDS_LENGTH(5);
302302
Lattice::SetDebugDisplayNode(
303303
NumberUtil::SimpleAtoi(fields[2]), // begin pos
304304
NumberUtil::SimpleAtoi(fields[3]), // end pos
305305
fields[4]);
306-
const bool result = converter.StartConversion(segments, fields[1]);
306+
const bool result = converter.StartConversionWithKey(segments, fields[1]);
307307
Lattice::ResetDebugDisplayNode();
308308
return result;
309309
} else if (func == "reverseconversion" || func == "reverse" || func == "r") {
@@ -312,16 +312,16 @@ bool ExecCommand(const ConverterInterface &converter, const std::string &line,
312312
} else if (func == "startprediction" || func == "predict" || func == "p") {
313313
if (fields.size() >= 2) {
314314
composer.SetPreeditTextForTestOnly(fields[1]);
315-
return converter.StartPredictionForRequest(*conversion_request, segments);
315+
return converter.StartPrediction(*conversion_request, segments);
316316
} else {
317-
return converter.StartPredictionForRequest(*conversion_request, segments);
317+
return converter.StartPrediction(*conversion_request, segments);
318318
}
319319
} else if (func == "startsuggestion" || func == "suggest") {
320320
if (fields.size() >= 2) {
321321
composer.SetPreeditTextForTestOnly(fields[1]);
322-
return converter.StartSuggestionForRequest(*conversion_request, segments);
322+
return converter.StartSuggestion(*conversion_request, segments);
323323
} else {
324-
return converter.StartSuggestionForRequest(*conversion_request, segments);
324+
return converter.StartSuggestion(*conversion_request, segments);
325325
}
326326
} else if (func == "finishconversion" || func == "finish") {
327327
converter.FinishConversion(*conversion_request, segments);

‎src/converter/converter_mock.h

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,15 @@
3030
#ifndef MOZC_CONVERTER_CONVERTER_MOCK_H_
3131
#define MOZC_CONVERTER_CONVERTER_MOCK_H_
3232

33+
#include <cstddef>
34+
#include <cstdint>
35+
#include <vector>
36+
37+
#include "absl/strings/string_view.h"
38+
#include "absl/types/span.h"
3339
#include "converter/converter_interface.h"
40+
#include "converter/segments.h"
41+
#include "request/conversion_request.h"
3442
#include "testing/gmock.h"
3543

3644
namespace mozc {
@@ -40,32 +48,32 @@ class StrictMockConverter : public ConverterInterface {
4048
StrictMockConverter() = default;
4149
~StrictMockConverter() override = default;
4250

43-
MOCK_METHOD(bool, StartConversionForRequest,
51+
MOCK_METHOD(bool, StartConversion,
4452
(const ConversionRequest &request, Segments *segments),
4553
(const, override));
46-
MOCK_METHOD(bool, StartConversion,
54+
MOCK_METHOD(bool, StartConversionWithKey,
4755
(Segments * segments, absl::string_view key), (const, override));
4856
MOCK_METHOD(bool, StartReverseConversion,
4957
(Segments * segments, absl::string_view key), (const, override));
50-
MOCK_METHOD(bool, StartPredictionForRequest,
58+
MOCK_METHOD(bool, StartPrediction,
5159
(const ConversionRequest &request, Segments *segments),
5260
(const, override));
53-
MOCK_METHOD(bool, StartPrediction,
61+
MOCK_METHOD(bool, StartPredictionWithKey,
5462
(Segments * segments, absl::string_view key), (const, override));
55-
MOCK_METHOD(bool, StartSuggestionForRequest,
63+
MOCK_METHOD(bool, StartSuggestion,
5664
(const ConversionRequest &request, Segments *segments),
5765
(const, override));
58-
MOCK_METHOD(bool, StartSuggestion,
66+
MOCK_METHOD(bool, StartSuggestionWithKey,
5967
(Segments * segments, absl::string_view key), (const, override));
60-
MOCK_METHOD(bool, StartPartialPredictionForRequest,
68+
MOCK_METHOD(bool, StartPartialPrediction,
6169
(const ConversionRequest &request, Segments *segments),
6270
(const, override));
63-
MOCK_METHOD(bool, StartPartialPrediction,
71+
MOCK_METHOD(bool, StartPartialPredictionWithKey,
6472
(Segments * segments, absl::string_view key), (const, override));
65-
MOCK_METHOD(bool, StartPartialSuggestionForRequest,
73+
MOCK_METHOD(bool, StartPartialSuggestion,
6674
(const ConversionRequest &request, Segments *segments),
6775
(const, override));
68-
MOCK_METHOD(bool, StartPartialSuggestion,
76+
MOCK_METHOD(bool, StartPartialSuggestionWithKey,
6977
(Segments * segments, absl::string_view key), (const, override));
7078
MOCK_METHOD(void, FinishConversion,
7179
(const ConversionRequest &request, Segments *segments),

0 commit comments

Comments
 (0)