[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/34] maint: dfa: convert #if-MBS_SUPPORT (parse_bracket_exp, pa
From: |
Jim Meyering |
Subject: |
[PATCH 06/34] maint: dfa: convert #if-MBS_SUPPORT (parse_bracket_exp, part1) |
Date: |
Thu, 15 Sep 2011 12:27:49 +0200 |
From: Jim Meyering <address@hidden>
* src/dfa.c (parse_bracket_exp): Remove in-function #if MBS_SUPPORT.
---
src/dfa.c | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/dfa.c b/src/dfa.c
index 5b5ed93..1c6784f 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -876,8 +876,7 @@ parse_bracket_exp (void)
if (!pred)
dfaerror(_("invalid character class"));
-#if MBS_SUPPORT
- if (MB_CUR_MAX > 1 && !pred->single_byte_only)
+ if (MBS_SUPPORT && MB_CUR_MAX > 1 && !pred->single_byte_only)
{
/* Store the character class as wctype_t. */
wctype_t wt = wctype (class);
@@ -889,15 +888,13 @@ parse_bracket_exp (void)
work_mbc->nch_classes + 1);
work_mbc->ch_classes[work_mbc->nch_classes++] = wt;
}
-#endif
for (c2 = 0; c2 < NOTCHAR; ++c2)
if (pred->func(c2))
setbit_case_fold_c (c2, ccl);
}
-#if MBS_SUPPORT
- else if (c1 == '=' || c1 == '.')
+ else if (MBS_SUPPORT && (c1 == '=' || c1 == '.'))
{
char *elem;
MALLOC(elem, len + 1);
@@ -925,7 +922,6 @@ parse_bracket_exp (void)
work_mbc->coll_elems[work_mbc->ncoll_elems++] = elem;
}
}
-#endif
colon_warning_state |= 8;
/* Fetch new lookahead character. */
@@ -962,8 +958,7 @@ parse_bracket_exp (void)
&& (syntax_bits & RE_BACKSLASH_ESCAPE_IN_LISTS))
FETCH_WC(c2, wc2, _("unbalanced ["));
-#if MBS_SUPPORT
- if (MB_CUR_MAX > 1)
+ if (MBS_SUPPORT && MB_CUR_MAX > 1)
{
/* When case folding map a range, say [m-z] (or even [M-z])
to the pair of ranges, [m-z] [M-Z]. */
@@ -994,7 +989,6 @@ parse_bracket_exp (void)
#endif
}
else
-#endif
{
c1 = c;
if (case_fold)
--
1.7.7.rc0.362.g5a14
- [PATCH 04/34] maint: convert #if-MBS_SUPPORT (EGexecute), (continued)
- [PATCH 02/34] maint: convert #if-MBS_SUPPORT (Fcompile, etc.), Jim Meyering, 2011/09/15
- [PATCH 07/34] maint: dfa: convert #if-MBS_SUPPORT (dfafree), Jim Meyering, 2011/09/15
- [PATCH 09/34] maint: dfa: convert #if-MBS_SUPPORT (free_mbdata), Jim Meyering, 2011/09/15
- [PATCH 06/34] maint: dfa: convert #if-MBS_SUPPORT (parse_bracket_exp, part1),
Jim Meyering <=
- [PATCH 10/34] maint: dfa: convert #if-MBS_SUPPORT (dfaexec), Jim Meyering, 2011/09/15
- [PATCH 16/34] maint: dfa: convert #if-MBS_SUPPORT (copytoks), Jim Meyering, 2011/09/15
[PATCH 17/34] maint: dfa: convert #if-MBS_SUPPORT (dfaparse), Jim Meyering, 2011/09/15
[PATCH 14/34] maint: dfa: convert #if-MBS_SUPPORT (parse_bracket_exp), Jim Meyering, 2011/09/15
[PATCH 18/34] maint: dfa: convert #if-MBS_SUPPORT (state_index), Jim Meyering, 2011/09/15
[PATCH 28/34] maint: dfa: avoid in-function "#if MBS_SUPPORT" tests, Jim Meyering, 2011/09/15
[PATCH 03/34] maint: convert #if-MBS_SUPPORT (kwsincr_case), Jim Meyering, 2011/09/15