From ec5a41aac76aed88d14bf653c5c33ecc14e55907 Mon Sep 17 00:00:00 2001
From: Peng Wu <alexepico@gmail.com>
Date: Sun, 22 Jan 2017 16:21:34 +0800
Subject: add const modifiers

---
 src/lookup/phonetic_lookup.h      | 16 ++++++++--------
 src/storage/phonetic_key_matrix.h |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/lookup/phonetic_lookup.h b/src/lookup/phonetic_lookup.h
index 50e5fbe..e21f9e2 100644
--- a/src/lookup/phonetic_lookup.h
+++ b/src/lookup/phonetic_lookup.h
@@ -466,8 +466,8 @@ protected:
 
 protected:
     /* saved varibles */
-    ForwardPhoneticConstraints m_constraints;
-    PhoneticKeyMatrix * m_matrix;
+    const ForwardPhoneticConstraints * m_constraints;
+    const PhoneticKeyMatrix * m_matrix;
 
     FacadeChewingTable2 * m_pinyin_table;
     FacadePhraseIndex * m_phrase_index;
@@ -485,7 +485,7 @@ protected:
             g_ptr_array_index(topresults, 0);
 
         const trellis_constraint_t * constraint = NULL;
-        assert(m_constraints.get_constraint(start, constraint));
+        assert(m_constraints->get_constraint(start, constraint));
 
         if (CONSTRAINT_ONESTEP == constraint->m_type) {
             return unigram_gen_next_step(start, constraint->m_constraint_step,
@@ -517,7 +517,7 @@ protected:
                         int start, int end,
                         PhraseIndexRanges ranges) {
         const trellis_constraint_t * constraint = NULL;
-        assert(m_constraints.get_constraint(start, constraint));
+        assert(m_constraints->get_constraint(start, constraint));
 
         bool found = false;
         BigramPhraseArray bigram_phrase_items = g_array_new
@@ -670,8 +670,8 @@ public:
 
 
     bool get_nbest_match(TokenVector prefixes,
-                         PhoneticKeyMatrix * matrix,
-                         ForwardPhoneticConstraints constraints,
+                         const PhoneticKeyMatrix * matrix,
+                         const ForwardPhoneticConstraints * constraints,
                          NBestMatchResults & results) {
         m_constraints = constraints;
         m_matrix = matrix;
@@ -702,7 +702,7 @@ public:
         /* begin the viterbi beam search. */
         for ( int i = 0; i < nstep - 1; ++i ){
             const trellis_constraint_t * cur_constraint = NULL;
-            assert(m_constraints.get_constraint(i, cur_constraint));
+            assert(m_constraints->get_constraint(i, cur_constraint));
 
             if (CONSTRAINT_NOSEARCH == cur_constraint->m_type)
                 continue;
@@ -733,7 +733,7 @@ public:
 
             for ( int m = i + 1; m < nstep; ++m ){
                 const trellis_constraint_t * next_constraint = NULL;
-                assert(m_constraints.get_constraint(m, next_constraint));
+                assert(m_constraints->get_constraint(m, next_constraint));
 
                 if (CONSTRAINT_NOSEARCH == next_constraint->m_type)
                     break;
diff --git a/src/storage/phonetic_key_matrix.h b/src/storage/phonetic_key_matrix.h
index ef6d749..62edf73 100644
--- a/src/storage/phonetic_key_matrix.h
+++ b/src/storage/phonetic_key_matrix.h
@@ -58,7 +58,7 @@ public:
         return true;
     }
 
-    size_t size() {
+    size_t size() const {
         return m_table_content->len;
     }
 
@@ -130,7 +130,7 @@ public:
         return m_keys.clear_all() && m_key_rests.clear_all();
     }
 
-    size_t size() {
+    size_t size() const {
         assert(m_keys.size() == m_key_rests.size());
         return m_keys.size();
     }
-- 
cgit