Support default values for complex objects in mojom.

mojo/public/bindings/pylib/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 82 matching lines @@
                    | """
     if len(p) > 1:
       p[0] = ListFromConcat(p[1], p[2])
 
   def p_field(self, p):
     """field : typename NAME default ordinal SEMI"""
     p[0] = ('FIELD', p[1], p[2], p[4], p[3])
 
   def p_default(self, p):
     """default : EQUALS expression
-               | EQUALS expression_array
+               | EQUALS expression_object
                | """
     if len(p) > 2:
       p[0] = p[2]
 
   def p_interface(self, p):
     """interface : attribute_section INTERFACE NAME LBRACE interface_body \
                        RBRACE SEMI"""
     p[0] = ('INTERFACE', p[3], p[1], p[5])
 
   def p_interface_body(self, p):
@@ skipping 69 matching lines @@
   def p_enum_field(self, p):
     """enum_field : NAME
                   | NAME EQUALS expression"""
     if len(p) == 2:
       p[0] = ('ENUM_FIELD', p[1], None)
     else:
       p[0] = ('ENUM_FIELD', p[1], p[3])
 
   ### Expressions ###
 
+  def p_expression_object(self, p):
+    """expression_object : expression_array
+                         | LBRACE expression_object_elements RBRACE """
+    if len(p) < 3:
+      p[0] = p[1]
+    else:
+      p[0] = ('OBJECT', p[2])
+
+  def p_expression_object_elements(self, p):
+    """expression_object_elements : expression_object
+                                 | expression_object COMMA expression_object_elements
+                                 | """
+    if len(p) == 2:
+      p[0] = ListFromConcat(p[1])
+    elif len(p) > 3:
+      p[0] = ListFromConcat(p[1], p[3])
+
   def p_expression_array(self, p):
     """expression_array : expression
                         | LBRACKET expression_array_elements RBRACKET """
     if len(p) < 3:
       p[0] = p[1]
     else:
-      p[0] = p[2]
+      p[0] = ('ARRAY', p[2])
 
   def p_expression_array_elements(self, p):
-    """expression_array_elements : expression
-                                 | expression COMMA expression_array_elements
+    """expression_array_elements : expression_object
+                                 | expression_object COMMA expression_array_elements
                                  | """
     if len(p) == 2:
       p[0] = ListFromConcat(p[1])
     elif len(p) > 3:
       p[0] = ListFromConcat(p[1], p[3])
 
   def p_expression(self, p):
     """expression : conditional_expression"""
     p[0] = p[1]
 
@@ skipping 82 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()