Merge branch 'master' into config

Author: lotem

Makefile

@@ -48,5 +48,5 @@ test: release
 	(cd build/test; ./rime_test)
 
 test-debug: release
-	(cd build/test; ./rime_test)
+	(cd debug-build/test; ./rime_test)
 

src/rime/gear/charset_filter.cc

@@ -23,6 +23,7 @@ bool is_extended_cjk(uint32_t ch)
       (ch >= 0x2A700 && ch <= 0x2B73F) ||  // CJK Unified Ideographs Extension C
       (ch >= 0x2B740 && ch <= 0x2B81F) ||  // CJK Unified Ideographs Extension D
       (ch >= 0x2B820 && ch <= 0x2CEAF) ||  // CJK Unified Ideographs Extension E
+      (ch >= 0x2CEB0 && ch <= 0x2EBEF) ||  // CJK Unified Ideographs Extension F
       (ch >= 0x2F800 && ch <= 0x2FA1F))    // CJK Compatibility Ideographs Supplement
     return true;
 

src/rime/gear/simplifier.cc

@@ -34,14 +34,20 @@ class Opencc {
   Opencc(const string& config_path) {
     LOG(INFO) << "initilizing opencc: " << config_path;
     opencc::Config config;
-    converter_ = config.NewFromFile(config_path);
-    const list<opencc::ConversionPtr> conversions =
-      converter_->GetConversionChain()->GetConversions();
-    dict_ = conversions.front()->GetDict();
+    try {
+      converter_ = config.NewFromFile(config_path);
+      const list<opencc::ConversionPtr> conversions =
+        converter_->GetConversionChain()->GetConversions();
+      dict_ = conversions.front()->GetDict();
+    }
+    catch (...) {
+      LOG(ERROR) << "opencc config not found: " << config_path;
+    }
   }
 
   bool ConvertWord(const string& text,
                               vector<string>* forms) {
+    if (dict_ == nullptr) return false;
     opencc::Optional<const opencc::DictEntry*> item = dict_->Match(text);
     if (item.IsNull()) {
       // Match not found
@@ -57,6 +63,7 @@ class Opencc {
 
   bool RandomConvertText(const string& text,
                    string* simplified) {
+    if (dict_ == nullptr) return false;
     const char *phrase = text.c_str();
     std::ostringstream buffer;
     for (const char* pstr = phrase; *pstr != '\0';) {
@@ -78,6 +85,7 @@ class Opencc {
 
   bool ConvertText(const string& text,
                    string* simplified) {
+    if (converter_ == nullptr) return false;
     *simplified = converter_->Convert(text);
     return *simplified != text;
   }