Add multi-line directives in the C++->Java enum generator.

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 106 matching lines @@
         DirectiveSet.prefix_to_strip_key)
 
 
 class HeaderParser(object):
   single_line_comment_re = re.compile(r'\s*//')
   multi_line_comment_start_re = re.compile(r'\s*/\*')
   enum_line_re = re.compile(r'^\s*(\w+)(\s*\=\s*([^,\n]+))?,?')
   enum_end_re = re.compile(r'^\s*}\s*;\.*$')
   generator_directive_re = re.compile(
       r'^\s*//\s+GENERATED_JAVA_(\w+)\s*:\s*([\.\w]+)$')
+  multi_line_generator_directive_start_re = re.compile(
+      r'^\s*//\s+GENERATED_JAVA_(\w+)\s*:\s*([\.\w]*)\\$')
+  multi_line_directive_continuation_re = re.compile(
+      r'^\s*//\s+([\.\w]+)\\$')
+  multi_line_directive_end_re = re.compile(
+      r'^\s*//\s+([\.\w]*)$')
 
   optional_class_or_struct_re = r'(class|struct)?'
   enum_name_re = r'(\w+)'
   optional_fixed_type_re = r'(\:\s*(\w+\s*\w+?))?'
   enum_start_re = re.compile(r'^\s*enum\s+' + optional_class_or_struct_re +
       '\s*' + enum_name_re + '\s*' + optional_fixed_type_re + '\s*{\s*$')
 
-  def __init__(self, lines):
+  def __init__(self, lines, path=None):
     self._lines = lines
+    self._path = path
     self._enum_definitions = []
     self._in_enum = False
     self._current_definition = None
     self._generator_directives = DirectiveSet()
+    self._multi_line_generator_directive = None
 
   def ParseDefinitions(self):
     for line in self._lines:
       self._ParseLine(line)
     return self._enum_definitions
 
   def _ParseLine(self, line):
     if not self._in_enum:
       self._ParseRegularLine(line)
     else:
       self._ParseEnumLine(line)
 
   def _ParseEnumLine(self, line):
     if HeaderParser.single_line_comment_re.match(line):
       return
     if HeaderParser.multi_line_comment_start_re.match(line):
-      raise Exception('Multi-line comments in enums are not supported.')
+      raise Exception('Multi-line comments in enums are not supported in ' +
+                      self._path)
     enum_end = HeaderParser.enum_end_re.match(line)
     enum_entry = HeaderParser.enum_line_re.match(line)
     if enum_end:
       self._ApplyGeneratorDirectives()
       self._current_definition.Finalize()
       self._enum_definitions.append(self._current_definition)
       self._in_enum = False
     elif enum_entry:
       enum_key = enum_entry.groups()[0]
       enum_value = enum_entry.groups()[2]
       self._current_definition.AppendEntry(enum_key, enum_value)
 
   def _ApplyGeneratorDirectives(self):
     self._generator_directives.UpdateDefinition(self._current_definition)
     self._generator_directives = DirectiveSet()
 
   def _ParseRegularLine(self, line):
     enum_start = HeaderParser.enum_start_re.match(line)

[jbudorick, 2015/01/09 16:39:17]

nit: you don't need to run these three regexes if you're in a multi-line
generator directive, right? could you do something like:

if self._multi_line_generator_directive:
  continuation_re.match
  end_re.match

  ...
else:
  emum_re.match
  generator_directive_re.match
  multi_line_generator_directive_start_re.match
  ...

?

[mkosiba (inactive), 2015/01/09 17:09:57]

Done.

     generator_directive = HeaderParser.generator_directive_re.match(line)
-    if enum_start:
+    multi_line_generator_directive_start = (
+        HeaderParser.multi_line_generator_directive_start_re.match(line))
+
+    if self._multi_line_generator_directive:
+      multi_line_directive_continuation = (
+          HeaderParser.multi_line_directive_continuation_re.match(line))
+      multi_line_directive_end = (
+          HeaderParser.multi_line_directive_end_re.match(line))
+
+      if multi_line_directive_continuation:
+        value_cont = multi_line_directive_continuation.groups()[0]
+        self._multi_line_generator_directive[1].append(value_cont)
+      elif multi_line_directive_end:
+        directive_name = self._multi_line_generator_directive[0]
+        directive_value = "".join(self._multi_line_generator_directive[1])
+        directive_value += multi_line_directive_end.groups()[0]
+        self._multi_line_generator_directive = None
+        self._generator_directives.Update(directive_name, directive_value)
+      else:
+        raise Exception('Malformed multi-line directive declaration in ' +
+                        self._path)
+    elif generator_directive:
+      directive_name = generator_directive.groups()[0]
+      directive_value = generator_directive.groups()[1]
+      self._generator_directives.Update(directive_name, directive_value)
+    elif multi_line_generator_directive_start:
+      directive_name = multi_line_generator_directive_start.groups()[0]
+      directive_value = multi_line_generator_directive_start.groups()[1]
+      self._multi_line_generator_directive = (directive_name, [directive_value])
+    elif enum_start:
       if self._generator_directives.empty:
         return
       self._current_definition = EnumDefinition(
           original_enum_name=enum_start.groups()[1],
           fixed_type=enum_start.groups()[3])
       self._in_enum = True
-    elif generator_directive:
-      directive_name = generator_directive.groups()[0]
-      directive_value = generator_directive.groups()[1]
-      self._generator_directives.Update(directive_name, directive_value)
-
 
 def GetScriptName():
   script_components = os.path.abspath(sys.argv[0]).split(os.path.sep)
   build_index = script_components.index('build')
   return os.sep.join(script_components[build_index:])
 
 
 def DoGenerate(options, source_paths):
   output_paths = []
   for source_path in source_paths:
     enum_definitions = DoParseHeaderFile(source_path)
     for enum_definition in enum_definitions:
       package_path = enum_definition.enum_package.replace('.', os.path.sep)
       file_name = enum_definition.class_name + '.java'
       output_path = os.path.join(options.output_dir, package_path, file_name)
       output_paths.append(output_path)
       if not options.print_output_only:
         build_utils.MakeDirectory(os.path.dirname(output_path))
         DoWriteOutput(source_path, output_path, enum_definition)
   return output_paths
 
 
 def DoParseHeaderFile(path):
   with open(path) as f:
-    return HeaderParser(f.readlines()).ParseDefinitions()
+    return HeaderParser(f.readlines(), path).ParseDefinitions()
 
 
 def GenerateOutput(source_path, enum_definition):
   template = Template("""
 // 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.
 
 // This file is autogenerated by
 //     ${SCRIPT_NAME}
@@ skipping 55 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:])