Index: chrome/third_party/hunspell/src/hunspell/hashmgr.hxx |
=================================================================== |
--- chrome/third_party/hunspell/src/hunspell/hashmgr.hxx (revision 21721) |
+++ chrome/third_party/hunspell/src/hunspell/hashmgr.hxx (working copy) |
@@ -1,8 +1,14 @@ |
#ifndef _HASHMGR_HXX_ |
#define _HASHMGR_HXX_ |
+#ifndef MOZILLA_CLIENT |
#include <cstdio> |
+#else |
+#include <stdio.h> |
+#endif |
+ |
#include "htypes.hxx" |
+#include "filemgr.hxx" |
#ifdef HUNSPELL_CHROME_CLIENT |
#include <string> |
@@ -23,20 +29,25 @@ |
std::map<StringPiece, int> custom_word_to_affix_id_map_; |
std::vector<std::string*> pointer_to_strings_; |
#endif |
- int tablesize; |
- struct hentry * tableptr; |
- int userword; |
- flag flag_mode; |
- int complexprefixes; |
- int utf8; |
- char * ignorechars; |
- unsigned short * ignorechars_utf16; |
- int ignorechars_utf16_len; |
- int numaliasf; // flag vector `compression' with aliases |
- unsigned short ** aliasf; |
- unsigned short * aliasflen; |
- int numaliasm; // morphological desciption `compression' with aliases |
- char ** aliasm; |
+ int tablesize; |
+ struct hentry ** tableptr; |
+ int userword; |
+ flag flag_mode; |
+ int complexprefixes; |
+ int utf8; |
+ unsigned short forbiddenword; |
+ int langnum; |
+ char * enc; |
+ char * lang; |
+ struct cs_info * csconv; |
+ char * ignorechars; |
+ unsigned short * ignorechars_utf16; |
+ int ignorechars_utf16_len; |
+ int numaliasf; // flag vector `compression' with aliases |
+ unsigned short ** aliasf; |
+ unsigned short * aliasflen; |
+ int numaliasm; // morphological desciption `compression' with aliases |
+ char ** aliasm; |
public: |
@@ -55,7 +66,7 @@ |
// This function allows that cache to be emptied and not grow infinitely. |
void EmptyHentryCache(); |
#else |
- HashMgr(FILE* t_handle, FILE* a_handle); |
+ HashMgr(FILE* t_handle, FILE* a_handle, const char * key); |
#endif |
~HashMgr(); |
@@ -63,22 +74,22 @@ |
int hash(const char *) const; |
struct hentry * walk_hashtable(int & col, struct hentry * hp) const; |
- int put_word(const char * word, int wl, char * ap); |
- int put_word_pattern(const char * word, int wl, const char * pattern); |
+ int add(const char * word); |
+ int add_with_affix(const char * word, const char * pattern); |
+ int remove(const char * word); |
int decode_flags(unsigned short ** result, char * flags); |
unsigned short decode_flag(const char * flag); |
char * encode_flag(unsigned short flag); |
int is_aliasf(); |
int get_aliasf(int index, unsigned short ** fvec); |
-#ifdef HUNSPELL_EXPERIMENTAL |
int is_aliasm(); |
char * get_aliasm(int index); |
-#endif |
- |
private: |
- int load_tables(FILE* t_handle); |
- int add_word(const char * word, int wl, unsigned short * ap, int al, const char * desc); |
+ int get_clen_and_captype(const char * word, int wbl, int * captype); |
+ int load_tables(FILE* t_handle, const char * key); |
+ int add_word(const char * word, int wbl, int wcl, unsigned short * ap, |
+ int al, const char * desc, bool onlyupcase); |
#ifdef HUNSPELL_CHROME_CLIENT |
int load_config(); |
@@ -96,13 +107,14 @@ |
HEntryCache hentry_cache; |
#else |
- int load_config(FILE* aff_handle); |
+ int load_config(FILE* aff_handle, const char * key); |
int parse_aliasf(char * line, FILE * af); |
#endif |
-#ifdef HUNSPELL_EXPERIMENTAL |
- int parse_aliasm(char * line, FILE * af); |
-#endif |
+ int add_hidden_capitalized_word(char * word, int wbl, int wcl, |
+ unsigned short * flags, int al, char * dp, int captype); |
+ int parse_aliasm(char * line, FileMgr * af); |
+ int remove_forbidden_flag(const char * word); |
}; |
Property changes on: chrome\third_party\hunspell\src\hunspell\hashmgr.hxx |
___________________________________________________________________ |
Added: svn:eol-style |
+ LF |