Move chrome.downloads out of experimental to dev

ppapi/generators/idl_parser.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """ Parser for PPAPI IDL """
 
 #
 # IDL Parser
 #
@@ skipping 203 matching lines @@
   # in turn are children of the file object created from the results of top.
   def p_top(self, p):
     """top : COMMENT COMMENT ext_attr_block top_list"""
 
     Copyright = self.BuildComment('Copyright', p, 1)
     Filedoc = self.BuildComment('Comment', p, 2)
 
     p[0] = ListFromConcat(Copyright, Filedoc, p[3], p[4])
     if self.parse_debug: DumpReduction('top', p)
 
+  def p_top_short(self, p):
+    """top : COMMENT ext_attr_block top_list"""
+    Copyright = self.BuildComment('Copyright', p, 1)
+    p[0] = ListFromConcat(Copyright, p[2], p[3])
+    if self.parse_debug: DumpReduction('top', p)
+
   # Build a list of top level items.
   def p_top_list(self, p):
     """top_list : callback_decl top_list
                 | describe_block top_list
                 | dictionary_block top_list
                 | enum_block top_list
                 | inline top_list
                 | interface_block top_list
                 | label_block top_list
                 | namespace top_list
@@ skipping 52 matching lines @@
     p[0] = "".join(p[1:])
 
 
 #
 # Dictionary
 #
 # A dictionary contains is a named list of optional and required members.
 #
   def p_dictionary_block(self, p):
     """dictionary_block : modifiers DICTIONARY SYMBOL '{' struct_list '}' ';'"""
-    p[0] = self.BuildNamed('Dictionary', p, 3, ListFromConcat(p[5]))
+    p[0] = self.BuildNamed('Dictionary', p, 3, ListFromConcat(p[1], p[5]))
 
 #
 # Callback
 #
 # A callback is essentially a single function declaration (outside of an
 # Interface).
 #
   def p_callback_decl(self, p):
     """callback_decl : modifiers CALLBACK SYMBOL '=' SYMBOL param_list ';'"""
     children = ListFromConcat(p[1], p[6])
@@ skipping 56 matching lines @@
     # If there are 5 tokens plus a return slot, this must be in the form
     # SYMBOL = SYMBOL (param_list) ext_attr_cont
     elif len(p) == 6:
       member = self.BuildNamed('Member', p, 3, [p[4]])
       p[0] = ListFromConcat(self.BuildAttribute(p[1], member), p[5])
     # Otherwise, this must be: SYMBOL ext_attr_cont
     else:
       p[0] = ListFromConcat(self.BuildAttribute(p[1], 'True'), p[2])
     if self.parse_debug: DumpReduction('ext_attribute_list', p)
 
+  def p_ext_attr_list_values(self, p):

[asargent_no_longer_on_chrome, 2012/06/12 19:08:16]

I don't see you reference this p_ext_attr_list_values (or any of the following
added ones) in a production that is reachable from the top level - do you still
need it?

[benjhayden, 2012/06/12 20:15:42]

p_ext_attr_list_values() extends |ext_attr_list|.
p_values() and p_symbols() are reachable from p_ext_attr_list_values().

+    """ext_attr_list : SYMBOL '=' '(' values ')' ext_attr_cont
+                     | SYMBOL '=' '(' symbols ')' ext_attr_cont"""
+    p[0] = ListFromConcat(self.BuildAttribute(p[1], p[4]), p[6])
+
+  def p_values(self, p):
+    """values : value values_cont"""
+    p[0] = ListFromConcat(p[1], p[2])
+
+  def p_symbols(self, p):
+    """symbols : SYMBOL symbols_cont"""
+    p[0] = ListFromConcat(p[1], p[2])
+
+  def p_symbols_cont(self, p):
+    """symbols_cont : ',' SYMBOL symbols_cont
+                    | """
+    if len(p) > 1: p[0] = ListFromConcat(p[2], p[3])
+
+  def p_values_cont(self, p):
+    """values_cont : ',' value values_cont
+                   | """
+    if len(p) > 1: p[0] = ListFromConcat(p[2], p[3])
+
   def p_ext_attr_cont(self, p):
     """ext_attr_cont : ',' ext_attr_list
                      |"""
     if len(p) > 1: p[0] = p[2]
     if self.parse_debug: DumpReduction('ext_attribute_cont', p)
 
   def p_ext_attr_func(self, p):
     """ext_attr_list : SYMBOL '(' attr_arg_list ')' ext_attr_cont"""
     p[0] = ListFromConcat(self.BuildAttribute(p[1] + '()', p[3]), p[5])
     if self.parse_debug: DumpReduction('attr_arg_func', p)
@@ skipping 111 matching lines @@
   def p_expression_symbol(self, p):
     "expression : SYMBOL"
     p[0] = p[1]
     if self.parse_debug: DumpReduction('expression_symbol', p)
 
   def p_expression_integer(self, p):
     "expression : integer"
     p[0] = p[1]
     if self.parse_debug: DumpReduction('expression_integer', p)
 
+  def p_expression_float(self, p):

[asargent_no_longer_on_chrome, 2012/06/12 19:08:16]

Do you still need this? I don't see any literal float values in your
downloads.idl file.

[benjhayden, 2012/06/12 20:15:42]

Done.

+    "expression : FLOAT"
+    p[0] = p[1]
+    if self.parse_debug: DumpReduction('expression_float', p)
+
 #
 # Array List
 #
 # Defined a list of array sizes (if any).
 #
   def p_arrays(self, p):
     """arrays : '[' ']' arrays
               | '[' integer ']' arrays
               | """
     # If there are 3 tokens plus a return slot it is an unsized array
@@ skipping 34 matching lines @@
     if len(p) > 3:
       args = ListFromConcat(p[2], p[3])
     else:
       args = []
     p[0] = self.BuildProduction('Callspec', p, 1, args)
     if self.parse_debug: DumpReduction('param_list', p)
 
   def p_param_item(self, p):
     """param_item : modifiers optional SYMBOL arrays identifier"""
     typeref = self.BuildAttribute('TYPEREF', p[3])
-    children = ListFromConcat(p[1],p[2], typeref, p[4])
+    children = ListFromConcat(p[1], p[2], typeref, p[4])
     p[0] = self.BuildNamed('Param', p, 5, children)
     if self.parse_debug: DumpReduction('param_item', p)
 
   def p_optional(self, p):
     """optional : OPTIONAL
                 | """
     if len(p) == 2:
       p[0] = self.BuildAttribute('OPTIONAL', True)
 
 
@@ skipping 548 matching lines @@
   ast = ParseFiles(filenames)
   errs = ast.GetProperty('ERRORS')
   if errs:
     ErrOut.Log('Found %d error(s).' % errs);
   InfoOut.Log("%d files processed." % len(filenames))
   return errs
 
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv[1:]))