Move IDLs to 39 roll

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 267 matching lines @@
     # [b50] Allow optional trailing comma
     # Blink-only, marked as WONTFIX in Web IDL spec:
     # https://www.w3.org/Bugs/Public/show_bug.cgi?id=22156
     def p_ExtendedAttributes(self, p):
         """ExtendedAttributes : ',' ExtendedAttribute ExtendedAttributes
                               | ','
                               |"""
         if len(p) > 3:
             p[0] = ListFromConcat(p[2], p[3])
 
-    # [b51] Add ExtendedAttributeIdentAndOrIdent
+    # [b51] Add ExtendedAttributeStringLiteral and ExtendedAttributeStringLiteralList
     def p_ExtendedAttribute(self, p):
         """ExtendedAttribute : ExtendedAttributeNoArgs
                              | ExtendedAttributeArgList
                              | ExtendedAttributeIdent
                              | ExtendedAttributeIdentList
-                             | ExtendedAttributeStringLiteralList
-                             | ExtendedAttributeNamedArgList"""
+                             | ExtendedAttributeNamedArgList
+                             | ExtendedAttributeStringLiteral
+                             | ExtendedAttributeStringLiteralList"""
         p[0] = p[1]
 
     # [59]
     # FIXME: Upstream UnionType
     def p_UnionType(self, p):
         """UnionType : '(' UnionMemberType OR UnionMemberType UnionMemberTypes ')'"""
         members = ListFromConcat(p[2], p[4], p[5])
         p[0] = self.BuildProduction('UnionType', p, 1, members)
 
     # [60]
@@ skipping 20 matching lines @@
     # 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])
 
-    # [b94] Add support for OR Extended Attribute values "A|B"
-    def p_ExtendedAttributeIdentList(self, p):
-        """ExtendedAttributeIdentList : identifier '=' '(' IdentifierList ')'
-                                      | identifier '=' identifier '|' IdentOrList"""
-        if type(p[4]) is list:
-            value = self.BuildAttribute('VALUE', ','.join(p[4]))
-        else:
-            value = self.BuildAttribute('VALUE', p[3] + p[4] + p[5])
+    # 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)
 
-    # [b94.1] A|B|C
-    def p_IdentOrList(self, p):
-        """IdentOrList : identifier '|' IdentOrList
-                       | identifier"""
-        if len(p) > 3:
-            p[0] = p[1] + p[2] + p[3]
-        else:
-            p[0] = p[1]
-
-    # Blink extension: Add support for compound Extended Attribute values over string literals ("A"|"B")
+    # Blink extension: Add support for compound Extended Attribute values over string literals ("A","B")
     def p_ExtendedAttributeStringLiteralList(self, p):
-        """ExtendedAttributeStringLiteralList : identifier '=' StringLiteralOrList"""
-        value = self.BuildAttribute('VALUE', p[3])
+        """ExtendedAttributeStringLiteralList : identifier '=' '(' StringLiteralList ')' """
+        value = self.BuildAttribute('VALUE', p[4])
         p[0] = self.BuildNamed('ExtAttribute', p, 1, value)
 
     # Blink extension: one or more string literals. The values aren't propagated as literals,
     # but their by their value only.
-    def p_StringLiteralOrList(self, p):
-        """StringLiteralOrList : StringLiteral '|' StringLiteralOrList
-                               | StringLiteral"""
+    def p_StringLiteralList(self, p):
+        """StringLiteralList : StringLiteral ',' StringLiteralList
+                             | StringLiteral"""
         def unwrap_string(ls):
             """Reach in and grab the string literal's "NAME"."""
             return ls[1].value
 
         if len(p) > 3:
-            p[0] = unwrap_string(p[1]) + p[2] + p[3]
+            p[0] = ListFromConcat(unwrap_string(p[1]), p[3])
         else:
-            p[0] = unwrap_string(p[1])
+            p[0] = ListFromConcat(unwrap_string(p[1]))
 
     def __init__(self,
                  # common parameters
                  debug=False,
                  # local parameters
                  rewrite_tables=False,
                  # idl_parser parameters
                  lexer=None, verbose=False, mute_error=False,
                  # yacc parameters
                  outputdir='', optimize=True, write_tables=False,
@@ skipping 59 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))