Mojo: Mojom: Add AST types for methods, interface bodies, and interfaces.

mojo/public/tools/bindings/pylib/mojom_tests/parse/parser_unittest.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.
 
 import imp
 import os.path
 import sys
 import unittest
 
 # Disable lint check for finding modules:
@@ skipping 608 matching lines @@
         r" *int32\[abcdefg\] not_a_number;"):
       parser.Parse(source3, "my_file.mojom")
 
   def testValidMethod(self):
     """Tests parsing method declarations."""
 
     source1 = "interface MyInterface { MyMethod(int32 a); };"
     expected1 = ast.Mojom(
         None,
         ast.ImportList(),
-        [('INTERFACE',
-          'MyInterface',
-          None,
-          [('METHOD',
-            'MyMethod',
-            ast.ParameterList(ast.Parameter('a', None, 'int32')),
+        [ast.Interface(
+            'MyInterface',
             None,
-            None)])])
+            ast.InterfaceBody(
+                ast.Method(
+                    'MyMethod',
+                    None,
+                    ast.ParameterList(ast.Parameter('a', None, 'int32')),
+                    None)))])
     self.assertEquals(parser.Parse(source1, "my_file.mojom"), expected1)
 
     source2 = """\
         interface MyInterface {
           MyMethod1@0(int32 a@0, int64 b@1);
           MyMethod2@1() => ();
         };
         """
     expected2 = ast.Mojom(
         None,
         ast.ImportList(),
-        [('INTERFACE',
-          'MyInterface',
-          None,
-          [('METHOD',
-            'MyMethod1',
-            ast.ParameterList([ast.Parameter('a', ast.Ordinal(0), 'int32'),
-                               ast.Parameter('b', ast.Ordinal(1), 'int64')]),
-            ast.Ordinal(0),
-            None),
-           ('METHOD',
-            'MyMethod2',
-            ast.ParameterList(),
-            ast.Ordinal(1),
-            ast.ParameterList())])])
+        [ast.Interface(
+            'MyInterface',
+            None,
+            ast.InterfaceBody([
+                ast.Method(
+                    'MyMethod1',
+                    ast.Ordinal(0),
+                    ast.ParameterList([ast.Parameter('a', ast.Ordinal(0),
+                                                     'int32'),
+                                       ast.Parameter('b', ast.Ordinal(1),
+                                                     'int64')]),
+                    None),
+                 ast.Method(
+                    'MyMethod2',
+                    ast.Ordinal(1),
+                    ast.ParameterList(),
+                    ast.ParameterList())]))])
     self.assertEquals(parser.Parse(source2, "my_file.mojom"), expected2)
 
     source3 = """\
         interface MyInterface {
           MyMethod(string a) => (int32 a, bool b);
         };
         """
     expected3 = ast.Mojom(
         None,
         ast.ImportList(),
-        [('INTERFACE',
-          'MyInterface',
-          None,
-          [('METHOD',
-            'MyMethod',
-            ast.ParameterList(ast.Parameter('a', None, 'string')),
+        [ast.Interface(
+            'MyInterface',
             None,
-            ast.ParameterList([ast.Parameter('a', None, 'int32'),
-                               ast.Parameter('b', None, 'bool')]))])])
+            ast.InterfaceBody(
+                ast.Method(
+                    'MyMethod',
+                    None,
+                    ast.ParameterList(ast.Parameter('a', None, 'string')),
+                    ast.ParameterList([ast.Parameter('a', None, 'int32'),
+                                       ast.Parameter('b', None, 'bool')]))))])
     self.assertEquals(parser.Parse(source3, "my_file.mojom"), expected3)
 
   def testInvalidMethods(self):
     """Tests that invalid method declarations are correctly detected."""
 
     # No trailing commas.
     source1 = """\
         interface MyInterface {
           MyMethod(string a,);
         };
@@ skipping 137 matching lines @@
         """
     with self.assertRaisesRegexp(
         parser.ParseError,
         r"^my_file\.mojom:2: Error: Unexpected 'module':\n"
             r" *module {}$"):
       parser.Parse(source2, "my_file.mojom")
 
 
 if __name__ == "__main__":
   unittest.main()