Changeset 141541 in webkit

Timestamp:

Jan 31, 2013 11:07:33 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[CPP,GObject,ObjC] Add 'enum' skip to CodeGenerator{CPP,GObject,ObjC}.pm
​https://bugs.webkit.org/show_bug.cgi?id=108565

Patch by Nils Barth <​nbarth@google.com> on 2013-01-31
Reviewed by Kentaro Hara.

Since legacy code generators (CodeGenerator{CPP,GObject,ObjC}.pm)
do not support enumerations, add test to skip attributes of enum type.
This lets us remove #if macro from enum in test file and not need
these in future.
Also minor associated code cleaning:

auxiliary variable: $type = $attribute->signature->type.

Test: bindings/scripts/test/TestObj.idl (run-bindings-test)

• bindings/scripts/CodeGeneratorCPP.pm:

(SkipAttribute):

• bindings/scripts/CodeGeneratorGObject.pm:

(SkipAttribute):

• bindings/scripts/CodeGeneratorObjC.pm:

(SkipAttribute):

• bindings/scripts/test/TestObj.idl: remove #if macro

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorCPP.pm (modified) (1 diff)
• bindings/scripts/CodeGeneratorGObject.pm (modified) (1 diff)
• bindings/scripts/CodeGeneratorObjC.pm (modified) (1 diff)
• bindings/scripts/test/TestObj.idl (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-31  Nils Barth  <nbarth@google.com>
+
+        [CPP,GObject,ObjC] Add 'enum' skip to CodeGenerator{CPP,GObject,ObjC}.pm
+        https://bugs.webkit.org/show_bug.cgi?id=108565
+
+        Reviewed by Kentaro Hara.
+
+        Since legacy code generators (CodeGenerator{CPP,GObject,ObjC}.pm)
+        do not support enumerations, add test to skip attributes of enum type.
+        This lets us remove #if macro from enum in test file and not need
+        these in future.
+        Also minor associated code cleaning:
+          auxiliary variable: $type = $attribute->signature->type.
+
+        Test: bindings/scripts/test/TestObj.idl (run-bindings-test)
+
+        * bindings/scripts/CodeGeneratorCPP.pm:
+        (SkipAttribute):
+        * bindings/scripts/CodeGeneratorGObject.pm:
+        (SkipAttribute):
+        * bindings/scripts/CodeGeneratorObjC.pm:
+        (SkipAttribute):
+        * bindings/scripts/test/TestObj.idl: remove #if macro
+
 2013-01-31  Kent Tamura  <tkent@chromium.org>
 

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

@@ -200 +200 @@
 {
     my $attribute = shift;
+    my $type = $attribute->signature->type;
 
     return 1 if $attribute->signature->extendedAttributes->{"Custom"}
                 or $attribute->signature->extendedAttributes->{"CustomGetter"};
 
-    return 1 if $attribute->signature->type =~ /Constructor$/;
-
-    return 1 if $codeGenerator->IsTypedArrayType($attribute->signature->type);
-
-    if ($codeGenerator->GetArrayType($attribute->signature->type)) {
+    return 1 if $type =~ /Constructor$/;
+
+    return 1 if $codeGenerator->IsTypedArrayType($type);
+
+    if ($codeGenerator->GetArrayType($type)) {
         return 1;
     }
 
-    if ($codeGenerator->GetSequenceType($attribute->signature->type)) {
+    if ($codeGenerator->GetSequenceType($type)) {
         return 1;
     }
 
-    $codeGenerator->AssertNotSequenceType($attribute->signature->type);
+    if ($codeGenerator->IsEnumType($type)) {
+        return 1;
+    }
+
+    $codeGenerator->AssertNotSequenceType($type);
 
     # FIXME: This is typically used to add script execution state arguments to the method.

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

@@ -185 +185 @@
 
     if ($codeGenerator->GetArrayType($propType)) {
+        return 1;
+    }
+
+    if ($codeGenerator->IsEnumType($propType)) {
         return 1;
     }

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

@@ -447 +447 @@
 {
     my $attribute = shift;
-
-    $codeGenerator->AssertNotSequenceType($attribute->signature->type);
-    return 1 if $codeGenerator->GetArrayType($attribute->signature->type);
-    return 1 if $codeGenerator->IsTypedArrayType($attribute->signature->type);
+    my $type = $attribute->signature->type;
+
+    $codeGenerator->AssertNotSequenceType($type);
+    return 1 if $codeGenerator->GetArrayType($type);
+    return 1 if $codeGenerator->IsTypedArrayType($type);
+    return 1 if $codeGenerator->IsEnumType($type);
 
     # This is for DynamicsCompressorNode.idl

trunk/Source/WebCore/bindings/scripts/test/TestObj.idl

@@ -31 +31 @@
 // changes in its ouput.
 
-#if defined(TESTING_JS) || defined(TESTING_V8)
 enum TestEnumType { "", "EnumValue1", "EnumValue2", "EnumValue3" };
-#endif
 
 [
@@ -47 +45 @@
     static attribute DOMString         staticStringAttr;
     static readonly attribute TestSubObjConstructor TestSubObj;
+#endif
     attribute TestEnumType             enumAttr;
-#endif
     attribute short                    shortAttr;
     attribute unsigned short           unsignedShortAttr;