Mojo: Mojom: Make enum values only integers.

mojo/public/tools/bindings/pylib/mojom/parse/translate.py

 # 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.
 
 """Translates parse tree to Mojom IR."""
 
 
 import ast
 import re
 
@@ skipping 66 matching lines @@
             'kind': _MapKind(param.typename),
             'ordinal': param.ordinal.value}
 
   method = {'name': tree[1],
             'parameters': map(ParameterToDict, tree[2]),
             'ordinal': tree[3].value}
   if tree[4]:
     method['response_parameters'] = map(ParameterToDict, tree[4])
   return method
 
-def _MapEnumField(tree):
-  return {'name': tree[1],
-          'value': tree[2]}
-
 def _MapStruct(tree):
   struct = {}
   struct['name'] = tree[1]
   struct['attributes'] = _AttributeListToDict(tree[2])
   struct['fields'] = _MapTree(_MapField, tree[3], 'FIELD')
   struct['enums'] = _MapTree(_MapEnum, tree[3], 'ENUM')
   struct['constants'] = _MapTree(_MapConstant, tree[3], 'CONST')
   return struct
 
 def _MapInterface(tree):
   interface = {}
   interface['name'] = tree[1]
   interface['attributes'] = _AttributeListToDict(tree[2])
   interface['client'] = interface['attributes'].get('Client')
   interface['methods'] = _MapTree(_MapMethod, tree[3], 'METHOD')
   interface['enums'] = _MapTree(_MapEnum, tree[3], 'ENUM')
   interface['constants'] = _MapTree(_MapConstant, tree[3], 'CONST')
   return interface
 
 def _MapEnum(tree):
+  def MapEnumField(tree):
+    return {'name': tree[1],
+            'value': tree[2]}
+
   enum = {}
   enum['name'] = tree[1]
-  enum['fields'] = _MapTree(_MapEnumField, tree[2], 'ENUM_FIELD')
+  enum['fields'] = _MapTree(MapEnumField, tree[2], 'ENUM_VALUE')
   return enum
 
 def _MapConstant(tree):
   constant = {}
   constant['name'] = tree[2]
   constant['kind'] = _MapKind(tree[1])
   constant['value'] = tree[3]
   return constant
 
 def _MapModule(tree, name):
@@ skipping 21 matching lines @@
     modules = [_MapModule(item, name) for item in tree if item[0] == 'MODULE']
     if len(modules) != 1:
       raise Exception('A mojom file must contain exactly 1 module.')
     self.mojom = modules[0]
     self.mojom['imports'] = _MapTree(_MapImport, tree, 'IMPORT')
     return self.mojom
 
 
 def Translate(tree, name):
   return _MojomBuilder().Build(tree, name)