IDL parser: Merge custom rules to the base parser

Upstream some rules in blink_idl_parser to idl_parser.

BUG=617899

Change-Id: Ib9c0e68b1e81ab41147e01c5281e3e7f8366999d
Reviewed-on: https://chromium-review.googlesource.com/544724Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Hitoshi Yoshida <peria@chromium.org>
Commit-Queue: Kenichi Ishibashi <bashi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#481790}

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

@@ -207,35 +207,6 @@ class BlinkIDLParser(IDLParser):
     # Numbers are as per Candidate Recommendation 19 April 2012:
     # http://www.w3.org/TR/2012/CR-WebIDL-20120419/
 
-    # [b47]
-    def p_ExceptionMember(self, p):
-        """ExceptionMember : Const
-                           | ExceptionField
-                           | Attribute
-                           | ExceptionOperation"""
-        # Standard is (no Attribute, no ExceptionOperation):
-        # ExceptionMember : Const
-        #                 | ExceptionField
-        # FIXME: In DOMException.idl, Attributes should be changed to
-        # ExceptionFields, and Attribute removed from this rule.
-        p[0] = p[1]
-
-    # [b47.1] FIXME: rename to ExceptionAttribute
-    def p_Attribute(self, p):
-        """Attribute : ReadOnly ATTRIBUTE Type identifier ';'"""
-        p[0] = self.BuildNamed('Attribute', p, 4,
-                               ListFromConcat(p[1], p[3]))
-
-    # [b47.2]
-    def p_ExceptionOperation(self, p):
-        """ExceptionOperation : Type identifier '(' ')' ';'"""
-        # Needed to handle one case in DOMException.idl:
-        # // Override in a Mozilla compatible format
-        # [NotEnumerable] DOMString toString();
-        # Limited form of Operation to prevent others from being added.
-        # FIXME: Should be a stringifier instead.
-        p[0] = self.BuildNamed('ExceptionOperation', p, 2, p[1])
-
     # Extended attributes
     # [b49] Override base parser: remove comment field, since comments stripped
     # FIXME: Upstream
@@ -262,52 +233,6 @@ class BlinkIDLParser(IDLParser):
         elif len(p) == 2:
             p[0] = self.BuildError(p, 'ExtendedAttributes')
 
-    # [b51] Add ExtendedAttributeStringLiteral and ExtendedAttributeStringLiteralList
-    def p_ExtendedAttribute(self, p):
-        """ExtendedAttribute : ExtendedAttributeNoArgs
-                             | ExtendedAttributeArgList
-                             | ExtendedAttributeIdent
-                             | ExtendedAttributeIdentList
-                             | ExtendedAttributeNamedArgList
-                             | ExtendedAttributeStringLiteral
-                             | ExtendedAttributeStringLiteralList"""
-        p[0] = p[1]
-
-    # 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)
-
-    # Blink extension: Add support for compound Extended Attribute values over string literals ("A","B")
-    def p_ExtendedAttributeStringLiteralList(self, p):
-        """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_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] = ListFromConcat(unwrap_string(p[1]), p[3])
-        else:
-            p[0] = ListFromConcat(unwrap_string(p[1]))
-
-    def p_StringLiteral(self, p):
-        """StringLiteral : string"""
-        p[0] = ListFromConcat(self.BuildAttribute('TYPE', 'DOMString'),
-                              self.BuildAttribute('NAME', p[1]))
-
     def __init__(self,
                  # common parameters
                  debug=False,

tools/idl_parser/idl_parser.py

@@ -718,22 +718,39 @@ class IDLParser(object):
       p[0] = self.BuildNamed('Argument', p, 1)
       p[0].AddChildren(self.BuildTrue('ELLIPSIS'))
 
-  # [] Unspecified
+  # Not specified
   def p_ExceptionMember(self, p):
     """ExceptionMember : Const
-                       | ExceptionField"""
+                       | ExceptionField
+                       | ExceptionAttribute
+                       | ExceptionOperation"""
     p[0] = p[1]
 
-  # [] Unspecified
+  # Not specified
   def p_ExceptionField(self, p):
     """ExceptionField : Type identifier ';'"""
     p[0] = self.BuildNamed('ExceptionField', p, 2, p[1])
 
-  # [] Error recovery for ExceptionMembers - Unspecified
+  # Error recovery for ExceptionMembers - Not specified
   def p_ExceptionFieldError(self, p):
     """ExceptionField : error"""
     p[0] = self.BuildError(p, 'ExceptionField')
 
+  # Not specified
+  def p_ExceptionAttribute(self, p):
+    """ExceptionAttribute : ReadOnly ATTRIBUTE Type identifier ';'"""
+    p[0] = self.BuildNamed('Attribute', p, 4,
+                           ListFromConcat(p[1], p[3]))
+
+  # Not specified
+  def p_ExceptionOperation(self, p):
+    """ExceptionOperation : Type identifier '(' ')' ';'"""
+    # Needed to handle one case in DOMException.idl:
+    # // Override in a Mozilla compatible format
+    # [NotEnumerable] DOMString toString();
+    # Limited form of Operation to prevent others from being added.
+    p[0] = self.BuildNamed('ExceptionOperation', p, 2, p[1])
+
   # [59]
   def p_Iterable(self, p):
     """Iterable : ITERABLE '<' Type OptionalType '>' ';'"""
@@ -794,20 +811,25 @@ class IDLParser(object):
     if len(p) > 1:
       p[0] = ListFromConcat(p[2], p[3])
 
-  # We only support:
+  # https://heycam.github.io/webidl/#idl-extended-attributes
+  # The ExtendedAttribute symbol in Web IDL grammar is very flexible but we
+  # only support following patterns:
   #    [ identifier ]
   #    [ identifier ( ArgumentList ) ]
   #    [ identifier = identifier ]
   #    [ identifier = ( IdentifierList ) ]
   #    [ identifier = identifier ( ArgumentList ) ]
-  # [66] map directly to [91-93, 95]
-  # [67-69, 71] are unsupported
+  #    [ identifier = ( StringList ) ]
+  # The first five patterns are specified in the Web IDL spec and the last
+  # pattern is Blink's custom extension to support [ReflectOnly].
   def p_ExtendedAttribute(self, p):
     """ExtendedAttribute : ExtendedAttributeNoArgs
                          | ExtendedAttributeArgList
                          | ExtendedAttributeIdent
                          | ExtendedAttributeIdentList
-                         | ExtendedAttributeNamedArgList"""
+                         | ExtendedAttributeNamedArgList
+                         | ExtendedAttributeStringLiteral
+                         | ExtendedAttributeStringLiteralList"""
     p[0] = p[1]
 
   # [71]
@@ -1072,6 +1094,44 @@ class IDLParser(object):
     value = self.BuildNamed('Call', p, 3, args)
     p[0] = self.BuildNamed('ExtAttribute', p, 1, value)
 
+  # Blink extension: Add support for string literal Extended Attribute values
+  def p_ExtendedAttributeStringLiteral(self, p):
+    """ExtendedAttributeStringLiteral : identifier '=' StringLiteral"""
+    def UnwrapString(ls):
+      """Reach in and grab the string literal's "NAME"."""
+      return ls[1].value
+
+    value = self.BuildAttribute('VALUE', UnwrapString(p[3]))
+    p[0] = self.BuildNamed('ExtAttribute', p, 1, value)
+
+  # Blink extension: Add support for compound Extended Attribute values over
+  # string literals ("A","B")
+  def p_ExtendedAttributeStringLiteralList(self, p):
+    """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_StringLiteralList(self, p):
+    """StringLiteralList : StringLiteral ',' StringLiteralList
+                         | StringLiteral"""
+    def UnwrapString(ls):
+      """Reach in and grab the string literal's "NAME"."""
+      return ls[1].value
+
+    if len(p) > 3:
+      p[0] = ListFromConcat(UnwrapString(p[1]), p[3])
+    else:
+      p[0] = ListFromConcat(UnwrapString(p[1]))
+
+  # Blink extension: Wrap string literal.
+  def p_StringLiteral(self, p):
+    """StringLiteral : string"""
+    p[0] = ListFromConcat(self.BuildAttribute('TYPE', 'DOMString'),
+                          self.BuildAttribute('NAME', p[1]))
+
+
   # [99]
   def p_StringType(self, p):
     """StringType : BYTESTRING