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

mojo/public/tools/bindings/pylib/mojom/parse/parser.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.
 
 """Generates a syntax tree from a Mojo IDL file."""
 
 import imp
 import os.path
 import sys
 
@@ skipping 111 matching lines @@
                   | enum
                   | const"""
     p[0] = p[1]
 
   def p_attribute_section(self, p):
     """attribute_section : LBRACKET attribute_list RBRACKET
                          | """
     if len(p) > 3:
       p[0] = p[2]
 
-  def p_attribute_list(self, p):
-    """attribute_list : attribute
-                      | attribute COMMA attribute_list
-                      | """
-    if len(p) == 2:
-      p[0] = _ListFromConcat(p[1])
-    elif len(p) > 3:
-      p[0] = _ListFromConcat(p[1], p[3])
+  def p_attribute_list_1(self, p):
+    """attribute_list : """
+    p[0] = ast.AttributeList()
+
+  def p_attribute_list_2(self, p):
+    """attribute_list : nonempty_attribute_list"""
+    p[0] = p[1]
+
+  def p_nonempty_attribute_list_1(self, p):
+    """nonempty_attribute_list : attribute"""
+    p[0] = ast.AttributeList(p[1])
+
+  def p_nonempty_attribute_list_2(self, p):
+    """nonempty_attribute_list : nonempty_attribute_list COMMA attribute"""
+    p[0] = p[1]
+    p[0].Append(p[3])
 
   def p_attribute(self, p):
     """attribute : NAME EQUALS evaled_literal
                  | NAME EQUALS NAME"""
-    p[0] = ('ATTRIBUTE', p[1], p[3])
+    p[0] = ast.Attribute(p[1], p[3], filename=self.filename, lineno=p.lineno(1))
 
   def p_evaled_literal(self, p):
     """evaled_literal : literal"""
     # 'eval' the literal to strip the quotes.
     p[0] = eval(p[1])
 
   def p_struct(self, p):
     """struct : attribute_section STRUCT NAME LBRACE struct_body RBRACE SEMI"""
     p[0] = ('STRUCT', p[3], p[1], p[5])
 
@@ skipping 51 matching lines @@
     p[0] = ast.ParameterList(p[1])
 
   def p_nonempty_parameter_list_2(self, p):
     """nonempty_parameter_list : nonempty_parameter_list COMMA parameter"""
     p[0] = p[1]
     p[0].Append(p[3])
 
   def p_parameter(self, p):
     """parameter : typename NAME ordinal"""
     p[0] = ast.Parameter(p[1], p[2], p[3],
-                         filename=self.filename, lineno=p.lineno(1))
+                         filename=self.filename, lineno=p.lineno(2))
 
   def p_typename(self, p):
     """typename : basictypename
                 | array
                 | fixed_array
                 | interfacerequest"""
     p[0] = p[1]
 
   def p_basictypename(self, p):
     """basictypename : identifier
@@ skipping 121 matching lines @@
 
 def Parse(source, filename):
   lexer = Lexer(filename)
   parser = Parser(lexer, source, filename)
 
   lex.lex(object=lexer)
   yacc.yacc(module=parser, debug=0, write_tables=0)
 
   tree = yacc.parse(source)
   return tree