commit a5d27a7b2289c98849516aea50c807f3e3a5914b
author Paul Wankadia <junyer@google.com> Mon Jul 05 19:52:16 2021 -0700
committer Paul Wankadia <junyer@google.com> Tue Jul 06 02:53:34 2021 +0000
tree 41e5a90cd39adc00aedbdf1c41d991bcf0cfbac5
parent d541d5abdb9dd8a8922228935f3000c265535518

Fix a couple of style nits.

Change-Id: Ic8c4f805bb7ea98441a62c51cf636a239ee8d882
Reviewed-on: https://code-review.googlesource.com/c/re2/+/58890
Reviewed-by: Paul Wankadia <junyer@google.com>

re2/prog.cc

diff --git a/re2/prog.cc b/re2/prog.cc
index e25a306..79325c2 100644
--- a/re2/prog.cc
+++ b/re2/prog.cc
@@ -983,7 +983,7 @@
       while (states[dnext] != nnext)
         ++dnext;
       dfa[b] |= static_cast<uint64_t>(dnext * 6) << (dcurr * 6);
-      // Convert ASCII letters to uppercase and record any extra transitions.
+      // Convert ASCII letters to uppercase and record the extra transitions.
       if ('a' <= b && b <= 'z') {
         b -= 'a' - 'A';
         dfa[b] |= static_cast<uint64_t>(dnext * 6) << (dcurr * 6);
@@ -1023,7 +1023,7 @@
     return NULL;
 
   uint64_t curr = 0;
-  const uint64_t kFinal = prefix_size_ * 6;
+  const uint64_t accept = prefix_size_ * 6;
 
   // At the time of writing, rough benchmarks on a Broadwell machine showed
   // that this unroll factor (i.e. eight) achieves a speedup factor of two.
@@ -1058,15 +1058,15 @@
       uint64_t curr6 = next6 >> (curr5 & 63);
       uint64_t curr7 = next7 >> (curr6 & 63);
 
-      if ((curr7 & 63) == kFinal) {
-        if ((curr0 & 63) == kFinal) return p+1-prefix_size_;
-        if ((curr1 & 63) == kFinal) return p+2-prefix_size_;
-        if ((curr2 & 63) == kFinal) return p+3-prefix_size_;
-        if ((curr3 & 63) == kFinal) return p+4-prefix_size_;
-        if ((curr4 & 63) == kFinal) return p+5-prefix_size_;
-        if ((curr5 & 63) == kFinal) return p+6-prefix_size_;
-        if ((curr6 & 63) == kFinal) return p+7-prefix_size_;
-        if ((curr7 & 63) == kFinal) return p+8-prefix_size_;
+      if ((curr7 & 63) == accept) {
+        if ((curr0 & 63) == accept) return p+1-prefix_size_;
+        if ((curr1 & 63) == accept) return p+2-prefix_size_;
+        if ((curr2 & 63) == accept) return p+3-prefix_size_;
+        if ((curr3 & 63) == accept) return p+4-prefix_size_;
+        if ((curr4 & 63) == accept) return p+5-prefix_size_;
+        if ((curr5 & 63) == accept) return p+6-prefix_size_;
+        if ((curr6 & 63) == accept) return p+7-prefix_size_;
+        if ((curr7 & 63) == accept) return p+8-prefix_size_;
       }
 
       curr = curr7;
@@ -1082,7 +1082,7 @@
     uint8_t b = *p++;
     uint64_t next = prefix_dfa_[b];
     curr = next >> (curr & 63);
-    if ((curr & 63) == kFinal)
+    if ((curr & 63) == accept)
       return p-prefix_size_;
   }
   return NULL;