Changeset 94010 in webkit

Timestamp:

Aug 29, 2011, 1:32:32 PM (15 years ago)

Author:

Patrick Gansterer

Message:

Add parsing support for extended attributes on IDL constants
​https://bugs.webkit.org/show_bug.cgi?id=65046

Reviewed by Brent Fulgham.

With support for extended attributes on constants we can
replace some preprocessor lines from the IDL files with
the corresponding [Conditional=XXX] later.
Using the preprocessor causes much pain on native windows.

CodeGenerator support will be added in separate patches.

• bindings/scripts/IDLParser.pm:
• bindings/scripts/IDLStructure.pm:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-29  Patrick Gansterer  <paroga@webkit.org>
+
+        Add parsing support for extended attributes on IDL constants
+        https://bugs.webkit.org/show_bug.cgi?id=65046
+
+        Reviewed by Brent Fulgham.
+
+        With support for extended attributes on constants we can
+        replace some preprocessor lines from the IDL files with
+        the corresponding [Conditional=XXX] later.
+        Using the preprocessor causes much pain on native windows.
+
+        CodeGenerator support will be added in separate patches.
+
+        * bindings/scripts/IDLParser.pm:
+        * bindings/scripts/IDLStructure.pm:
+
 2011-08-29  Ryosuke Niwa  <rniwa@webkit.org>
 

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

@@ -331 +331 @@
             } elsif ($line =~ /^\s*const/) {
                 $line =~ /$IDLStructure::constantSelector/;
-                my $constType = (defined($1) ? $1 : die("Parsing error!\nSource:\n$line\n)"));
-                my $constName = (defined($2) ? $2 : die("Parsing error!\nSource:\n$line\n)"));
-                my $constValue = (defined($3) ? $3 : die("Parsing error!\nSource:\n$line\n)"));
+                my $constExtendedAttributes = (defined($1) ? $1 : " "); chop($constExtendedAttributes);
+                my $constType = (defined($2) ? $2 : die("Parsing error!\nSource:\n$line\n)"));
+                my $constName = (defined($3) ? $3 : die("Parsing error!\nSource:\n$line\n)"));
+                my $constValue = (defined($4) ? $4 : die("Parsing error!\nSource:\n$line\n)"));
 
                 my $newDataNode = new domConstant();
@@ -339 +340 @@
                 $newDataNode->type($constType);
                 $newDataNode->value($constValue);
+                $newDataNode->extendedAttributes(parseExtendedAttributes($constExtendedAttributes));
 
                 my $arrayRef = $dataNode->constants;

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

@@ -71 +71 @@
     type => '$',      # Type of data
     value => '$',      # Constant value
+    extendedAttributes => '$', # Extended attributes
 });
 
@@ -94 +95 @@
 our $moduleSelector = 'module\s*(' . $idlId . '*)\s*{';
 our $moduleNSSelector = 'module\s*(' . $idlId . '*)\s*\[ns\s*(' . $idlIdNs . '*)\s*(' . $idlIdNs . '*)\]\s*;';
-our $constantSelector = 'const\s*' . $supportedTypes . '\s*(' . $idlType . '*)\s*=\s*(' . $constValue . ')';
+our $constantSelector = 'const\s*(' . $extendedAttributeSyntax . ' )?' . $supportedTypes . '\s*(' . $idlType . '*)\s*=\s*(' . $constValue . ')';
 our $raisesSelector = 'raises\s*\((' . $idlIdNsList . '*)\s*\)';
 our $getterRaisesSelector = '\bgetter\s+raises\s*\((' . $idlIdNsList . '*)\s*\)';