]> Savannah Git Hosting - gnulib.git/commitdiff
dfa: two small simplifications
authorJim Meyering <meyering@fb.com>
Sat, 20 May 2017 00:02:56 +0000 (17:02 -0700)
committerJim Meyering <meyering@fb.com>
Sat, 20 May 2017 00:02:56 +0000 (17:02 -0700)
* lib/dfa.c (build_state): Avoid repeating longer expressions.

ChangeLog
lib/dfa.c

index 807c8ed854874004139e99bdf92eb5b0fca48052..2ab6170b85a203190e872cfd1220d7ad0affb12d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-19  Jim Meyering  <meyering@fb.com>
+
+       dfa: two small simplifications
+       * lib/dfa.c (build_state): Avoid repeating longer expressions.
+
 2017-05-18  Jim Meyering  <meyering@fb.com>
 
        fallthrough: update for GCC 7/8
index e08e63a56e731454c6b8fd7b2b4df73fb7426b5e..2b9c80e705d27c39929dc3d1d4af1e80bd6e5b5c 100644 (file)
--- a/lib/dfa.c
+++ b/lib/dfa.c
@@ -2712,13 +2712,13 @@ build_state (state_num s, struct dfa *d, unsigned char uc)
       else if (d->tokens[pos.index] >= CSET)
         {
           matches = d->charclasses[d->tokens[pos.index] - CSET];
-          if (tstbit (uc, &d->charclasses[d->tokens[pos.index] - CSET]))
+          if (tstbit (uc, &matches))
             matched = true;
         }
       else if (d->tokens[pos.index] == ANYCHAR)
         {
           matches = d->charclasses[d->canychar];
-          if (tstbit (uc, &d->charclasses[d->canychar]))
+          if (tstbit (uc, &matches))
             matched = true;
 
           /* ANYCHAR must match with a single character, so we must put