Add support for enums within structs and interfaces to mojom.

mojo/public/bindings/parse/mojo_parser.py

 #!/usr/bin/env python
 # Copyright 2013 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 sys
 import os.path
@@ skipping 166 matching lines @@
       p[0] = ListFromConcat(p[1])
     elif len(p) > 3:
       p[0] = ListFromConcat(p[1], p[3])
 
   def p_attribute(self, p):
     """attribute : NAME EQUALS NUMBER
                  | NAME EQUALS NAME"""
     p[0] = ('ATTRIBUTE', p[1], p[3])
 
   def p_struct(self, p):
-    """struct : attribute_section STRUCT NAME LCURLY fields RCURLY SEMICOLON"""
+    """struct : attribute_section STRUCT NAME LCURLY struct_body RCURLY SEMICOLON"""
     p[0] = ('STRUCT', p[3], p[1], p[5])
 
-  def p_fields(self, p):
-    """fields : field fields
-              |"""
+  def p_struct_body(self, p):
+    """struct_body : field struct_body
+                   | enum struct_body
+                   |"""
     if len(p) > 1:
       p[0] = ListFromConcat(p[1], p[2])
 
   def p_field(self, p):
     """field : typename NAME ordinal SEMICOLON"""
     p[0] = ('FIELD', p[1], p[2], p[3])
 
   def p_interface(self, p):
-    """interface : attribute_section INTERFACE NAME LCURLY methods RCURLY SEMICOLON"""
+    """interface : attribute_section INTERFACE NAME LCURLY interface_body RCURLY SEMICOLON"""
     p[0] = ('INTERFACE', p[3], p[1], p[5])
 
-  def p_methods(self, p):
-    """methods : method methods
-               | """
+  def p_interface_body(self, p):
+    """interface_body : method interface_body
+                      | enum interface_body
+                      | """
     if len(p) > 1:
       p[0] = ListFromConcat(p[1], p[2])
 
   def p_method(self, p):
     """method : VOID NAME LPAREN parameters RPAREN ordinal SEMICOLON"""
     p[0] = ('METHOD', p[2], p[4], p[6])
 
   def p_parameters(self, p):
     """parameters : parameter
                   | parameter COMMA parameters
@@ skipping 79 matching lines @@
 def Main():
   if len(sys.argv) < 2:
     print("usage: %s filename" % (sys.argv[0]))
     sys.exit(1)
   tree = Parse(filename=sys.argv[1])
   print(tree)
 
 
 if __name__ == '__main__':
   Main()