Bump dictionary versions to 3-0

chrome/tools/convert_dict/dic_reader.cc

 // Copyright (c) 2006-2008 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 "chrome/tools/convert_dict/dic_reader.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/file_util.h"
@@ skipping 99 matching lines @@
     // token. (It is attached to the first token if a word doesn't have affix
     // rules.)
     size_t word_tab_offset = utf8word.find('\t');
     if (word_tab_offset != std::string::npos)
       utf8word = utf8word.substr(0, word_tab_offset);
 
     WordSet::iterator found = word_set->find(utf8word);
     std::set<int> affix_vector;
     affix_vector.insert(affix_index);
 
-    if (found == word_set->end()) {
+    if (found == word_set->end())
       word_set->insert(std::make_pair(utf8word, affix_vector));
-    } else {
-      // The affixes of the delta file should override those in the
-      // dictionary file.
-      found->second.swap(affix_vector);
-    }
+    else
+      found->second.insert(affix_index);
   }
 
   return true;
 }
 
 }  // namespace
 
 DicReader::DicReader(const FilePath& path) {
   file_ = file_util::OpenFile(path, "r");
 
@@ skipping 26 matching lines @@
                        aff_reader->encoding(), true))
     return false;
 
   // Add words from the .dic_delta file to the word set, if it exists.
   // The first line is the first word to add. Word count line is not present.
   // NOTE: These additional words should be encoded as UTF-8.
   if (additional_words_file_ != NULL) {
     PopulateWordSet(&word_set, additional_words_file_, aff_reader, "dic delta",
                     "UTF-8", false);
   }
-
   // Make sure the words are sorted, they may be unsorted in the input.
   for (WordSet::iterator word = word_set.begin(); word != word_set.end();
        ++word) {
     std::vector<int> affixes;
     for (std::set<int>::iterator aff = word->second.begin();
          aff != word->second.end(); ++aff)
       affixes.push_back(*aff);
 
     // Double check that the affixes are sorted. This isn't strictly necessary
     // but it's nice for the file to have a fixed layout.
     std::sort(affixes.begin(), affixes.end());
+    std::reverse(affixes.begin(), affixes.end());
     words_.push_back(std::make_pair(word->first, affixes));
   }
 
   // Double-check that the words are sorted.
   std::sort(words_.begin(), words_.end());
   return true;
 }
 
 }  // namespace convert_dict