[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 12/34] maint: dfa: convert #if-MBS_SUPPORT (parse_bracket_exp)
From: |
Jim Meyering |
Subject: |
[PATCH 12/34] maint: dfa: convert #if-MBS_SUPPORT (parse_bracket_exp) |
Date: |
Thu, 15 Sep 2011 12:27:55 +0200 |
From: Jim Meyering <address@hidden>
* src/dfa.c (parse_bracket_exp): Use regular "if", not #if MBS_SUPPORT.
---
src/dfa.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/dfa.c b/src/dfa.c
index 1fba5f1..f99ee15 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -1063,21 +1063,17 @@ parse_bracket_exp (void)
if (colon_warning_state == 7)
dfawarn (_("character class syntax is [[:space:]], not [:space:]"));
-#if MBS_SUPPORT
- if (MB_CUR_MAX > 1)
+ if (MBS_SUPPORT && MB_CUR_MAX > 1)
{
static charclass zeroclass;
work_mbc->invert = invert;
work_mbc->cset = equal(ccl, zeroclass) ? -1 : charclass_index(ccl);
return MBCSET;
}
-#endif
if (invert)
{
-#if MBS_SUPPORT
- assert(MB_CUR_MAX == 1);
-#endif
+ assert(!MBS_SUPPORT || MB_CUR_MAX == 1);
notset(ccl);
if (syntax_bits & RE_HAT_LISTS_NOT_NEWLINE)
clrbit(eolbyte, ccl);
--
1.7.7.rc0.362.g5a14
- Re: [PATCH 16/34] maint: dfa: convert #if-MBS_SUPPORT (copytoks), (continued)
- [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
- [PATCH 33/34] maint: dfa: simplify multi-byte-related conditionals, Jim Meyering, 2011/09/15
- [PATCH 25/34] maint: remove #if MBS_SUPPORT around member declaration, Jim Meyering, 2011/09/15
- [PATCH 12/34] maint: dfa: convert #if-MBS_SUPPORT (parse_bracket_exp),
Jim Meyering <=
- [PATCH 23/34] tests: make fmbtest explain (to stderr, not log) why it is skipped, Jim Meyering, 2011/09/15
- [PATCH 31/34] tests: skip sjis-mb when dfa.c is compiled without MB support, Jim Meyering, 2011/09/15
- [PATCH 20/34] maint: dfa: convert #if-MBS_SUPPORT (dfastate), Jim Meyering, 2011/09/15
- [PATCH 24/34] maint: dfa: remove #if MBS_SUPPORT around struct definition, Jim Meyering, 2011/09/15