Merge pull request #134 from openvanilla/dev/update-api

Update McBopomofoLM API to sync with the macOS version

src/Engine/AssociatedPhrasesV2.cpp

@@ -121,6 +121,8 @@ void AssociatedPhrasesV2::close() {
   mmapedFile_.close();
 }
 
+bool AssociatedPhrasesV2::isLoaded() const { return db_ != nullptr; }
+
 bool AssociatedPhrasesV2::open(std::unique_ptr<ParselessPhraseDB> db) {
   if (db_ != nullptr) {
     return false;

src/Engine/AssociatedPhrasesV2.h

@@ -40,6 +40,7 @@ class AssociatedPhrasesV2 {
 
   bool open(const char* path);
   void close();
+  bool isLoaded() const;
 
   // Allows the use of existing in-memory db.
   bool open(std::unique_ptr<ParselessPhraseDB> db);

src/Engine/McBopomofoLM.cpp

@@ -43,7 +43,9 @@ void McBopomofoLM::loadLanguageModel(const char* languageModelDataPath) {
   }
 }
 
-bool McBopomofoLM::isDataModelLoaded() { return languageModel_.isLoaded(); }
+bool McBopomofoLM::isDataModelLoaded() const {
+  return languageModel_.isLoaded();
+}
 
 void McBopomofoLM::loadAssociatedPhrasesV2(const char* associatedPhrasesPath) {
   if (associatedPhrasesPath) {
@@ -64,6 +66,10 @@ void McBopomofoLM::loadUserPhrases(const char* userPhrasesDataPath,
   }
 }
 
+bool McBopomofoLM::isAssociatedPhrasesV2Loaded() const {
+  return associatedPhrasesV2_.isLoaded();
+}
+
 void McBopomofoLM::loadPhraseReplacementMap(const char* phraseReplacementPath) {
   if (phraseReplacementPath) {
     phraseReplacement_.close();

src/Engine/McBopomofoLM.h

@@ -67,11 +67,13 @@ class McBopomofoLM : public Formosa::Gramambular2::LanguageModel {
   // Loads (or reloads, if already loaded) the primary language model data file.
   void loadLanguageModel(const char* languageModelDataPath);
 
-  bool isDataModelLoaded();
+  bool isDataModelLoaded() const;
 
   // Loads (or reloads if already loaded) the associated phrases data file.
   void loadAssociatedPhrasesV2(const char* associatedPhrasesPath);
 
+  bool isAssociatedPhrasesV2Loaded() const;
+
   // Loads (or reloads if already loaded) both the user phrases and the excluded
   // phrases files. If one argument is passed a nullptr, that file will not
   // be loaded or reloaded.

src/Engine/ParselessLM.cpp

@@ -34,7 +34,7 @@
 
 namespace McBopomofo {
 
-bool ParselessLM::isLoaded() { return mmapedFile_.data() != nullptr; }
+bool ParselessLM::isLoaded() const { return db_ != nullptr; }
 
 bool ParselessLM::open(const char* path) {
   if (!mmapedFile_.open(path)) {

src/Engine/ParselessLM.h

@@ -42,7 +42,7 @@ class ParselessLM : public Formosa::Gramambular2::LanguageModel {
   ParselessLM& operator=(const ParselessLM&) = delete;
   ParselessLM& operator=(ParselessLM&&) = delete;
 
-  bool isLoaded();
+  bool isLoaded() const;
   bool open(const char* path);
   void close();
 

src/KeyHandler.h

@@ -235,9 +235,9 @@ class KeyHandler {
   // contain the prefix. This allows the following two scenarios:
   //
   // (1) the current walk is 得 and we want to pin the phrase 得到; in this
-  // case,
-  //     the prefixReading is ㄉㄜˊ and prefixValue is 得, and the associated
-  //     phrase's reading and value are ㄉㄜˊ-ㄉㄠˋ and 得到 respectively.
+  //     case, the prefixReading is ㄉㄜˊ and prefixValue is 得, and the
+  //     associated phrase's reading and value are ㄉㄜˊ-ㄉㄠˋ and 得到
+  //     respectively.
   // (2) the current walk is 得 but we want to pin the phrase 德性, coming from
   //     the choosing-candidate state; in this case, the prefix reading and
   //     value is now ㄉㄜˊ and 德, and the associated phrase is ㄉㄜˊ-ㄒㄧㄥˋ