Remove obsolete command line flags
This CL removes following command line flags from converter as those flags are no longer used.
--disable_lattice_cache
--disable_predictive_realtime_conversion
This is just a clean-up CL. Hence no behavior change is intended.
BUG=none
TEST=unittest
git-svn-id: https://mozc.googlecode.com/svn/trunk@550 a6090854-d499-a067-5803-1114d4e51264
diff --git a/src/converter/immutable_converter.cc b/src/converter/immutable_converter.cc
index ba2ff38..09d1d6a 100644
--- a/src/converter/immutable_converter.cc
+++ b/src/converter/immutable_converter.cc
@@ -61,11 +61,6 @@
#include "prediction/suggestion_filter.h"
#include "session/commands.pb.h"
-DECLARE_bool(disable_lattice_cache);
-DEFINE_bool(disable_predictive_realtime_conversion,
- false,
- "disable predictive realtime conversion");
-
namespace mozc {
namespace {
@@ -257,16 +252,14 @@
const size_t lattice_history_end_pos = lattice->history_end_pos();
if (!is_prediction ||
- FLAGS_disable_lattice_cache ||
Util::CharsLen(conversion_key) <= 1 ||
lattice_history_end_pos != history_key.size()) {
- // Do not cache if conversion is not prediction, or disable_lattice_cache
- // flag is used. In addition, if a user input the key right after the
- // finish of conversion, reset the lattice to erase old nodes.
- // Even if the lattice key is not changed, we should reset the lattice
- // when the history size is changed.
- // When we submit the candidate partially, the entire key will not changed,
- // but the history position will be changed.
+ // Do not cache if conversion is not prediction. In addition, if a user
+ // input the key right after the finish of conversion, reset the lattice to
+ // erase old nodes. Even if the lattice key is not changed, we should reset
+ // the lattice when the history size is changed. When we submit the
+ // candidate partially, the entire key will not changed, but the history
+ // position will be changed.
lattice->Clear();
}
@@ -780,7 +773,7 @@
dictionary_->LookupReverse(StringPiece(begin, len), &builder);
result_node = builder.result();
} else {
- if (is_prediction && !FLAGS_disable_lattice_cache) {
+ if (is_prediction) {
NodeListBuilderWithCacheEnabled builder(
lattice->node_allocator(),
lattice->cache_info(begin_pos) + 1);
@@ -1403,7 +1396,7 @@
}
// Predictive real time conversion
- if (is_prediction && !FLAGS_disable_predictive_realtime_conversion) {
+ if (is_prediction) {
MakeLatticeNodesForPredictiveNodes(*segments, request, lattice);
}
@@ -1420,9 +1413,7 @@
ApplyPrefixSuffixPenalty(conversion_key, lattice);
// Re-segment personal-names, numbers ...etc
- const bool is_conversion =
- (segments->request_type() == Segments::CONVERSION);
- if (is_conversion) {
+ if (segments->request_type() == Segments::CONVERSION) {
Resegment(*segments, history_key, conversion_key, lattice);
}
diff --git a/src/converter/lattice.cc b/src/converter/lattice.cc
index add7f7c..d3cbdc9 100644
--- a/src/converter/lattice.cc
+++ b/src/converter/lattice.cc
@@ -40,10 +40,6 @@
#include "converter/node.h"
#include "converter/node_allocator.h"
-DEFINE_bool(disable_lattice_cache,
- false,
- "do not use cache feature for lattice");
-
namespace mozc {
namespace {
@@ -257,11 +253,6 @@
}
void Lattice::UpdateKey(const string &new_key) {
- if (FLAGS_disable_lattice_cache) {
- SetKey(new_key);
- return;
- }
-
const string old_key = key_;
const string common_prefix = GetCommonPrefix(new_key, old_key);
@@ -285,7 +276,7 @@
}
void Lattice::AddSuffix(const string &suffix_key) {
- if (suffix_key == "") {
+ if (suffix_key.empty()) {
return;
}
const size_t old_size = key_.size();
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index fb1ae16..19ade32 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
MAJOR=2
MINOR=16
-BUILD=2066
+BUILD=2067
REVISION=102
# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
# downloaded by NaCl Mozc.