Extended java_cpp_enum to parse enums with set values

build/android/gyp/java_cpp_enum.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.
 
 import collections
 import re
 import optparse
 import os
@@ skipping 18 matching lines @@
     self._Validate()
     self._AssignEntryIndices()
     self._StripPrefix()
 
   def _Validate(self):
     assert self.class_name
     assert self.class_package
     assert self.entries
 
   def _AssignEntryIndices(self):
-    # Supporting the same set enum value assignments the compiler does is rather
-    # complicated, so we limit ourselves to these cases:
-    # - all the enum constants have values assigned,
-    # - enum constants reference other enum constants or have no value assigned.
-
+    # Enums, if given no value, are given the value of the previous enum + 1.
     if not all(self.entries.values()):
-      index = 0
+      prev_enum_value = -1
       for key, value in self.entries.iteritems():
         if not value:
-          self.entries[key] = index
-          index = index + 1
+          self.entries[key] = prev_enum_value + 1
         elif value in self.entries:
           self.entries[key] = self.entries[value]
         else:
-          raise Exception('You can only reference other enum constants unless '
-                          'you assign values to all of the constants.')
+          try:
+            self.entries[key] = int(value)
+          except ValueError:
+            raise Exception('Could not interpret integer from enum value "%s" '
+                            'for key %s.' % (value, key))
+        prev_enum_value = self.entries[key]
+
 
   def _StripPrefix(self):
     if not self.prefix_to_strip:
       prefix_to_strip = re.sub('(?!^)([A-Z]+)', r'_\1', self.class_name).upper()
       prefix_to_strip += '_'
       if not all([w.startswith(prefix_to_strip) for w in self.entries.keys()]):
         prefix_to_strip = ''
     else:
       prefix_to_strip = self.prefix_to_strip
     entries = ((k.replace(prefix_to_strip, '', 1), v) for (k, v) in
                self.entries.iteritems())
     self.entries = collections.OrderedDict(entries)
 
 class HeaderParser(object):
   single_line_comment_re = re.compile(r'\s*//')
   multi_line_comment_start_re = re.compile(r'\s*/\*')
   enum_start_re = re.compile(r'^\s*enum\s+(\w+)\s+{\s*$')
-  enum_line_re = re.compile(r'^\s*(\w+)(\s*\=\s*([^,\n]+))?,?\s*$')
+  enum_line_re = re.compile(r'^\s*(\w+)(\s*\=\s*([^,\n]+))?,?')
   enum_end_re = re.compile(r'^\s*}\s*;\s*$')
   generator_directive_re = re.compile(
       r'^\s*//\s+GENERATED_JAVA_(\w+)\s*:\s*([\.\w]+)$')
 
   def __init__(self, lines):
     self._lines = lines
     self._enum_definitions = []
     self._in_enum = False
     self._current_definition = None
     self._generator_directives = {}
@@ skipping 145 matching lines @@
 
   output_paths = DoGenerate(options, args)
 
   if options.assert_files_list:
     AssertFilesList(output_paths, options.assert_files_list)
 
   return " ".join(output_paths)
 
 if __name__ == '__main__':
   DoMain(sys.argv[1:])