Merges our hunspell change to hunspell 1.2.10....

third_party/hunspell/src/hunspell/affixmgr.hxx

 #ifndef _AFFIXMGR_HXX_
 #define _AFFIXMGR_HXX_
 
 #include "hunvisapi.h"
 
 #include <stdio.h>
 
 #include "atypes.hxx"
 #include "baseaffix.hxx"
 #include "hashmgr.hxx"
 #include "phonet.hxx"
 #include "replist.hxx"
 
 // check flag duplication
 #define dupSFX        (1 << 0)
 #define dupPFX        (1 << 1)
 
 class PfxEntry;
 class SfxEntry;
 
+#ifdef HUNSPELL_CHROME_CLIENT
+
+#include <vector>
+
+// This class provides an implementation of the contclasses array in AffixMgr
+// that is normally a large static array. We should almost never need more than
+// 256 elements, so this class only allocates that much to start off with. If
+// elements higher than that are actually used, we'll automatically expand.
+class ContClasses {
+ public:
+  ContClasses() {
+    // Pre-allocate a buffer so that typically, we'll never have to resize.
+    EnsureSizeIs(256);
+  }
+
+  char& operator[](size_t index) {
+    EnsureSizeIs(index + 1);
+    return data[index];
+  }
+
+  void EnsureSizeIs(size_t new_size) {
+    if (data.size() >= new_size)
+      return;  // Nothing to do.
+
+    size_t old_size = data.size();
+    data.resize(new_size);
+    memset(&data[old_size], 0, new_size - old_size);
+  }
+
+  std::vector<char> data;
+};
+
+#endif  // HUNSPELL_CHROME_CLIENT
+
 class LIBHUNSPELL_DLL_EXPORTED AffixMgr
 {
 
   PfxEntry *          pStart[SETSIZE];
   SfxEntry *          sStart[SETSIZE];
   PfxEntry *          pFlag[SETSIZE];
   SfxEntry *          sFlag[SETSIZE];
   HashMgr *           pHMgr;
   HashMgr **          alldic;
   int *               maxdic;
@@ skipping 60 matching lines @@
   int                 langnum;
   FLAG                lemma_present;
   FLAG                circumfix;
   FLAG                onlyincompound;
   FLAG                keepcase;
   FLAG                substandard;
   int                 checksharps;
   int                 fullstrip;
 
   int                 havecontclass; // boolean variable
+#ifdef HUNSPELL_CHROME_CLIENT
+  ContClasses         contclasses;
+#else
   char                contclasses[CONTSIZE]; // flags of possible continuing classes (twofold affix)
+#endif
 
 public:
 
+#ifdef HUNSPELL_CHROME_CLIENT
+  AffixMgr(hunspell::BDictReader* reader, HashMgr** ptr, int * md);
+#else
   AffixMgr(const char * affpath, HashMgr** ptr, int * md,
     const char * key = NULL);
+#endif
   ~AffixMgr();
   struct hentry *     affix_check(const char * word, int len,
             const unsigned short needflag = (unsigned short) 0,
             char in_compound = IN_CPD_NOT);
   struct hentry *     prefix_check(const char * word, int len,
             char in_compound, const FLAG needflag = FLAG_NULL);
   inline int isSubset(const char * s1, const char * s2);
   struct hentry *     prefix_check_twosfx(const char * word, int len,
             char in_compound, const FLAG needflag = FLAG_NULL);
   inline int isRevSubset(const char * s1, const char * end_of_s2, int len);
@@ skipping 78 matching lines @@
   char *              get_suffixed(char ) const;
   int                 get_maxngramsugs() const;
   int                 get_nosplitsugs() const;
   int                 get_sugswithdots(void) const;
   FLAG                get_keepcase(void) const;
   int                 get_checksharps(void) const;
   char *              encode_flag(unsigned short aflag) const;
   int                 get_fullstrip() const;
 
 private:
+#ifdef HUNSPELL_CHROME_CLIENT
+  // Not owned by us, owned by the Hunspell object.
+  hunspell::BDictReader* bdict_reader;
+#endif
   int  parse_file(const char * affpath, const char * key);
   int  parse_flag(char * line, unsigned short * out, FileMgr * af);
   int  parse_num(char * line, int * out, FileMgr * af);
   int  parse_cpdsyllable(char * line, FileMgr * af);
   int  parse_reptable(char * line, FileMgr * af);
   int  parse_convtable(char * line, FileMgr * af, RepList ** rl, const char * keyword);
   int  parse_phonetable(char * line, FileMgr * af);
   int  parse_maptable(char * line, FileMgr * af);
   int  parse_breaktable(char * line, FileMgr * af);
   int  parse_checkcpdtable(char * line, FileMgr * af);
@@ skipping 11 matching lines @@
   PfxEntry * process_pfx_in_order(PfxEntry * ptr, PfxEntry * nptr);
   SfxEntry * process_sfx_in_order(SfxEntry * ptr, SfxEntry * nptr);
   int process_pfx_tree_to_list();
   int process_sfx_tree_to_list();
   int redundant_condition(char, char * strip, int stripl,
       const char * cond, int);
 };
 
 #endif