Support all possible bitflags when computing the PSL DAFSA

net/tools/dafsa/make_dafsa.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 A Deterministic acyclic finite state automaton (DAFSA) is a compact
 representation of an unordered word list (dictionary).
 
 http://en.wikipedia.org/wiki/Deterministic_acyclic_finite_state_automaton
@@ skipping 430 matching lines @@
 def parse_gperf(infile):
   """Parses gperf file and extract strings and return code"""
   lines = [line.strip() for line in infile]
   # Extract strings after the first '%%' and before the second '%%'.
   begin = lines.index('%%') + 1
   end = lines.index('%%', begin)
   lines = lines[begin:end]
   for line in lines:
     if line[-3:-1] != ', ':
       raise InputError('Expected "domainname, <digit>", found "%s"' % line)
-    # Technically the DAFSA format could support return values in range [0-31],
-    # but the values below are the only with a defined meaning.
-    if line[-1] not in '0124':
-      raise InputError('Expected value to be one of {0,1,2,4}, found "%s"' %
+    # Technically the DAFSA format can support return values in the range
+    # [0-31], but only the first three bits have any defined meaning.
+    if line[-1] not in map(str, range(0, 7)):

[M-A Ruel, 2016/03/03 22:19:43]

That's an relatively expensive call to do at every single line. Replace the line
with:
if line.endswith(('0', '1', '2', '3', '4', '5', '6', '7')):

+      raise InputError('Expected value to be in the range of 0-7, found "%s"' %
                        line[-1])
   return [line[:-3] + line[-1] for line in lines]
 
 
 def main():
   if len(sys.argv) != 3:
     print('usage: %s infile outfile' % sys.argv[0])
     return 1
   with open(sys.argv[1], 'r') as infile, open(sys.argv[2], 'w') as outfile:
     outfile.write(words_to_cxx(parse_gperf(infile)))
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())