Index: chrome/third_party/hunspell/src/hunspell/suggestmgr.hxx |
=================================================================== |
--- chrome/third_party/hunspell/src/hunspell/suggestmgr.hxx (revision 21721) |
+++ chrome/third_party/hunspell/src/hunspell/suggestmgr.hxx (working copy) |
@@ -5,15 +5,18 @@ |
#define MAXSWUTF8L (MAXSWL * 4) |
#define MAX_ROOTS 100 |
#define MAX_WORDS 100 |
-#define MAX_GUESS 100 |
-#define MAXNGRAMSUGS 5 |
+#define MAX_GUESS 200 |
+#define MAXNGRAMSUGS 4 |
+#define MAXPHONSUGS 2 |
-#define MINTIMER 500 |
-#define MAXPLUSTIMER 500 |
+// timelimit: max ~1/4 sec (process time on Linux) for a time consuming function |
+#define TIMELIMIT (CLOCKS_PER_SEC >> 2) |
+#define MINTIMER 100 |
+#define MAXPLUSTIMER 100 |
-#define NGRAM_IGNORE_LENGTH 0 |
-#define NGRAM_LONGER_WORSE 1 |
-#define NGRAM_ANY_MISMATCH 2 |
+#define NGRAM_LONGER_WORSE (1 << 0) |
+#define NGRAM_ANY_MISMATCH (1 << 1) |
+#define NGRAM_LOWERING (1 << 2) |
#include "atypes.hxx" |
#include "affixmgr.hxx" |
@@ -25,6 +28,10 @@ |
class SuggestMgr |
{ |
+ char * ckey; |
+ int ckeyl; |
+ w_char * ckey_utf; |
+ |
char * ctry; |
int ctryl; |
w_char * ctry_utf; |
@@ -33,6 +40,7 @@ |
int maxSug; |
struct cs_info * csconv; |
int utf8; |
+ int langnum; |
int nosplitsugs; |
int maxngramsugs; |
int complexprefixes; |
@@ -42,19 +50,20 @@ |
SuggestMgr(const char * tryme, int maxn, AffixMgr *aptr); |
~SuggestMgr(); |
- int suggest(char*** slst, const char * word, int nsug); |
- int ngsuggest(char ** wlst, char * word, HashMgr* pHMgr); |
+ int suggest(char*** slst, const char * word, int nsug, int * onlycmpdsug); |
+ int ngsuggest(char ** wlst, char * word, int ns, HashMgr** pHMgr, int md); |
int suggest_auto(char*** slst, const char * word, int nsug); |
int suggest_stems(char*** slst, const char * word, int nsug); |
int suggest_pos_stems(char*** slst, const char * word, int nsug); |
char * suggest_morph(const char * word); |
+ char * suggest_gen(char ** pl, int pln, char * pattern); |
char * suggest_morph_for_spelling_error(const char * word); |
private: |
int testsug(char** wlst, const char * candidate, int wl, int ns, int cpdsuggest, |
- int * timer, time_t * timelimit); |
- int checkword(const char *, int, int, int *, time_t *); |
+ int * timer, clock_t * timelimit); |
+ int checkword(const char *, int, int, int *, clock_t *); |
int check_forbidden(const char *, int); |
int capchars(char **, const char *, int, int); |
@@ -65,6 +74,7 @@ |
int longswapchar(char **, const char *, int, int); |
int movechar(char **, const char *, int, int); |
int extrachar(char **, const char *, int, int); |
+ int badcharkey(char **, const char *, int, int); |
int badchar(char **, const char *, int, int); |
int twowords(char **, const char *, int, int); |
int fixstems(char **, const char *, int); |
@@ -73,21 +83,23 @@ |
int doubletwochars_utf(char**, const w_char *, int wl, int, int); |
int forgotchar_utf(char**, const w_char *, int wl, int, int); |
int extrachar_utf(char**, const w_char *, int wl, int, int); |
+ int badcharkey_utf(char **, const w_char *, int wl, int, int); |
int badchar_utf(char **, const w_char *, int wl, int, int); |
int swapchar_utf(char **, const w_char *, int wl, int, int); |
int longswapchar_utf(char **, const w_char *, int, int, int); |
int movechar_utf(char **, const w_char *, int, int, int); |
- int mapchars(char**, const char *, int); |
- int map_related(const char *, int, char ** wlst, int, const mapentry*, int, int *, time_t *); |
- int map_related_utf(w_char *, int, int, char ** wlst, int, const mapentry*, int, int *, time_t *); |
- int ngram(int n, char * s1, const char * s2, int uselen); |
+ int mapchars(char**, const char *, int, int); |
+ int map_related(const char *, int, char ** wlst, int, int, const mapentry*, int, int *, clock_t *); |
+ int map_related_utf(w_char *, int, int, int, char ** wlst, int, const mapentry*, int, int *, clock_t *); |
+ int ngram(int n, char * s1, const char * s2, int opt); |
int mystrlen(const char * word); |
- int equalfirstletter(char * s1, const char * s2); |
+ int leftcommonsubstring(char * s1, const char * s2); |
int commoncharacterpositions(char * s1, const char * s2, int * is_swap); |
- void bubblesort( char ** rwd, int * rsc, int n); |
+ void bubblesort( char ** rwd, char ** rwd2, int * rsc, int n); |
void lcs(const char * s, const char * s2, int * l1, int * l2, char ** result); |
int lcslen(const char * s, const char* s2); |
+ char * suggest_hentry_gen(hentry * rv, char * pattern); |
}; |
Property changes on: chrome\third_party\hunspell\src\hunspell\suggestmgr.hxx |
___________________________________________________________________ |
Added: svn:eol-style |
+ LF |