Changeset 98766 in webkit

Timestamp:

Oct 28, 2011, 2:46:17 PM (15 years ago)

Author:

adamk@chromium.org

Message:

Remove unused parsers for 'exception' and 'alias' IDL keywords
​https://bugs.webkit.org/show_bug.cgi?id=71140

Reviewed by Adam Barth.

• bindings/scripts/IDLParser.pm:

(ParseInterface):
(DetermineParseMode):
(ProcessSection):

• bindings/scripts/IDLStructure.pm:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/IDLParser.pm (modified) (4 diffs)
• bindings/scripts/IDLStructure.pm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-28  Adam Klein  <adamk@chromium.org>
+
+        Remove unused parsers for 'exception' and 'alias' IDL keywords
+        https://bugs.webkit.org/show_bug.cgi?id=71140
+
+        Reviewed by Adam Barth.
+
+        * bindings/scripts/IDLParser.pm:
+        (ParseInterface):
+        (DetermineParseMode):
+        (ProcessSection):
+        * bindings/scripts/IDLStructure.pm:
+
 2011-10-28  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/bindings/scripts/IDLParser.pm

@@ -33 +33 @@
 use constant MODE_MODULE  => 10; # 'module' section
 use constant MODE_INTERFACE  => 11; # 'interface' section
-use constant MODE_EXCEPTION  => 12; # 'exception' section
-use constant MODE_ALIAS    => 13; # 'alias' section
 
 # Helper variables
@@ -237 +235 @@
 
     # Beginning of the regexp parsing magic
-    if ($sectionName eq "exception") {
-        print " |- Trying to parse exception...\n" unless $beQuiet;
-
-        my $exceptionName = "";
-        my $exceptionData = "";
-        my $exceptionDataName = "";
-        my $exceptionDataType = "";
-
-        # Match identifier of the exception, and enclosed data...
-        $data =~ /$IDLStructure::exceptionSelector/;
-        $exceptionName = (defined($1) ? $1 : die("Parsing error!\nSource:\n$data\n)"));
-        $exceptionData = (defined($2) ? $2 : die("Parsing error!\nSource:\n$data\n)"));
-
-        ('' =~ /^/); # Reset variables needed for regexp matching
-
-        # ... parse enclosed data (get. name & type)
-        $exceptionData =~ /$IDLStructure::exceptionSubSelector/;
-        $exceptionDataType = (defined($1) ? $1 : die("Parsing error!\nSource:\n$data\n)"));
-        $exceptionDataName = (defined($2) ? $2 : die("Parsing error!\nSource:\n$data\n)"));
-
-        # Fill in domClass datastructure
-        $dataNode->name($exceptionName);
-
-        my $newDataNode = new domAttribute();
-        $newDataNode->type("readonly attribute");
-        $newDataNode->signature(new domSignature());
-
-        $newDataNode->signature->name($exceptionDataName);
-        $newDataNode->signature->type($exceptionDataType);
-
-        my $arrayRef = $dataNode->attributes;
-        push(@$arrayRef, $newDataNode);
-
-        print "  |----> Exception; NAME \"$exceptionName\" DATA TYPE \"$exceptionDataType\" DATA NAME \"$exceptionDataName\"\n |-\n |\n" unless $beQuiet;
-    } elsif ($sectionName eq "interface") {
+    if ($sectionName eq "interface") {
         print " |- Trying to parse interface...\n" unless $beQuiet;
 
@@ -416 +380 @@
     } elsif ($_ =~ /interface/) {
         $mode = MODE_INTERFACE;
-    } elsif ($_ =~ /exception/) {
-        $mode = MODE_EXCEPTION;
-    } elsif ($_ =~ /(\A|\b)alias/) {
-        # The (\A|\b) above is needed so we don't match attributes
-        # whose names contain the substring "alias".
-        $mode = MODE_ALIAS;
     }
 
@@ -443 +401 @@
         my $arrayRef = $document->classes;
         push(@$arrayRef, $node);
-    } elsif($parseMode eq MODE_EXCEPTION) {
-        my $node = new domClass();
-        $object->ParseInterface($node, "exception");
-
-        die ("No module specified! Fatal Error!\n") if ($document eq 0);
-        my $arrayRef = $document->classes;
-        push(@$arrayRef, $node);
-    } elsif($parseMode eq MODE_ALIAS) {
-        print " |- Trying to parse alias...\n" unless $beQuiet;
-    
-        my $line = join("", @temporaryContent);
-        $line =~ /$IDLStructure::aliasSelector/;
-
-        my $interfaceName = (defined($1) ? $1 : die("Parsing error!\nSource:\n$line\n)"));
-        my $wrapperName = (defined($2) ? $2 : die("Parsing error!\nSource:\n$line\n)"));
-    
-        print "  |----> Alias; INTERFACE \"$interfaceName\" WRAPPER \"$wrapperName\"\n |-\n |\n" unless $beQuiet;
-
-        # FIXME: Check if alias is already in aliases
-        my $aliases = $document->aliases;
-        $aliases->{$interfaceName} = $wrapperName;
     }
 

trunk/Source/WebCore/bindings/scripts/IDLStructure.pm

@@ -33 +33 @@
 });
 
-# Used to represent 'interface' / 'exception' blocks
+# Used to represent 'interface' blocks
 struct( domClass => {
     name => '$',      # Class identifier (without module)
@@ -103 +103 @@
 our $typeNamespaceSelector = '((?:' . $idlId . '*::)*)\s*(' . $idlDataType . '*)';
 
-our $exceptionSelector = 'exception\s*(' . $idlIdNs . '*)\s*([a-zA-Z\s{;]*};)';
-our $exceptionSubSelector = '{\s*' . $supportedTypes . '\s*(' . $idlType . '*)\s*;\s*}';
-
 our $interfaceSelector = 'interface\s*((?:' . $extendedAttributeSyntax . ' )?)(' . $idlIdNs . '*)\s*(?::(\s*[^{]*))?{([-a-zA-Z0-9_"=\s(),;:\[\]&\|]*)';
 our $interfaceMethodSelector = '\s*((?:' . $extendedAttributeSyntax . ' )?)' . $supportedTypes . '\s*(' . $idlIdNs . '*)\s*\(\s*([a-zA-Z0-9:\s,=\[\]]*)';