build with old librime

hchunhui · Oct 27, 2024 · e42e351 · e42e351
1 parent 5819dca
commit e42e351
Showing 1 changed file with 20 additions and 10 deletions.
diff --git a/src/types.cc b/src/types.cc
@@ -31,6 +31,7 @@ using namespace rime;
 namespace {
 
 template<typename> using void_t = void;
+template<typename T1, typename T2> using fst_t = T1;
 
 template<typename T, typename = void>
 struct COMPAT {
@@ -50,6 +51,14 @@ struct COMPAT {
   static string get_sync_dir() {
     return string(rime_get_api()->get_sync_dir());
   }
+
+  static bool Config_load_from_file(fst_t<Config, T> &t, const string &f) {
+    return t.LoadFromFile(f);
+  }
+
+  static bool Config_save_to_file(fst_t<Config, T> &t, const string &f) {
+    return t.SaveToFile(f);
+  }
 };
 
 template<typename T>
@@ -73,6 +82,14 @@ struct COMPAT<T, void_t<decltype(std::declval<T>().user_data_dir.string())>> {
     T &deployer = Service::instance().deployer();
     return deployer.sync_dir.string();
   }
+
+  bool Config_load_from_file(fst_t<Config, T> &t, const string &f) {
+    return t.LoadFromFile(path(f));
+  }
+
+  bool Config_save_to_file(fst_t<Config, T> &t, const string &f) {
+    return t.SaveToFile(path(f));
+  }
 };
 
 //--- wrappers for Segment
@@ -1217,7 +1234,7 @@ namespace ConfigReg {
   int raw_make(lua_State *L) {
     an<T> config = New<T>();
     if (auto cstr = lua_tostring(L, 1)) {
-      config->LoadFromFile(path(cstr));
+      COMPAT<Deployer>::Config_load_from_file(config, cstr);
     }
     LuaType<an<T>>::pushdata(L, config);
     return 1;
@@ -1281,13 +1298,6 @@ namespace ConfigReg {
     return t.SetItem(path, value);
   }
 
-  bool load_from_file(T &t, const string &f) {
-    return t.LoadFromFile(path(f));
-  }
-  bool save_to_file(T &t, const string &f) {
-    return t.SaveToFile(path(f));
-  }
-
   static const luaL_Reg funcs[] = {
     { "Config", (raw_make)},
     { NULL, NULL },
@@ -1296,8 +1306,8 @@ namespace ConfigReg {
   static const luaL_Reg methods[] = {
     //bool LoadFromStream(std::istream& stream);
     //bool SaveToStream(std::ostream& stream);
-    { "load_from_file", WRAP(load_from_file) },
-    { "save_to_file", WRAP(save_to_file) },
+    { "load_from_file", WRAP(COMPAT<Deployer>::Config_load_from_file) },
+    { "save_to_file", WRAP(COMPAT<Deployer>::Config_save_to_file) },
 
     { "is_null", WRAPMEM(T::IsNull) },
     { "is_value", WRAPMEM(T::IsValue) },