base/i18n: Make BreakIterator::IsWord() more readable.

base/i18n/break_iterator.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/i18n/break_iterator.h"
 
 #include "base/logging.h"
 #include "unicode/ubrk.h"
 #include "unicode/uchar.h"
 #include "unicode/ustring.h"
@@ skipping 53 matching lines @@
       pos = ubrk_next(static_cast<UBreakIterator*>(iter_));
       if (pos == UBRK_DONE) {
         pos_ = npos;
         return false;
       }
       pos_ = static_cast<size_t>(pos);
       return true;
     case BREAK_NEWLINE:
       do {
         pos = ubrk_next(static_cast<UBreakIterator*>(iter_));
-        if (pos == UBRK_DONE) {
+        if (pos == UBRK_DONE)
           break;
-        }
         pos_ = static_cast<size_t>(pos);
         status = ubrk_getRuleStatus(static_cast<UBreakIterator*>(iter_));
       } while (status >= UBRK_LINE_SOFT && status < UBRK_LINE_SOFT_LIMIT);
       if (pos == UBRK_DONE && prev_ == pos_) {
         pos_ = npos;
         return false;
       }
       return true;
     default:
       NOTREACHED() << "invalid break_type_";
       return false;
   }
 }
 
 bool BreakIterator::IsWord() const {
-  return (break_type_ == BREAK_WORD &&
-          ubrk_getRuleStatus(static_cast<UBreakIterator*>(iter_)) !=
-          UBRK_WORD_NONE);
+  int32_t status = ubrk_getRuleStatus(static_cast<UBreakIterator*>(iter_));
+  return (break_type_ == BREAK_WORD && status != UBRK_WORD_NONE);
 }
 
 string16 BreakIterator::GetString() const {
   DCHECK(prev_ != npos && pos_ != npos);
   return string_.substr(prev_, pos_ - prev_);
 }
 
 }  // namespace i18n
 }  // namespace base