Mojo: bindings generator: Add AST types for attributes and attribute lists.

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 33 matching lines @@
     typename = kind[0:lbracket]
     if typename.find('[') != -1:
       raise Exception("Fixed sized arrays of arrays not supported")
     return 'a' + kind[lbracket+1:-1] + ':' + _MapKind(typename)
   if kind.endswith('&'):
     return 'r:' + _MapKind(kind[0:-1])
   if kind in map_to_kind:
     return map_to_kind[kind]
   return 'x:' + kind
 
-def _MapAttributes(attributes):
-  if not attributes:
+def _AttributeListToDict(attribute_list):
+  if attribute_list is None:
     return {}
-  return dict([(attribute[1], attribute[2])
-               for attribute in attributes if attribute[0] == 'ATTRIBUTE'])
-
-def _GetAttribute(attributes, name):
-  out = None
-  if attributes:
-    for attribute in attributes:
-      if attribute[0] == 'ATTRIBUTE' and attribute[1] == name:
-        out = attribute[2]
-  return out
+  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 isinstance(tree[3], ast.Ordinal)
   return {'name': tree[2],
           'kind': _MapKind(tree[1]),
           'ordinal': tree[3].value,
           'default': tree[4]}
 
 def _MapMethod(tree):
   assert isinstance(tree[2], ast.ParameterList)
@@ skipping 13 matching lines @@
     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'] = _MapAttributes(tree[2])
+  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['client'] = _GetAttribute(tree[2], 'Client')
+  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):
   enum = {}
   enum['name'] = tree[1]
   enum['fields'] = _MapTree(_MapEnumField, tree[2], 'ENUM_FIELD')
   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):
   mojom = {}
   mojom['name'] = name
   mojom['namespace'] = tree[1]
-  mojom['attributes'] = _MapAttributes(tree[2])
+  mojom['attributes'] = _AttributeListToDict(tree[2])
   mojom['structs'] = _MapTree(_MapStruct, tree[3], 'STRUCT')
   mojom['interfaces'] = _MapTree(_MapInterface, tree[3], 'INTERFACE')
   mojom['enums'] = _MapTree(_MapEnum, tree[3], 'ENUM')
   mojom['constants'] = _MapTree(_MapConstant, tree[3], 'CONST')
   return mojom
 
 def _MapImport(tree):
   import_item = {}
   import_item['filename'] = tree[1]
   return import_item
 
 
 class _MojomBuilder(object):
   def __init__(self):
     self.mojom = {}
 
   def Build(self, tree, name):
     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)