[webkit-changes] [135229] trunk/Source/WebCore

Mon, 19 Nov 2012 18:16:37 -0800

Title: [135229] trunk/Source/WebCore
Revision
135229
Author
hara...@chromium.org
Date
2012-11-19 18:18:14 -0800 (Mon, 19 Nov 2012)

Log Message

In the IDL parser, we should rename $dataNode to $interface
https://bugs.webkit.org/show_bug.cgi?id=102746

Reviewed by Adam Barth.

$dataNode is misnamed. It should be $interface.

No tests. No change in behavior.

* bindings/scripts/IDLParser.pm:
(parseInterface):
(parseException):
(parseAttributeOrOperationRest):
(parseOperationOrIterator):
(parseSpecialOperation):
(parseInterfaceOld):
(parseExceptionOld):
(parseAttributeOrOperationOrIteratorOld):
(parseAttributeOrOperationRestOld):
(applyMemberList):
(applyExtendedAttributeList):
* bindings/scripts/generate-bindings.pl:
* bindings/scripts/preprocess-idls.pl:
(checkIDLAttributes):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (135228 => 135229)


--- trunk/Source/WebCore/ChangeLog	2012-11-20 02:16:33 UTC (rev 135228)
+++ trunk/Source/WebCore/ChangeLog	2012-11-20 02:18:14 UTC (rev 135229)
@@ -1,3 +1,30 @@
+2012-11-19  Kentaro Hara  <hara...@chromium.org>
+
+        In the IDL parser, we should rename $dataNode to $interface
+        https://bugs.webkit.org/show_bug.cgi?id=102746
+
+        Reviewed by Adam Barth.
+
+        $dataNode is misnamed. It should be $interface.
+
+        No tests. No change in behavior.
+
+        * bindings/scripts/IDLParser.pm:
+        (parseInterface):
+        (parseException):
+        (parseAttributeOrOperationRest):
+        (parseOperationOrIterator):
+        (parseSpecialOperation):
+        (parseInterfaceOld):
+        (parseExceptionOld):
+        (parseAttributeOrOperationOrIteratorOld):
+        (parseAttributeOrOperationRestOld):
+        (applyMemberList):
+        (applyExtendedAttributeList):
+        * bindings/scripts/generate-bindings.pl:
+        * bindings/scripts/preprocess-idls.pl:
+        (checkIDLAttributes):
+
 2012-11-19  Adam Klein  <ad...@chromium.org>
 
         MutationObserver wrapper should not be collected while still observing

Modified: trunk/Source/WebCore/bindings/scripts/IDLParser.pm (135228 => 135229)


--- trunk/Source/WebCore/bindings/scripts/IDLParser.pm	2012-11-20 02:16:33 UTC (rev 135228)
+++ trunk/Source/WebCore/bindings/scripts/IDLParser.pm	2012-11-20 02:18:14 UTC (rev 135229)
@@ -376,19 +376,19 @@
 
     my $next = $self->nextToken();
     if ($next->value() eq "interface") {
-        my $dataNode = domInterface->new();
+        my $interface = domInterface->new();
         $self->assertTokenValue($self->getToken(), "interface", __LINE__);
         my $interfaceNameToken = $self->getToken();
         $self->assertTokenType($interfaceNameToken, IdentifierToken);
-        $dataNode->name($interfaceNameToken->value());
-        push(@{$dataNode->parents}, @{$self->parseInheritance()});
+        $interface->name($interfaceNameToken->value());
+        push(@{$interface->parents}, @{$self->parseInheritance()});
         $self->assertTokenValue($self->getToken(), "{", __LINE__);
         my $interfaceMembers = $self->parseInterfaceMembers();
         $self->assertTokenValue($self->getToken(), "}", __LINE__);
         $self->assertTokenValue($self->getToken(), ";", __LINE__);
-        applyMemberList($dataNode, $interfaceMembers);
-        applyExtendedAttributeList($dataNode, $extendedAttributeList);
-        return $dataNode;
+        applyMemberList($interface, $interfaceMembers);
+        applyExtendedAttributeList($interface, $extendedAttributeList);
+        return $interface;
     }
     $self->assertUnexpectedToken($next->value(), __LINE__);
 }
@@ -576,20 +576,20 @@
 
     my $next = $self->nextToken();
     if ($next->value() eq "exception") {
-        my $dataNode = domInterface->new();
+        my $interface = domInterface->new();
         $self->assertTokenValue($self->getToken(), "exception", __LINE__);
         my $exceptionNameToken = $self->getToken();
         $self->assertTokenType($exceptionNameToken, IdentifierToken);
-        $dataNode->name($exceptionNameToken->value());
-        $dataNode->isException(1);
-        push(@{$dataNode->parents}, @{$self->parseInheritance()});
+        $interface->name($exceptionNameToken->value());
+        $interface->isException(1);
+        push(@{$interface->parents}, @{$self->parseInheritance()});
         $self->assertTokenValue($self->getToken(), "{", __LINE__);
         my $exceptionMembers = $self->parseExceptionMembers();
         $self->assertTokenValue($self->getToken(), "}", __LINE__);
         $self->assertTokenValue($self->getToken(), ";", __LINE__);
-        applyMemberList($dataNode, $exceptionMembers);
-        applyExtendedAttributeList($dataNode, $extendedAttributeList);
-        return $dataNode;
+        applyMemberList($interface, $exceptionMembers);
+        applyExtendedAttributeList($interface, $extendedAttributeList);
+        return $interface;
     }
     $self->assertUnexpectedToken($next->value(), __LINE__);
 }
@@ -970,11 +970,11 @@
     }
     if ($next->type() == IdentifierToken || $next->value() =~ /$nextAttributeOrOperationRest_1/) {
         my $returnType = $self->parseReturnType();
-        my $dataNode = $self->parseOperationRest($extendedAttributeList);
-        if (defined ($dataNode)) {
-            $dataNode->signature->type($returnType);
+        my $interface = $self->parseOperationRest($extendedAttributeList);
+        if (defined ($interface)) {
+            $interface->signature->type($returnType);
         }
-        return $dataNode;
+        return $interface;
     }
     $self->assertUnexpectedToken($next->value(), __LINE__);
 }
@@ -1056,11 +1056,11 @@
     }
     if ($next->type() == IdentifierToken || $next->value() =~ /$nextAttributeOrOperationRest_1/) {
         my $returnType = $self->parseReturnType();
-        my $dataNode = $self->parseOperationOrIteratorRest($extendedAttributeList);
-        if (defined ($dataNode)) {
-            $dataNode->signature->type($returnType);
+        my $interface = $self->parseOperationOrIteratorRest($extendedAttributeList);
+        if (defined ($interface)) {
+            $interface->signature->type($returnType);
         }
-        return $dataNode;
+        return $interface;
     }
     $self->assertUnexpectedToken($next->value(), __LINE__);
 }
@@ -1075,11 +1075,11 @@
         $self->parseSpecial();
         $self->parseSpecials();
         my $returnType = $self->parseReturnType();
-        my $dataNode = $self->parseOperationRest($extendedAttributeList);
-        if (defined ($dataNode)) {
-            $dataNode->signature->type($returnType);
+        my $interface = $self->parseOperationRest($extendedAttributeList);
+        if (defined ($interface)) {
+            $interface->signature->type($returnType);
         }
-        return $dataNode;
+        return $interface;
     }
     $self->assertUnexpectedToken($next->value(), __LINE__);
 }
@@ -2118,21 +2118,21 @@
     my $self = shift;
     my $next = $self->nextToken();
     if ($next->value() eq "interface") {
-        my $dataNode = domInterface->new();
+        my $interface = domInterface->new();
         $self->assertTokenValue($self->getToken(), "interface", __LINE__);
         my $extendedAttributeList = $self->parseExtendedAttributeListAllowEmpty();
         my $token = $self->getToken();
         $self->assertTokenType($token, IdentifierToken);
-        $dataNode->name($token->value());
-        $dataNode->isException(0);
-        push(@{$dataNode->parents}, @{$self->parseInheritance()});
+        $interface->name($token->value());
+        $interface->isException(0);
+        push(@{$interface->parents}, @{$self->parseInheritance()});
         $self->assertTokenValue($self->getToken(), "{", __LINE__);
         my $interfaceMembers = $self->parseInterfaceMembers();
         $self->assertTokenValue($self->getToken(), "}", __LINE__);
         $self->assertTokenValue($self->getToken(), ";", __LINE__);
-        applyMemberList($dataNode, $interfaceMembers);
-        applyExtendedAttributeList($dataNode, $extendedAttributeList);
-        return $dataNode;
+        applyMemberList($interface, $interfaceMembers);
+        applyExtendedAttributeList($interface, $extendedAttributeList);
+        return $interface;
     }
     $self->assertUnexpectedToken($next->value(), __LINE__);
 }
@@ -2188,22 +2188,22 @@
     my $self = shift;
     my $next = $self->nextToken();
     if ($next->value() eq "exception") {
-        my $dataNode = domInterface->new();
+        my $interface = domInterface->new();
         $self->assertTokenValue($self->getToken(), "exception", __LINE__);
         my $extendedAttributeList = $self->parseExtendedAttributeListAllowEmpty();
         my $token = $self->getToken();
         $self->assertTokenType($token, IdentifierToken);
-        $dataNode->name($token->value());
-        $dataNode->isException(1);
-        push(@{$dataNode->parents}, @{$self->parseInheritance()});
+        $interface->name($token->value());
+        $interface->isException(1);
+        push(@{$interface->parents}, @{$self->parseInheritance()});
         $self->assertTokenValue($self->getToken(), "{", __LINE__);
         my $exceptionMembers = $self->parseInterfaceMembers();
         #$self->parseExceptionMembers();
         $self->assertTokenValue($self->getToken(), "}", __LINE__);
         $self->assertTokenValue($self->getToken(), ";", __LINE__);
-        applyMemberList($dataNode, $exceptionMembers);
-        applyExtendedAttributeList($dataNode, $extendedAttributeList);
-        return $dataNode;
+        applyMemberList($interface, $exceptionMembers);
+        applyExtendedAttributeList($interface, $extendedAttributeList);
+        return $interface;
     }
     $self->assertUnexpectedToken($next->value(), __LINE__);
 }
@@ -2234,11 +2234,11 @@
     }
     if ($next->value() =~ /$nextAttributeOrOperationOrIterator_1/) {
         my $qualifier = $self->parseQualifier();
-        my $dataNode = $self->parseAttributeOrOperationRestOld();
-        if (defined ($dataNode) && $qualifier eq "static") {
-            $dataNode->isStatic(1);
+        my $interface = $self->parseAttributeOrOperationRestOld();
+        if (defined ($interface) && $qualifier eq "static") {
+            $interface->isStatic(1);
         }
-        return $dataNode;
+        return $interface;
     }
     if ($next->value() =~ /$nextAttributeOld_1/) {
         return $self->parseAttributeOld();
@@ -2262,11 +2262,11 @@
     }
     if ($next->type() == IdentifierToken || $next->value() =~ /$nextAttributeOrOperationRest_1/) {
         my $returnType = $self->parseReturnType();
-        my $dataNode = $self->parseOperationRest({});
-        if (defined ($dataNode)) {
-            $dataNode->signature->type($returnType);
+        my $interface = $self->parseOperationRest({});
+        if (defined ($interface)) {
+            $interface->signature->type($returnType);
         }
-        return $dataNode;
+        return $interface;
     }
     $self->assertUnexpectedToken($next->value(), __LINE__);
 }
@@ -2421,20 +2421,20 @@
 
 sub applyMemberList
 {
-    my $dataNode = shift;
+    my $interface = shift;
     my $members = shift;
 
     for my $item (@{$members}) {
         if (ref($item) eq "domAttribute") {
-            push(@{$dataNode->attributes}, $item);
+            push(@{$interface->attributes}, $item);
             next;
         }
         if (ref($item) eq "domConstant") {
-            push(@{$dataNode->constants}, $item);
+            push(@{$interface->constants}, $item);
             next;
         }
         if (ref($item) eq "domFunction") {
-            push(@{$dataNode->functions}, $item);
+            push(@{$interface->functions}, $item);
             next;
         }
     }
@@ -2442,7 +2442,7 @@
 
 sub applyExtendedAttributeList
 {
-    my $dataNode = shift;
+    my $interface = shift;
     my $extendedAttributeList = shift;
 
     if (defined $extendedAttributeList->{"Constructors"}) {
@@ -2455,7 +2455,7 @@
             $constructor->signature->extendedAttributes($extendedAttributeList);
             $constructor->parameters($param);
             $constructor->{overloadedIndex} = $index++;
-            push(@{$dataNode->constructors}, $constructor);
+            push(@{$interface->constructors}, $constructor);
         }
         delete $extendedAttributeList->{"Constructors"};
         $extendedAttributeList->{"Constructor"} = "VALUE_IS_MISSING";
@@ -2469,9 +2469,9 @@
         my $constructorName = $attributeKeys[0];
         push(@{$newDataNode->parameters}, @{$attributes{$constructorName}});
         $extendedAttributeList->{"NamedConstructor"} = $constructorName;
-        push(@{$dataNode->constructors}, $newDataNode);
+        push(@{$interface->constructors}, $newDataNode);
     }
-    $dataNode->extendedAttributes($extendedAttributeList);
+    $interface->extendedAttributes($extendedAttributeList);
 }
 
 1;

Modified: trunk/Source/WebCore/bindings/scripts/generate-bindings.pl (135228 => 135229)


--- trunk/Source/WebCore/bindings/scripts/generate-bindings.pl	2012-11-20 02:16:33 UTC (rev 135228)
+++ trunk/Source/WebCore/bindings/scripts/generate-bindings.pl	2012-11-20 02:18:14 UTC (rev 135229)
@@ -137,8 +137,8 @@
     my $parser = IDLParser->new(!$verbose);
     my $document = $parser->Parse($idlFile, $defines, $preprocessor);
 
-    foreach my $dataNode (@{$document->interfaces}) {
-        if ($dataNode->extendedAttributes->{"Supplemental"} and $dataNode->extendedAttributes->{"Supplemental"} eq $targetInterfaceName) {
+    foreach my $interface (@{$document->interfaces}) {
+        if ($interface->extendedAttributes->{"Supplemental"} and $interface->extendedAttributes->{"Supplemental"} eq $targetInterfaceName) {
             my $targetDataNode;
             foreach my $interface (@{$targetDocument->interfaces}) {
                 if ($interface->name eq $targetInterfaceName) {
@@ -149,40 +149,40 @@
             die "Not found an interface ${targetInterfaceName} in ${targetInterfaceName}.idl." unless defined $targetDataNode;
 
             # Support [Supplemental] for attributes.
-            foreach my $attribute (@{$dataNode->attributes}) {
+            foreach my $attribute (@{$interface->attributes}) {
                 # Record that this attribute is implemented by $interfaceName.
                 $attribute->signature->extendedAttributes->{"ImplementedBy"} = $interfaceName;
 
                 # Add interface-wide extended attributes to each attribute.
-                foreach my $extendedAttributeName (keys %{$dataNode->extendedAttributes}) {
+                foreach my $extendedAttributeName (keys %{$interface->extendedAttributes}) {
                     next if ($extendedAttributeName eq "Supplemental");
-                    $attribute->signature->extendedAttributes->{$extendedAttributeName} = $dataNode->extendedAttributes->{$extendedAttributeName};
+                    $attribute->signature->extendedAttributes->{$extendedAttributeName} = $interface->extendedAttributes->{$extendedAttributeName};
                 }
                 push(@{$targetDataNode->attributes}, $attribute);
             }
 
             # Support [Supplemental] for methods.
-            foreach my $function (@{$dataNode->functions}) {
+            foreach my $function (@{$interface->functions}) {
                 # Record that this method is implemented by $interfaceName.
                 $function->signature->extendedAttributes->{"ImplementedBy"} = $interfaceName;
 
                 # Add interface-wide extended attributes to each method.
-                foreach my $extendedAttributeName (keys %{$dataNode->extendedAttributes}) {
+                foreach my $extendedAttributeName (keys %{$interface->extendedAttributes}) {
                     next if ($extendedAttributeName eq "Supplemental");
-                    $function->signature->extendedAttributes->{$extendedAttributeName} = $dataNode->extendedAttributes->{$extendedAttributeName};
+                    $function->signature->extendedAttributes->{$extendedAttributeName} = $interface->extendedAttributes->{$extendedAttributeName};
                 }
                 push(@{$targetDataNode->functions}, $function);
             }
 
             # Support [Supplemental] for constants.
-            foreach my $constant (@{$dataNode->constants}) {
+            foreach my $constant (@{$interface->constants}) {
                 # Record that this constant is implemented by $interfaceName.
                 $constant->extendedAttributes->{"ImplementedBy"} = $interfaceName;
 
                 # Add interface-wide extended attributes to each constant.
-                foreach my $extendedAttributeName (keys %{$dataNode->extendedAttributes}) {
+                foreach my $extendedAttributeName (keys %{$interface->extendedAttributes}) {
                     next if ($extendedAttributeName eq "Supplemental");
-                    $constant->extendedAttributes->{$extendedAttributeName} = $dataNode->extendedAttributes->{$extendedAttributeName};
+                    $constant->extendedAttributes->{$extendedAttributeName} = $interface->extendedAttributes->{$extendedAttributeName};
                 }
                 push(@{$targetDataNode->constants}, $constant);
             }

Modified: trunk/Source/WebCore/bindings/scripts/preprocess-idls.pl (135228 => 135229)


--- trunk/Source/WebCore/bindings/scripts/preprocess-idls.pl	2012-11-20 02:16:33 UTC (rev 135228)
+++ trunk/Source/WebCore/bindings/scripts/preprocess-idls.pl	2012-11-20 02:18:14 UTC (rev 135229)
@@ -80,9 +80,9 @@
     $supplementals{$idlFile} = [];
 }
 foreach my $idlFile (keys %documents) {
-    foreach my $dataNode (@{$documents{$idlFile}->interfaces}) {
-        if ($dataNode->extendedAttributes->{"Supplemental"}) {
-            my $targetIdlFile = $interfaceNameToIdlFile{$dataNode->extendedAttributes->{"Supplemental"}};
+    foreach my $interface (@{$documents{$idlFile}->interfaces}) {
+        if ($interface->extendedAttributes->{"Supplemental"}) {
+            my $targetIdlFile = $interfaceNameToIdlFile{$interface->extendedAttributes->{"Supplemental"}};
             push(@{$supplementals{$targetIdlFile}}, $idlFile);
             # Treats as if this IDL file does not exist.
             delete $supplementals{$idlFile};
@@ -168,14 +168,14 @@
     my $document = shift;
     my $idlFile = shift;
 
-    foreach my $dataNode (@{$document->interfaces}) {
-        checkIfIDLAttributesExists($idlAttributes, $dataNode->extendedAttributes, $idlFile);
+    foreach my $interface (@{$document->interfaces}) {
+        checkIfIDLAttributesExists($idlAttributes, $interface->extendedAttributes, $idlFile);
 
-        foreach my $attribute (@{$dataNode->attributes}) {
+        foreach my $attribute (@{$interface->attributes}) {
             checkIfIDLAttributesExists($idlAttributes, $attribute->signature->extendedAttributes, $idlFile);
         }
 
-        foreach my $function (@{$dataNode->functions}) {
+        foreach my $function (@{$interface->functions}) {
             checkIfIDLAttributesExists($idlAttributes, $function->signature->extendedAttributes, $idlFile);
             foreach my $parameter (@{$function->parameters}) {
                 checkIfIDLAttributesExists($idlAttributes, $parameter->extendedAttributes, $idlFile);

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to