simplifier: move RandomConvertText to a separate branch

rime · Oct 29, 2016 · 57bf14a · 57bf14a
1 parent 117ab3b
commit 57bf14a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/include/rime/gear/simplifier.h b/include/rime/gear/simplifier.h
@@ -27,16 +27,15 @@ class Simplifier : public Filter, TagMatching {
     return TagsMatch(segment);
   }
 
-  void PushBack(const an<Candidate>& original,
-                         CandidateQueue* result, const string& simplified);
-
   bool Convert(const an<Candidate>& original,
                CandidateQueue* result);
 
  protected:
   enum TipsLevel { kTipsNone, kTipsChar, kTipsAll };
 
   void Initialize();
+  void PushBack(const an<Candidate>& original,
+                         CandidateQueue* result, const string& simplified);
 
   bool initialized_ = false;
   the<Opencc> opencc_;

diff --git a/src/gear/simplifier.cc b/src/gear/simplifier.cc
@@ -55,7 +55,7 @@ class Opencc {
     }
   }
 
-  bool ConvertRandText(const string& text,
+  bool RandomConvertText(const string& text,
                    string* simplified) {
     const char *phrase = text.c_str();
     std::ostringstream buffer;
@@ -225,26 +225,30 @@ bool Simplifier::Convert(const an<Candidate>& original,
     return false;
   }
   bool success = false;
-  vector<string> forms;
-  if (!random) success = opencc_->ConvertWord(original->text(), &forms);
-  if (success) {
-    for (size_t i = 0; i < forms.size(); ++i) {
-      if (forms[i] == original->text()) {
-        result->push_back(original);
-      } else {
-        PushBack(original, result, forms[i]);
-      }
-    }
-  } else {
+  if (random_) {
     string simplified;
-    if (random_) {
-      success = opencc_->ConvertRandText(original->text(), &simplified);
-    } else {
-      success = opencc_->ConvertText(original->text(), &simplified);
-    }
+    success = opencc_->RandomConvertText(original->text(), &simplified);
     if (success) {
       PushBack(original, result, simplified);
     }
+  } else { //!random_
+    vector<string> forms;
+    success = opencc_->ConvertWord(original->text(), &forms);
+    if (success) {
+      for (size_t i = 0; i < forms.size(); ++i) {
+        if (forms[i] == original->text()) {
+          result->push_back(original);
+        } else {
+          PushBack(original, result, forms[i]);
+        }
+      }
+    } else {
+      string simplified;
+      success = opencc_->ConvertText(original->text(), &simplified);
+      if (success) {
+        PushBack(original, result, simplified);
+      }
+    }
   }
   return success;
 }