Android: convert kEnumName to ENUM_NAME in java_cpp_enum.py.

build/android/gyp/java_cpp_enum.py

Index: build/android/gyp/java_cpp_enum.py
diff --git a/build/android/gyp/java_cpp_enum.py b/build/android/gyp/java_cpp_enum.py
index 3cb70ce8cf17b4ed2c1f0895210fc1b88b6ea68d..8db79a95b0c760eb449a70fb07d2f034d3f6aaa7 100755
--- a/build/android/gyp/java_cpp_enum.py
+++ b/build/android/gyp/java_cpp_enum.py
@@ -54,6 +54,7 @@ class EnumDefinition(object):
     self._Validate()
     self._AssignEntryIndices()
     self._StripPrefix()
+    self._NormalizeNames()
 
   def _Validate(self):
     assert self.class_name
@@ -92,10 +93,10 @@ class EnumDefinition(object):
 
     def StripEntries(entries):
       ret = collections.OrderedDict()
-      for (k, v) in entries.iteritems():
+      for k, v in entries.iteritems():
         stripped_key = k.replace(prefix_to_strip, '', 1)
         if isinstance(v, basestring):
-          stripped_value = v.replace(prefix_to_strip, '', 1)
+          stripped_value = v.replace(prefix_to_strip, '')
         else:
           stripped_value = v
         ret[stripped_key] = stripped_value
@@ -105,6 +106,43 @@ class EnumDefinition(object):
     self.entries = StripEntries(self.entries)
     self.comments = StripEntries(self.comments)
 
+  def _NormalizeNames(self):
+    self.entries = _TransformKeys(self.entries, _KCamelToShouty)
+    self.comments = _TransformKeys(self.comments, _KCamelToShouty)
+
+
+def _TransformKeys(d, func):
+  """Normalize keys in |d| and update references to old keys in |d| values."""
+  normal_keys = {k: func(k) for k in d}
+  ret = collections.OrderedDict()
+  for k, v in d.iteritems():
+    if isinstance(v, basestring):

[agrieve, 2017/04/13 13:52:34]

nit: can you just mention in a comment here when things are a string vs. not.

[estevenson, 2017/04/13 14:11:14]

Done.

+      ret[normal_keys[k]] = reduce(

[agrieve, 2017/04/13 13:52:34]

nit: this is pretty hard to mentally grok (at least for me). Probably would be
easier to follow if written out as a loop.

[estevenson, 2017/04/13 14:11:13]

Done.

+          lambda x, y: x.replace(y, normal_keys[y]), normal_keys.keys(), v)
+    else:
+      ret[normal_keys[k]] = v
+  return ret
+
+
+def _KCamelToShouty(s):
+  """Convert |s| from kCamelCase or CamelCase to SHOUTY_CASE.
+
+  kFooBar -> FOO_BAR
+  FooBar -> FOO_BAR
+  FooBAR9 -> FOO_BAR9
+  FooBARBaz -> FOO_BAR_BAZ
+  """
+  if not re.match(r'^k?([A-Z][^A-Z]+|[A-Z0-9]+)+$', s):
+    return s
+  # Strip the leading k.
+  s = re.sub(r'^k', '', s)
+  # Add _ between title words and anything else.
+  s = re.sub(r'([^_])([A-Z][^A-Z_0-9]+)', r'\1_\2', s)
+  # Add _ between lower -> upper transitions.
+  s = re.sub(r'([^A-Z_0-9])([A-Z])', r'\1_\2', s)
+  return s.upper()
+
+
 class DirectiveSet(object):
   class_name_override_key = 'CLASS_NAME_OVERRIDE'
   enum_package_key = 'ENUM_PACKAGE'