Update mojo sdk to rev 59145288bae55b0fce4276b017df6a1117bcf00f

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
 
 def _GetDirAbove(dirname):
   """Returns the directory "above" this file containing |dirname| (which must
   also be "above" this file)."""
   path = os.path.abspath(__file__)
   while True:
     path, tail = os.path.split(path)
     assert tail
     if tail == dirname:
       return path
 
 try:
   imp.find_module("ply")
 except ImportError:
-  sys.path.append(os.path.join(_GetDirAbove("mojo"), "third_party"))
+  sys.path.append(os.path.join(_GetDirAbove("public"), "public/third_party"))
 from ply import lex
 from ply import yacc
 
 from ..error import Error
 from . import ast
 from .lexer import Lexer
 
 
 _MAX_ORDINAL_VALUE = 0xffffffff
 _MAX_ARRAY_SIZE = 0xffffffff
@@ skipping 72 matching lines @@
     # 'eval' the literal to strip the quotes.
     # TODO(vtl): This eval is dubious. We should unquote/unescape ourselves.
     p[0] = ast.Import(eval(p[2]), filename=self.filename, lineno=p.lineno(2))
 
   def p_module(self, p):
     """module : attribute_section MODULE identifier_wrapped SEMI"""
     p[0] = ast.Module(p[3], p[1], filename=self.filename, lineno=p.lineno(2))
 
   def p_definition(self, p):
     """definition : struct
+                  | union
                   | interface
                   | enum
                   | const"""
     p[0] = p[1]
 
   def p_attribute_section_1(self, p):
     """attribute_section : """
     p[0] = None
 
   def p_attribute_section_2(self, p):
@@ skipping 39 matching lines @@
     """struct_body : struct_body const
                    | struct_body enum
                    | struct_body struct_field"""
     p[0] = p[1]
     p[0].Append(p[2])
 
   def p_struct_field(self, p):
     """struct_field : typename NAME ordinal default SEMI"""
     p[0] = ast.StructField(p[2], p[3], p[1], p[4])
 
+  def p_union(self, p):
+    """union : UNION NAME LBRACE union_body RBRACE SEMI"""
+    p[0] = ast.Union(p[2], p[4])
+
+  def p_union_body_1(self, p):
+    """union_body : """
+    p[0] = ast.UnionBody()
+
+  def p_union_body_2(self, p):
+    """union_body : union_body union_field"""
+    p[0] = p[1]
+    p[1].Append(p[2])
+
+  def p_union_field(self, p):
+    """union_field : typename NAME ordinal SEMI"""
+    p[0] = ast.UnionField(p[2], p[3], p[1])
+
   def p_default_1(self, p):
     """default : """
     p[0] = None
 
   def p_default_2(self, p):
     """default : EQUALS constant"""
     p[0] = p[2]
 
   def p_interface(self, p):
     """interface : attribute_section INTERFACE NAME LBRACE interface_body \
@@ skipping 199 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