add disconnect to reset dict user_dict , remove gc()

Signed-off-by: shewer <[email protected]>

src/lua_gears.cc

@@ -159,7 +159,6 @@ LuaFilter::~LuaFilter() {
       LOG(ERROR) << "LuaFilter::~LuaFilter of "<< name_space_ << " error(" << e.status << "): " << e.e;
     }
   }
-  lua_->gc();
 }
 
 //--- LuaTranslator
@@ -187,7 +186,6 @@ LuaTranslator::~LuaTranslator() {
       LOG(ERROR) << "LuaTranslator::~LuaTranslator of "<< name_space_ << " error(" << e.status << "): " << e.e;
     }
   }
-  lua_->gc();
 }
 
 //--- LuaSegmentor
@@ -215,7 +213,6 @@ LuaSegmentor::~LuaSegmentor() {
       LOG(ERROR) << "LuaSegmentor::~LuaSegmentor of "<< name_space_ << " error(" << e.status << "): " << e.e;
     }
   }
-  lua_->gc();
 }
 
 //--- LuaProcessor
@@ -247,7 +244,6 @@ LuaProcessor::~LuaProcessor() {
       LOG(ERROR) << "LuaProcessor::~LuaProcessor of "<< name_space_ << " error(" << e.status << "): " << e.e;
     }
   }
-  lua_->gc();
 }
 
 }  // namespace rime

src/script_translator.cc

@@ -33,7 +33,7 @@ namespace ScriptTranslatorReg {
 
       SET_(memorize_callback, an<LuaObj>);
       optional<an<LuaObj>> memorize_callback();
-      string lang_name() { return language_->name();};
+      string lang_name() const { return (language_) ? language_->name() : "";};
 
       // TranslatorOptions
       SET_(contextual_suggestions, bool);
@@ -49,6 +49,12 @@ namespace ScriptTranslatorReg {
       GET_(enable_correction, bool);
       void set_enable_correction(bool);
 
+      void disconnect() {
+        dict_.reset();
+        user_dict_.reset();
+        language_.reset();
+      }
+
     protected:
       Lua* lua_;
       an<LuaObj> memorize_callback_;
@@ -107,6 +113,10 @@ namespace ScriptTranslatorReg {
     return cl ?  user_dict_disabling_patterns_.Load(cl) : false;
   }
 
+  an<Translator> as_translator(an<T> &t) {
+    return As<Translator>(t);
+  }
+
   static const luaL_Reg funcs[] = {
     {NULL, NULL},
   };
@@ -120,6 +130,7 @@ namespace ScriptTranslatorReg {
     WMEM(update_entry),  // delegate UserDictionary::UpdateEntry
     WMEM(reload_user_dict_disabling_patterns),
     {"set_memorize_callback", raw_set_memorize_callback<T>},  // an<LuaObj> callback function
+    {"disconnect", WRAPMEM(T::disconnect)},
     {NULL, NULL},
   };
 
@@ -144,6 +155,7 @@ namespace ScriptTranslatorReg {
     // Memory
     Get_WMEM(dict),
     Get_WMEM(user_dict),
+    {"translator", WRAP(as_translator)},
     {NULL, NULL},
   };
 

src/table_translator.cc

@@ -34,7 +34,7 @@ namespace TableTranslatorReg {
 
       SET_(memorize_callback, an<LuaObj>);
       optional<an<LuaObj>> memorize_callback();
-      string lang_name() const { return language_->name();};
+      string lang_name() const { return (language_) ? language_->name() : "";};
 
       // TranslatorOptions
       void set_contextual_suggestions(bool);
@@ -55,6 +55,12 @@ namespace TableTranslatorReg {
       GET_(enable_sentence, bool);
       void set_enable_sentence(bool);
 
+      void disconnect() {
+        dict_.reset();
+        user_dict_.reset();
+        language_.reset();
+      }
+
     protected:
       Lua* lua_;
       an<LuaObj> memorize_callback_;
@@ -147,6 +153,10 @@ namespace TableTranslatorReg {
     return cl ?  user_dict_disabling_patterns_.Load(cl) : false;
   }
 
+  an<Translator> as_translator(an<T> &t) {
+    return As<Translator>(t);
+  }
+
   static const luaL_Reg funcs[] = {
     {NULL, NULL},
   };
@@ -160,6 +170,7 @@ namespace TableTranslatorReg {
     WMEM(update_entry),  // delegate UserDictionary::UpdateEntry
     WMEM(reload_user_dict_disabling_patterns),
     {"set_memorize_callback", raw_set_memorize_callback<T>},  // an<LuaObj> callback function
+    {"disconnect", WRAPMEM(T::disconnect)},
     {NULL, NULL},
   };
 
@@ -188,6 +199,7 @@ namespace TableTranslatorReg {
     // Memory
     Get_WMEM(dict),
     Get_WMEM(user_dict),
+    {"translator", WRAP(as_translator)},
     {NULL, NULL},
   };
 

src/types.cc

@@ -1794,7 +1794,7 @@ namespace MemoryReg {
         const string& new_entry_prefix, const string& lang_string);
 
     bool update_candidate(const an<Candidate> cand, const int commits);
-    const string lang_name() { return language_->name(); };
+    const string lang_name() { return (language_) ? language_->name() : ""; };
     virtual bool Memorize(const CommitEntry& entry);
 
     LuaMemory(const Ticket& ticket, Lua* lua)
@@ -1809,6 +1809,11 @@ namespace MemoryReg {
     void clearUser() {
       uter.reset();
     }
+    void disconnect() {
+      dict_.reset();
+      user_dict_.reset();
+      language_.reset();
+    }
   };
 
   vector<string> LuaMemory::decode(const Code& code) {
@@ -1970,6 +1975,7 @@ namespace MemoryReg {
       { "update_userdict", WRAPMEM(T::update_userdict)},
       { "update_entry", WRAPMEM(T::update_entry)},
       { "update_candidate", WRAPMEM(T::update_candidate)},
+      { "disconnect", WRAPMEM(T::disconnect)},
       {NULL, NULL},
   };