Index: chrome/third_party/hunspell/src/hunspell/atypes.hxx |
=================================================================== |
--- chrome/third_party/hunspell/src/hunspell/atypes.hxx (revision 21721) |
+++ chrome/third_party/hunspell/src/hunspell/atypes.hxx (working copy) |
@@ -5,27 +5,28 @@ |
#ifdef HUNSPELL_WARNING_ON |
#define HUNSPELL_WARNING fprintf |
#else |
-#define HUNSPELL_WARNING |
+// empty inline function to switch off warnings (instead of the C99 standard variadic macros) |
+static inline void HUNSPELL_WARNING(FILE *, const char *, ...) {} |
#endif |
#endif |
// HUNSTEM def. |
#define HUNSTEM |
-#include "csutil.hxx" |
#include "hashmgr.hxx" |
+#include "w_char.hxx" |
#define SETSIZE 256 |
#define CONTSIZE 65536 |
#define MAXWORDLEN 100 |
-#define MAXWORDUTF8LEN (MAXWORDLEN * 4) |
+#define MAXWORDUTF8LEN 256 |
// affentry options |
#define aeXPRODUCT (1 << 0) |
#define aeUTF8 (1 << 1) |
#define aeALIASF (1 << 2) |
#define aeALIASM (1 << 3) |
-#define aeINFIX (1 << 4) |
+#define aeLONGCOND (1 << 4) |
// compound options |
#define IN_CPD_NOT 0 |
@@ -33,10 +34,12 @@ |
#define IN_CPD_END 2 |
#define IN_CPD_OTHER 3 |
-#define MAXLNLEN 8192 * 4 |
+#define MAXLNLEN 8192 |
#define MINCPDLEN 3 |
#define MAXCOMPOUND 10 |
+#define MAXCONDLEN 20 |
+#define MAXCONDLEN_1 (MAXCONDLEN - sizeof(char *)) |
#define MAXACC 1000 |
@@ -55,26 +58,22 @@ |
char numconds; |
char opts; |
unsigned short aflag; |
- union { |
- char base[SETSIZE]; |
- struct { |
- char ascii[SETSIZE/2]; |
- char neg[8]; |
- char all[8]; |
- w_char * wchars[8]; |
- int wlen[8]; |
- } utf8; |
- } conds; |
-#ifdef HUNSPELL_EXPERIMENTAL |
- char * morphcode; |
-#endif |
unsigned short * contclass; |
short contclasslen; |
+ union { |
+ char conds[MAXCONDLEN]; |
+ struct { |
+ char conds1[MAXCONDLEN_1]; |
+ char * conds2; |
+ } l; |
+ } c; |
+ char * morphcode; |
}; |
-struct replentry { |
- char * pattern; |
- char * pattern2; |
+struct guessword { |
+ char * word; |
+ bool allow; |
+ char * orig; |
}; |
struct mapentry { |
@@ -88,14 +87,12 @@ |
int len; |
}; |
-struct guessword { |
- char * word; |
- bool allow; |
+struct patentry { |
+ char * pattern; |
+ char * pattern2; |
+ char * pattern3; |
+ FLAG cond; |
+ FLAG cond2; |
}; |
#endif |
- |
- |
- |
- |
- |
Property changes on: chrome\third_party\hunspell\src\hunspell\atypes.hxx |
___________________________________________________________________ |
Added: svn:eol-style |
+ LF |