Mojo: Mojom: Add AST type for struct fields.

mojo/public/tools/bindings/pylib/mojom/parse/ast.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.
 
 """Node classes for the AST for a Mojo IDL file."""
 
 # Note: For convenience of testing, you probably want to define __eq__() methods
 # for all node types; it's okay to be slightly lax (e.g., not compare filename
 # and lineno). You may also define __repr__() to help with analyzing test
 # failures, especially for more complex types.
@@ skipping 124 matching lines @@
     return super(Enum, self).__eq__(other) and \
            self.enum_value_list == other.enum_value_list
 
 
 class EnumValue(Definition):
   """Represents a definition of an enum value."""
 
   def __init__(self, name, value, **kwargs):
     # The optional value is either an int (which is current a string) or a
     # "wrapped identifier".
-    assert value is None or isinstance(value, str) or isinstance(value, tuple)
+    assert value is None or isinstance(value, (str, tuple))
     super(EnumValue, self).__init__(name, **kwargs)
     self.value = value
 
   def __eq__(self, other):
     return super(EnumValue, self).__eq__(other) and \
            self.value == other.value
 
 
 class EnumValueList(NodeListBase):
   """Represents a list of enum value definitions (i.e., the "body" of an enum
@@ skipping 70 matching lines @@
     self.value = value
 
   def __eq__(self, other):
     return super(Ordinal, self).__eq__(other) and \
            self.value == other.value
 
 
 class Parameter(NodeBase):
   """Represents a method request or response parameter."""
 
-  def __init__(self, typename, name, ordinal, **kwargs):
+  def __init__(self, name, ordinal, typename, **kwargs):
+    assert isinstance(name, str)
     assert ordinal is None or isinstance(ordinal, Ordinal)
+    assert isinstance(typename, str)
     super(Parameter, self).__init__(**kwargs)
-    self.typename = typename
     self.name = name
     self.ordinal = ordinal
+    self.typename = typename
 
   def __eq__(self, other):
     return super(Parameter, self).__eq__(other) and \
-           self.typename == other.typename and \
            self.name == other.name and \
-           self.ordinal == other.ordinal
+           self.ordinal == other.ordinal and \
+           self.typename == other.typename
 
 
 class ParameterList(NodeListBase):
   """Represents a list of (method request or response) parameters."""
 
   _list_item_type = Parameter
+
+
+class StructField(Definition):
+  """Represents a struct field definition."""
+
+  def __init__(self, name, ordinal, typename, default_value, **kwargs):
+    assert isinstance(name, str)
+    assert ordinal is None or isinstance(ordinal, Ordinal)
+    assert isinstance(typename, str)
+    # The optional default value is currently either a value as a string or a
+    # "wrapped identifier".
+    assert default_value is None or isinstance(default_value, (str, tuple))
+    super(StructField, self).__init__(name, **kwargs)
+    self.ordinal = ordinal
+    self.typename = typename
+    self.default_value = default_value
+
+  def __eq__(self, other):
+    return super(StructField, self).__eq__(other) and \
+           self.ordinal == other.ordinal and \
+           self.typename == other.typename and \
+           self.default_value == other.default_value