Title: [152898] trunk/Source/WebCore
Revision
152898
Author
[email protected]
Date
2013-07-19 05:46:49 -0700 (Fri, 19 Jul 2013)

Log Message

[GTK] Merge decamelizations fix ups in the GObject DOM bindings code generator
https://bugs.webkit.org/show_bug.cgi?id=117543

Patch by Diego Pino Garcia <[email protected]> on 2013-07-19
Reviewed by Carlos Garcia Campos.

Ensure that all the code that calls to decamelize() applies the same fix ups

Now all functions that need to decamelize a string should simply call
to decamelize(). This function calls to FixUpDecamelize to apply some
fix ups.

* bindings/scripts/CodeGeneratorGObject.pm:
(decamelize): decamelizes a string and applies fix ups
(FixUpDecamelize): applies a series of fix ups to a decamelized string
(GetParentGObjType): moved fix ups to FixUpDecamelize()
(GenerateProperties): simply call to decamelize
(GenerateHeader): simply call to decamelize
(GetGReturnMacro): simply call to decamelize
(GenerateFunction): simply call to decamelize
(GenerateCFile): simply call to decamelize
(GenerateEventTargetIface): simply call to decamelize

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (152897 => 152898)


--- trunk/Source/WebCore/ChangeLog	2013-07-19 12:18:37 UTC (rev 152897)
+++ trunk/Source/WebCore/ChangeLog	2013-07-19 12:46:49 UTC (rev 152898)
@@ -1,3 +1,27 @@
+2013-07-19  Diego Pino Garcia  <[email protected]>
+
+        [GTK] Merge decamelizations fix ups in the GObject DOM bindings code generator
+        https://bugs.webkit.org/show_bug.cgi?id=117543
+
+        Reviewed by Carlos Garcia Campos.
+
+        Ensure that all the code that calls to decamelize() applies the same fix ups
+
+        Now all functions that need to decamelize a string should simply call
+        to decamelize(). This function calls to FixUpDecamelize to apply some
+        fix ups.
+
+        * bindings/scripts/CodeGeneratorGObject.pm:
+        (decamelize): decamelizes a string and applies fix ups
+        (FixUpDecamelize): applies a series of fix ups to a decamelized string
+        (GetParentGObjType): moved fix ups to FixUpDecamelize()
+        (GenerateProperties): simply call to decamelize
+        (GenerateHeader): simply call to decamelize
+        (GetGReturnMacro): simply call to decamelize
+        (GenerateFunction): simply call to decamelize
+        (GenerateCFile): simply call to decamelize
+        (GenerateEventTargetIface): simply call to decamelize
+
 2013-07-19  Kwang Yul Seo  <[email protected]>
 
         Unreviewed.

Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (152897 => 152898)


--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm	2013-07-19 12:18:37 UTC (rev 152897)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm	2013-07-19 12:46:49 UTC (rev 152898)
@@ -134,18 +134,19 @@
                 $t .= $p3 ? $p1 ? "${p1}_$p2$p3" : "$p2$p3" : "$p1$p2";
                 $t;
         }ge;
-        $s;
-}
 
-sub FixUpDecamelizedName {
-    my $classname = shift;
-
-    # FIXME: try to merge this somehow with the fixes in ClassNameToGobjectType
-    $classname =~ s/x_path/xpath/;
-    $classname =~ s/web_kit/webkit/;
-    $classname =~ s/htmli_frame/html_iframe/;
-
-    return $classname;
+        # Some strings are not correctly decamelized, apply fix ups
+        for ($s) {
+            s/domcss/dom_css/;
+            s/domhtml/dom_html/;
+            s/domdom/dom_dom/;
+            s/domcdata/dom_cdata/;
+            s/domui/dom_ui/;
+            s/x_path/xpath/;
+            s/web_kit/webkit/;
+            s/htmli_frame/html_iframe/;
+        }
+        return $s;
 }
 
 sub HumanReadableConditional {
@@ -163,28 +164,11 @@
     return join(' ', @humanReadable);
 }
 
-sub ClassNameToGObjectType {
-    my $className = shift;
-    my $CLASS_NAME = uc(decamelize($className));
-    # Fixup: with our prefix being 'WebKitDOM' decamelize can't get
-    # WebKitDOMCSS and similar names right, so we have to fix it
-    # manually.
-    $CLASS_NAME =~ s/DOMCSS/DOM_CSS/;
-    $CLASS_NAME =~ s/DOMHTML/DOM_HTML/;
-    $CLASS_NAME =~ s/DOMDOM/DOM_DOM/;
-    $CLASS_NAME =~ s/DOMCDATA/DOM_CDATA/;
-    $CLASS_NAME =~ s/DOMX_PATH/DOM_XPATH/;
-    $CLASS_NAME =~ s/DOM_WEB_KIT/DOM_WEBKIT/;
-    $CLASS_NAME =~ s/DOMUI/DOM_UI/;
-    $CLASS_NAME =~ s/HTMLI_FRAME/HTML_IFRAME/;
-    return $CLASS_NAME;
-}
-
 sub GetParentGObjType {
     my $interface = shift;
 
     return "WEBKIT_TYPE_DOM_OBJECT" unless $interface->parent;
-    return "WEBKIT_TYPE_DOM_" . ClassNameToGObjectType($interface->parent);
+    return "WEBKIT_TYPE_DOM_" . uc(decamelize(($interface->parent)));
 }
 
 sub GetClassName {
@@ -604,8 +588,9 @@
 sub GenerateProperties {
     my ($object, $interfaceName, $interface) = @_;
 
-    my $clsCaps = substr(ClassNameToGObjectType($className), 12);
-    my $lowerCaseIfaceName = "webkit_dom_" . (FixUpDecamelizedName(decamelize($interfaceName)));
+    my $decamelize = decamelize($interfaceName);
+    my $clsCaps = uc($decamelize);
+    my $lowerCaseIfaceName = "webkit_dom_$decamelize";
     my $parentImplClassName = GetParentImplClassName($interface);
 
     my $conditionGuardStart = "";
@@ -832,9 +817,9 @@
 
     push(@hBodyPre, $implContent);
 
-    my $decamelize = FixUpDecamelizedName(decamelize($interfaceName));
+    my $decamelize = decamelize($interfaceName);
     my $clsCaps = uc($decamelize);
-    my $lowerCaseIfaceName = "webkit_dom_" . ($decamelize);
+    my $lowerCaseIfaceName = "webkit_dom_$decamelize";
 
     $implContent = << "EOF";
 #define WEBKIT_TYPE_DOM_${clsCaps}            (${lowerCaseIfaceName}_get_type())
@@ -867,7 +852,7 @@
     if ($paramIDLType eq "GError") {
         $condition = "!$paramName || !*$paramName";
     } elsif (IsGDOMClassType($paramIDLType)) {
-        my $paramTypeCaps = uc(FixUpDecamelizedName(decamelize($paramIDLType)));
+        my $paramTypeCaps = uc(decamelize($paramIDLType));
         $condition = "WEBKIT_DOM_IS_${paramTypeCaps}($paramName)";
         if (ParamCanBeNull($functionName, $paramName)) {
             $condition = "!$paramName || $condition";
@@ -902,7 +887,7 @@
 sub GenerateFunction {
     my ($object, $interfaceName, $function, $prefix, $parentNode) = @_;
 
-    my $decamelize = FixUpDecamelizedName(decamelize($interfaceName));
+    my $decamelize = decamelize($interfaceName);
 
     if ($object eq "MediaQueryListListener") {
         return;
@@ -1299,8 +1284,9 @@
 
     my $implContent = "";
 
-    my $clsCaps = uc(FixUpDecamelizedName(decamelize($interfaceName)));
-    my $lowerCaseIfaceName = "webkit_dom_" . FixUpDecamelizedName(decamelize($interfaceName));
+    my $decamelize = decamelize($interfaceName);
+    my $clsCaps = uc($decamelize);
+    my $lowerCaseIfaceName = "webkit_dom_$decamelize";
     my $parentImplClassName = GetParentImplClassName($interface);
     my $baseClassName = GetBaseClass($parentImplClassName);
 
@@ -1390,7 +1376,7 @@
     my $interface = shift;
 
     my $interfaceName = $interface->name;
-    my $decamelize = FixUpDecamelizedName(decamelize($interfaceName));
+    my $decamelize = decamelize($interfaceName);
     my $conditionalString = $codeGenerator->GenerateConditionalString($interface);
     my @conditionalWarn = GenerateConditionalWarning($interface);
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to