Commit a4eb9289 authored by Hiroshi Sumita's avatar Hiroshi Sumita
Browse files

Fixed some bugs related to rest_text(). 

BUG=rest_text() returns incorrect value in some situation.
TEST=Manually tested with client code.

Review URL: https://codereview.appspot.com/5694088
parent fbbd9d27

src/PyZyBopomofoContext.cc

+3 −5
Original line number Diff line number Diff line
@@ -428,11 +428,9 @@ BopomofoContext::updatePreeditText (void) 
        }

    }



    if (edit_end_byte != 0) {

    m_preedit_text.selected_text = m_buffer.substr (0, edit_begin_byte);

    m_preedit_text.candidate_text = m_buffer.substr (edit_begin_byte, edit_end_byte - edit_begin_byte);

    m_preedit_text.rest_text = m_buffer.substr (edit_end_byte);

    }



    PhoneticContext::updatePreeditText ();

}

src/PyZyPinyinContext.cc

+6 −6
Original line number Diff line number Diff line
@@ -138,15 +138,15 @@ PinyinContext::updatePreeditText () 
            }

        }

        else {

            m_preedit_text.rest_text = textAfterPinyin ();

            edit_end_word = m_buffer.utf8Length ();

            edit_end_byte = m_buffer.size ();

            m_buffer << textAfterPinyin ();

        }

    }



    if (edit_end_byte != 0) {

    m_preedit_text.selected_text = m_buffer.substr (0, edit_begin_byte);

    m_preedit_text.candidate_text = m_buffer.substr (edit_begin_byte, edit_end_byte - edit_begin_byte);

    m_preedit_text.rest_text = m_buffer.substr (edit_end_byte);

    }



    PhoneticContext::updatePreeditText ();

}

src/PyZyString.h

+0 −5
Original line number Diff line number Diff line
@@ -115,11 +115,6 @@ public: 
        return appendPrintf ("%d", i);

    }



    String & operator<< (size_t i)

    {

        return appendPrintf("%zd", i);

    }



    String & operator<< (unsigned int i)

    {

        return appendPrintf ("%u", i);