author | Michael Nestler <Michael.Nestler@Oracle.COM> |
Thu, 04 Sep 2014 15:13:31 -0700 | |
branch | s11-update |
changeset 3295 | adaecbad1033 |
parent 120 | ef1efc113f13 |
permissions | -rw-r--r-- |
120
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
1 |
diff -r -u sed-4.2.1.orig/lib/regcomp.c sed-4.2.1.patched/lib/regcomp.c |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
2 |
--- sed-4.2.1.orig/lib/regcomp.c Wed Jun 3 12:10:51 2009 |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
3 |
+++ sed-4.2.1.patched/lib/regcomp.c Mon Jul 27 11:09:06 2009 |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
4 |
@@ -32,8 +32,10 @@ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
5 |
static void free_workarea_compile (regex_t *preg); |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
6 |
static reg_errcode_t create_initial_state (re_dfa_t *dfa); |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
7 |
#ifdef RE_ENABLE_I18N |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
8 |
+#ifdef USE_UTF8_OPTIMIZATION |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
9 |
static void optimize_utf8 (re_dfa_t *dfa); |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
10 |
#endif |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
11 |
+#endif |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
12 |
static reg_errcode_t analyze (regex_t *preg); |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
13 |
static reg_errcode_t preorder (bin_tree_t *root, |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
14 |
reg_errcode_t (fn (void *, bin_tree_t *)), |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
15 |
@@ -642,7 +644,9 @@ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
16 |
} |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
17 |
re_free (dfa->state_table); |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
18 |
#ifdef RE_ENABLE_I18N |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
19 |
+#ifdef USE_UTF8_OPTIMIZATION |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
20 |
if (dfa->sb_char != utf8_sb_map) |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
21 |
+#endif |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
22 |
re_free (dfa->sb_char); |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
23 |
#endif |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
24 |
re_free (dfa->subexp_map); |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
25 |
@@ -823,10 +827,12 @@ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
26 |
goto re_compile_internal_free_return; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
27 |
|
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
28 |
#ifdef RE_ENABLE_I18N |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
29 |
+#ifdef USE_UTF8_OPTIMIZATION |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
30 |
/* If possible, do searching in single byte encoding to speed things up. */ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
31 |
if (dfa->is_utf8 && !(syntax & RE_ICASE) && preg->translate == NULL) |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
32 |
optimize_utf8 (dfa); |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
33 |
#endif |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
34 |
+#endif |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
35 |
|
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
36 |
/* Then create the initial state of the dfa. */ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
37 |
err = create_initial_state (dfa); |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
38 |
@@ -889,14 +895,18 @@ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
39 |
|
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
40 |
dfa->mb_cur_max = MB_CUR_MAX; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
41 |
#ifdef _LIBC |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
42 |
+#ifdef USE_UTF8_OPTIMIZATION |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
43 |
if (dfa->mb_cur_max == 6 |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
44 |
&& strcmp (_NL_CURRENT (LC_CTYPE, _NL_CTYPE_CODESET_NAME), "UTF-8") == 0) |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
45 |
dfa->is_utf8 = 1; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
46 |
+#endif /* USE_UTF8_OPTIMIZATION */ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
47 |
dfa->map_notascii = (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MAP_TO_NONASCII) |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
48 |
!= 0); |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
49 |
#else |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
50 |
+#ifdef USE_UTF8_OPTIMIZATION |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
51 |
if (strcmp (locale_charset (), "UTF-8") == 0) |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
52 |
dfa->is_utf8 = 1; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
53 |
+#endif /* USE_UTF8_OPTIMIZATION */ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
54 |
|
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
55 |
/* We check exhaustively in the loop below if this charset is a |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
56 |
superset of ASCII. */ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
57 |
@@ -906,9 +916,11 @@ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
58 |
#ifdef RE_ENABLE_I18N |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
59 |
if (dfa->mb_cur_max > 1) |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
60 |
{ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
61 |
+#ifdef USE_UTF8_OPTIMIZATION |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
62 |
if (dfa->is_utf8) |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
63 |
dfa->sb_char = (re_bitset_ptr_t) utf8_sb_map; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
64 |
else |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
65 |
+#endif /* USE_UTF8_OPTIMIZATION */ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
66 |
{ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
67 |
int i, j, ch; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
68 |
|
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
69 |
@@ -1128,7 +1140,9 @@ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
70 |
|
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
71 |
/* The search can be in single byte locale. */ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
72 |
dfa->mb_cur_max = 1; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
73 |
+#ifdef USE_UTF8_OPTIMIZATION |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
74 |
dfa->is_utf8 = 0; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
75 |
+#endif |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
76 |
dfa->has_mb_node = dfa->nbackref > 0 || has_period; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
77 |
} |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
78 |
#endif |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
79 |
diff -r -u sed-4.2.1.orig/lib/regex_internal.c sed-4.2.1.patched/lib/regex_internal.c |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
80 |
--- sed-4.2.1.orig/lib/regex_internal.c Wed Jun 3 12:10:51 2009 |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
81 |
+++ sed-4.2.1.patched/lib/regex_internal.c Mon Jul 27 10:52:30 2009 |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
82 |
@@ -181,7 +181,9 @@ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
83 |
pstr->icase = icase; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
84 |
pstr->mbs_allocated = (trans != NULL || icase); |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
85 |
pstr->mb_cur_max = dfa->mb_cur_max; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
86 |
+#ifdef USE_UTF8_OPTIMIZATION |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
87 |
pstr->is_utf8 = dfa->is_utf8; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
88 |
+#endif /* USE_UTF8_OPTIMIZATION */ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
89 |
pstr->map_notascii = dfa->map_notascii; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
90 |
pstr->stop = pstr->len; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
91 |
pstr->raw_stop = pstr->stop; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
92 |
@@ -707,6 +709,7 @@ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
93 |
Idx wcs_idx; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
94 |
wint_t wc = WEOF; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
95 |
|
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
96 |
+#ifdef USE_UTF8_OPTIMIZATION |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
97 |
if (pstr->is_utf8) |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
98 |
{ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
99 |
const unsigned char *raw, *p, *end; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
100 |
@@ -760,6 +763,7 @@ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
101 |
break; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
102 |
} |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
103 |
} |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
104 |
+#endif /* USE_UTF8_OPTIMIZATION */ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
105 |
|
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
106 |
if (wc == WEOF) |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
107 |
pstr->valid_len = re_string_skip_chars (pstr, idx, &wc) - idx; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
108 |
diff -r -u sed-4.2.1.orig/lib/regex_internal.h sed-4.2.1.patched/lib/regex_internal.h |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
109 |
--- sed-4.2.1.orig/lib/regex_internal.h Wed Jun 3 12:10:51 2009 |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
110 |
+++ sed-4.2.1.patched/lib/regex_internal.h Mon Jul 27 10:52:30 2009 |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
111 |
@@ -406,7 +406,9 @@ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
112 |
re_const_bitset_ptr_t word_char; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
113 |
/* true if REG_ICASE. */ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
114 |
unsigned char icase; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
115 |
+#ifdef USE_UTF8_OPTIMIZATION |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
116 |
unsigned char is_utf8; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
117 |
+#endif /* USE_UTF8_OPTIMIZATION */ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
118 |
unsigned char map_notascii; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
119 |
unsigned char mbs_allocated; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
120 |
unsigned char offsets_needed; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
121 |
@@ -690,7 +692,9 @@ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
122 |
a node which can accept multibyte character or multi character |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
123 |
collating element. */ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
124 |
unsigned int has_mb_node : 1; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
125 |
+#ifdef USE_UTF8_OPTIMIZATION |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
126 |
unsigned int is_utf8 : 1; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
127 |
+#endif /* USE_UTF8_OPTIMIZATION */ |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
128 |
unsigned int map_notascii : 1; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
129 |
unsigned int word_ops_used : 1; |
ef1efc113f13
7021528 move bison/gsed to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
130 |
int mb_cur_max; |