Clean-up blink_idl_parser

third_party/WebKit/Source/bindings/scripts/blink_idl_parser.py

 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 185 matching lines @@
     #   p[0] = p[2]
     #
     # Numbering scheme for the rules is:
     # [1] for Web IDL spec (or additions in base parser)
     #     These should all be upstreamed to the base parser.
     # [b1] for Blink IDL changes (overrides Web IDL)
     # [b1.1] for Blink IDL additions, auxiliary rules for [b1]
     # Numbers are as per Candidate Recommendation 19 April 2012:
     # http://www.w3.org/TR/2012/CR-WebIDL-20120419/
 
-    # [3] Override action, since we distinguish callbacks
-    # FIXME: Upstream
-    def p_CallbackOrInterface(self, p):
-        """CallbackOrInterface : CALLBACK CallbackRestOrInterface
-                               | Interface"""
-        if len(p) > 2:
-            p[2].AddChildren(self.BuildTrue('CALLBACK'))
-            p[0] = p[2]
-        else:
-            p[0] = p[1]
-
     # [b27] Add strings, more 'Literal' productions
     # 'Literal's needed because integers and strings are both internally strings
     def p_ConstValue(self, p):
         """ConstValue : BooleanLiteral
                       | FloatLiteral
                       | IntegerLiteral
                       | StringLiteral
                       | null"""
         # Standard is (no 'string', fewer 'Literal's):
         # ConstValue : BooleanLiteral
@@ skipping 74 matching lines @@
     def p_ExtendedAttribute(self, p):
         """ExtendedAttribute : ExtendedAttributeNoArgs
                              | ExtendedAttributeArgList
                              | ExtendedAttributeIdent
                              | ExtendedAttributeIdentList
                              | ExtendedAttributeNamedArgList
                              | ExtendedAttributeStringLiteral
                              | ExtendedAttributeStringLiteralList"""
         p[0] = p[1]
 
-    # [70] Override base parser to remove non-standard sized array
-    # FIXME: Upstream
-    def p_TypeSuffix(self, p):
-        """TypeSuffix : '[' ']' TypeSuffix
-                      | '?' TypeSuffixStartingWithArray
-                      |"""
-        if len(p) == 4:
-            p[0] = self.BuildProduction('Array', p, 1, p[3])
-        elif len(p) == 3:
-            p[0] = ListFromConcat(self.BuildTrue('NULLABLE'), p[2])
-
     # Blink extension: Add support for string literal Extended Attribute values
     def p_ExtendedAttributeStringLiteral(self, p):
         """ExtendedAttributeStringLiteral : identifier '=' StringLiteral """
         def unwrap_string(ls):
             """Reach in and grab the string literal's "NAME"."""
             return ls[1].value
 
         value = self.BuildAttribute('VALUE', unwrap_string(p[3]))
         p[0] = self.BuildNamed('ExtAttribute', p, 1, value)
 
@@ skipping 88 matching lines @@
         return 1
     blink_idl_lexer.main(argv)
     # Important: rewrite_tables=True causes the cache file to be deleted if it
     # exists, thus making sure that PLY doesn't load it instead of regenerating
     # the parse table.
     parser = BlinkIDLParser(outputdir=outputdir, rewrite_tables=True)
 
 
 if __name__ == '__main__':
     sys.exit(main(sys.argv))