Mojo: Mojom: Add AST type for struct fields.

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 49 matching lines @@
   return 'x:' + kind
 
 def _AttributeListToDict(attribute_list):
   if attribute_list is None:
     return {}
   assert isinstance(attribute_list, ast.AttributeList)
   # TODO(vtl): Check for duplicate keys here.
   return dict([(attribute.key, attribute.value)
                    for attribute in attribute_list])
 
-def _MapField(tree):
-  assert tree[3] is None or isinstance(tree[3], ast.Ordinal)
-  return {'name': tree[2],
-          'kind': _MapKind(tree[1]),
-          'ordinal': tree[3].value if tree[3] else None,
-          'default': tree[4]}
-
 def _MapMethod(tree):
   assert isinstance(tree[2], ast.ParameterList)
   assert tree[3] is None or isinstance(tree[3], ast.Ordinal)
   assert tree[4] is None or isinstance(tree[2], ast.ParameterList)
 
   def ParameterToDict(param):
     assert isinstance(param, ast.Parameter)
     return {'name': param.name,
             'kind': _MapKind(param.typename),
             'ordinal': param.ordinal.value if param.ordinal else None}
 
   method = {'name': tree[1],
             'parameters': map(ParameterToDict, tree[2]),
             'ordinal': tree[3].value if tree[3] else None}
   if tree[4]:
     method['response_parameters'] = map(ParameterToDict, tree[4])
   return method
 
 def _MapStruct(tree):
+  def StructFieldToDict(struct_field):
+    assert isinstance(struct_field, ast.StructField)
+    return {'name': struct_field.name,
+            'kind': _MapKind(struct_field.typename),
+            'ordinal': struct_field.ordinal.value \
+                if struct_field.ordinal else None,
+            'default': struct_field.default_value}
+
   struct = {}
   struct['name'] = tree[1]
   struct['attributes'] = _AttributeListToDict(tree[2])
-  struct['fields'] = _MapTreeForName(_MapField, tree[3], 'FIELD')
+  struct['fields'] = _MapTreeForType(StructFieldToDict, tree[3],
+                                     ast.StructField)
   struct['enums'] = _MapTreeForType(_MapEnum, tree[3], ast.Enum)
   struct['constants'] = _MapTreeForType(_MapConstant, tree[3], ast.Const)
   return struct
 
 def _MapInterface(tree):
   interface = {}
   interface['name'] = tree[1]
   interface['attributes'] = _AttributeListToDict(tree[2])
   interface['client'] = interface['attributes'].get('Client')
   interface['methods'] = _MapTreeForName(_MapMethod, tree[3], 'METHOD')
@@ skipping 36 matching lines @@
         _MapTreeForName(_MapInterface, tree.definition_list, 'INTERFACE')
     self.mojom['enums'] = \
         _MapTreeForType(_MapEnum, tree.definition_list, ast.Enum)
     self.mojom['constants'] = \
         _MapTreeForType(_MapConstant, tree.definition_list, ast.Const)
     return self.mojom
 
 
 def Translate(tree, name):
   return _MojomBuilder().Build(tree, name)