[PATCH 15/34] maint: dfa: convert #if-MBS_SUPPORT (lex)

[Jim Meyering]

From: Jim Meyering <meyer...@redhat.com>

* src/dfa.c (lex): Use regular "if", not #if MBS_SUPPORT.'
---
 src/dfa.c |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/dfa.c b/src/dfa.c
index 5243b39..303fbda 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -1098,15 +1098,13 @@ lex (void)
      "if (backslash) ...".  */
   for (i = 0; i < 2; ++i)
     {
-#if MBS_SUPPORT
-      if (MB_CUR_MAX > 1)
+      if (MBS_SUPPORT && MB_CUR_MAX > 1)
         {
           FETCH_WC (c, wctok, NULL);
           if ((int)c == EOF)
             goto normal_char;
         }
       else
-#endif /* MBS_SUPPORT  */
         FETCH(c, NULL);

       switch (c)
@@ -1329,15 +1327,13 @@ lex (void)
         case '.':
           if (backslash)
             goto normal_char;
-#if MBS_SUPPORT
-          if (MB_CUR_MAX > 1)
+          if (MBS_SUPPORT && MB_CUR_MAX > 1)
             {
               /* In multibyte environment period must match with a single
                  character not a byte.  So we use ANYCHAR.  */
               laststart = 0;
               return lasttok = ANYCHAR;
             }
-#endif /* MBS_SUPPORT */
           zeroset(ccl);
           notset(ccl);
           if (!(syntax_bits & RE_DOT_NEWLINE))
@@ -1382,12 +1378,10 @@ lex (void)
         default:
         normal_char:
           laststart = 0;
-#if MBS_SUPPORT
           /* For multibyte character sets, folding is done in atom.  Always
              return WCHAR.  */
-          if (MB_CUR_MAX > 1)
+          if (MBS_SUPPORT && MB_CUR_MAX > 1)
             return lasttok = WCHAR;
-#endif

           if (case_fold && isalpha(c))
             {
@@ -3986,10 +3980,9 @@ dfamust (struct dfa *d)
               goto done;
             }
           else if (t >= CSET
-#if MBS_SUPPORT
+                   || !MBS_SUPPORT
                    || t == ANYCHAR
                    || t == MBCSET
-#endif /* MBS_SUPPORT */
                    )
             {
               /* easy enough */
-- 
1.7.7.rc0.362.g5a14