Changeset 58510 in webkit

Timestamp:

Apr 29, 2010 6:49:52 AM (14 years ago)

Author:

xan@webkit.org

Message:

2010-04-29 Xan Lopez <​xlopez@igalia.com>

Reviewed by Gustavo Noronha.

[GTK] GObject DOM bindings
​https://bugs.webkit.org/show_bug.cgi?id=33590

Do not generate unneeded boilerplate in {get,set}_property methods
when there are no properties to generate code for. This gets rid
of lots of compiler warnings.

• bindings/scripts/CodeGeneratorGObject.pm:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorGObject.pm (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-29  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
+        [GTK] GObject DOM bindings
+        https://bugs.webkit.org/show_bug.cgi?id=33590
+
+        Do not generate unneeded boilerplate in {get,set}_property methods
+        when there are no properties to generate code for. This gets rid
+        of lots of compiler warnings.
+
+        * bindings/scripts/CodeGeneratorGObject.pm:
+
 2010-04-29  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/WebCore/bindings/scripts/CodeGeneratorGObject.pm

@@ -272 +272 @@
 }
 
+sub GetReadableProperties {
+    my $properties = shift;
+
+    my @result = ();
+
+    foreach my $property (@{$properties}) {
+        if (!SkipAttribute($property)) {
+            push(@result, $property);
+        }
+    }
+
+    return @result;
+}
+
+sub GetWriteableProperties {
+    my $properties = shift;
+    my @result = ();
+
+    foreach my $property (@{$properties}) {
+        my $writeable = $property->type !~ /^readonly/;
+        my $gtype = GetGValueTypeName($property->signature->type);
+        my $hasGtypeSignature = ($gtype eq "boolean" || $gtype eq "float" || $gtype eq "double" ||
+                                 $gtype eq "uint64" || $gtype eq "ulong" || $gtype eq "long" || 
+                                 $gtype eq "uint" || $gtype eq "ushort" || $gtype eq "uchar" ||
+                                 $gtype eq "char" || $gtype eq "string");
+        if ($writeable && $hasGtypeSignature) {
+            push(@result, $property);
+        }
+    }
+
+    return @result;
+}
+
 sub GenerateProperties {
     my ($object, $interfaceName, $dataNode) = @_;
@@ -292 +325 @@
     my @txtGetProps = ();
 
+    my @readableProperties = GetReadableProperties($dataNode->attributes);
+
     my $privFunction = GetCoreObject($interfaceName, "coreSelf", "self");
 
@@ -297 +332 @@
 static void ${lowerCaseIfaceName}_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
 {
+EOF
+    push(@txtGetProps, $txtGetProp);
+    if (scalar @readableProperties > 0) {
+        $txtGetProp = << "EOF";
     ${className}* self = WEBKIT_DOM_${clsCaps}(object);
     $privFunction
-
+EOF
+    push(@txtGetProps, $txtGetProp);
+    }
+
+    $txtGetProp = << "EOF";
     switch (prop_id) {
 EOF
     push(@txtGetProps, $txtGetProp);
+
+    my @writeableProperties = GetWriteableProperties(\@readableProperties);
 
     my $txtSetProps = << "EOF";
 static void ${lowerCaseIfaceName}_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
 {
+EOF
+    push(@txtSetProps, $txtSetProps);
+
+    if (scalar @writeableProperties > 0) {
+        $txtSetProps = << "EOF";
     ${className} *self = WEBKIT_DOM_${clsCaps}(object);
     $privFunction
-
+EOF
+        push(@txtSetProps, $txtSetProps);
+    }
+
+    $txtSetProps = << "EOF";
     switch (prop_id) {
 EOF
@@ -317 +371 @@
     # each one of them.
   SKIPENUM:
-    foreach my $attribute (@{$dataNode->attributes}) {
-        if (SkipAttribute($attribute)) {
-            next SKIPENUM;
-        }
-
+    foreach my $attribute (@readableProperties) {
         my $camelPropName = $attribute->signature->name;
         my $setPropNameFunction = $codeGenerator->WK_ucfirst($camelPropName);
@@ -379 +429 @@
         }
 
-        if ($writeable && ($gtype eq "boolean" || $gtype eq "float" || $gtype eq "double" ||
-                           $gtype eq "uint64" || $gtype eq "ulong" || $gtype eq "long" || 
-                           $gtype eq "uint" || $gtype eq "ushort" || $gtype eq "uchar" ||
-                           $gtype eq "char" || $gtype eq "string")) {
-
+        if (grep {$_ eq $attribute} @writeableProperties) {
             push(@txtSetProps, "   case ${propEnum}:\n    {\n");
             push(@txtSetProps, "        WebCore::ExceptionCode ec = 0;\n") if @{$attribute->setterExceptions};