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

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

This makes is possible to specify multi-line directives to the
generator. The primary motivation is to specify long package names
without violating the 80 column limit in C++.

BUG=None
TESTS=java_cpp_enum_tests.py
R=jbudorick@chromium.org

Committed: https://chromium.googlesource.com/chromium/src/+/528e46025bf28be9dc3eb6a8739b6b398903bb27

[mkosiba (inactive), 2015-01-09 16:07:48]

mkosiba@chromium.org changed reviewers:
+ jbudorick@chromium.org

[mkosiba (inactive), 2015-01-09 16:07:48]

PTAL

[mkosiba (inactive), 2015-01-09 16:10:23]

On 2015/01/09 16:07:48, mkosiba wrote:
> PTAL

FYI: The diff on out/Debug/gen/enums versus a copy I'd made before landing this
change is zero so this should be a very safe change :)

[mkosiba (inactive), 2015-01-09 16:10:23]

On 2015/01/09 16:07:48, mkosiba wrote:
> PTAL

FYI: The diff on out/Debug/gen/enums versus a copy I'd made before landing this
change is zero so this should be a very safe change :)

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

lgtm w/ nit?

https://codereview.chromium.org/841173006/diff/20001/build/android/gyp/java_c...
File build/android/gyp/java_cpp_enum.py (right):

https://codereview.chromium.org/841173006/diff/20001/build/android/gyp/java_c...
build/android/gyp/java_cpp_enum.py:183: enum_start =
HeaderParser.enum_start_re.match(line)
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:58]

https://codereview.chromium.org/841173006/diff/20001/build/android/gyp/java_c...
File build/android/gyp/java_cpp_enum.py (right):

https://codereview.chromium.org/841173006/diff/20001/build/android/gyp/java_c...
build/android/gyp/java_cpp_enum.py:183: enum_start =
HeaderParser.enum_start_re.match(line)
On 2015/01/09 16:39:17, jbudorick wrote:
> 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
>   ...
> 
> ?

Done.

[mkosiba (inactive), 2015-01-09 17:10:35]

The CQ bit was checked by mkosiba@chromium.org

[jbudorick, 2015-01-09 17:11:42]

https://codereview.chromium.org/841173006/diff/40001/build/android/gyp/java_c...
File build/android/gyp/java_cpp_enum.py (right):

https://codereview.chromium.org/841173006/diff/40001/build/android/gyp/java_c...
build/android/gyp/java_cpp_enum.py:161: if not self._in_enum:
elif? otherwise, this will wind up parsing a line twice if you're in multiline,
right?

[commit-bot: I haz the power, 2015-01-09 17:11:56]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/841173006/40001

[mkosiba (inactive), 2015-01-09 17:21:41]

The CQ bit was unchecked by mkosiba@chromium.org

[mkosiba (inactive), 2015-01-09 17:22:09]

The CQ bit was checked by mkosiba@chromium.org

[mkosiba (inactive), 2015-01-09 17:22:16]

https://codereview.chromium.org/841173006/diff/40001/build/android/gyp/java_c...
File build/android/gyp/java_cpp_enum.py (right):

https://codereview.chromium.org/841173006/diff/40001/build/android/gyp/java_c...
build/android/gyp/java_cpp_enum.py:161: if not self._in_enum:
On 2015/01/09 17:11:42, jbudorick wrote:
> elif? otherwise, this will wind up parsing a line twice if you're in
multiline,
> right?

aah, right! good spot. And none of the tests broke as the set of regexes in
these 2 functions is mutually exclusive..

[commit-bot: I haz the power, 2015-01-09 17:22:44]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/841173006/60001

[commit-bot: I haz the power, 2015-01-09 18:27:40]

Patchset 4 (id:??) landed as
https://crrev.com/528e46025bf28be9dc3eb6a8739b6b398903bb27
Cr-Commit-Position: refs/heads/master@{#310799}

[mkosiba (inactive), 2015-01-09 18:27:40]

Committed patchset #4 (id:60001) manually as
528e46025bf28be9dc3eb6a8739b6b398903bb27 (presubmit successful).