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 101 matching lines @@
     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()) {
       word_set->insert(std::make_pair(utf8word, affix_vector));
+    } else if (affix_index == 0) {
+      // If we have no affix, add the no-affix case to the affix-vector.
+      found->second.insert(affix_index);

[rpetterson, 2012/12/15 03:53:47]

I'm not sure I see how this fixes the issue where later affixes need to
overwrite affixes earlier in the same file?

[please use gerrit instead, 2012/12/15 04:19:14]

This fixes the following case:

Word/S                   # <--- affix_index = 1
Word                     # <--- affix_index = 0

The dictionary writer here expected the final set of affixes indexes to be [1,
0]. Without this line, unit test SpellCheckTest.SpellCheckText unit test fails
for a few languages.

The case that you fixed was the following:

Word/S                   # <--- affix_index = 1
Word/!                   # <--- affix_index = 2

We need the final set of affix indexes to be [2].

[please use gerrit instead, 2012/12/15 22:00:19]

Rlp: Let me investigate more into how convert_dict works and bdic, dic, aff file
formats.

     } else {
-      // The affixes of the delta file should override those in the
-      // dictionary file.
+      // The later added affixes should override the earlier added affixes. This
+      // is useful for overrding the affixes in dic file from dic_delta file,
+      // for example.
       found->second.swap(affix_vector);
     }
   }
 
   return true;
 }
 
 }  // namespace
 
 DicReader::DicReader(const FilePath& path) {
@@ skipping 49 matching lines @@
     std::sort(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