Changeset 157048 in webkit

Timestamp:

Oct 7, 2013 10:45:42 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Conditional support in bindings code generator for overloaded functions
​https://bugs.webkit.org/show_bug.cgi?id=122443

Patch by Philippe Normand <​pnormand@igalia.com> on 2013-10-07
Reviewed by Darin Adler.

• bindings/scripts/CodeGeneratorJS.pm:

(GenerateOverloadedFunction): Generate conditional for overloaded
function, if it's present in the idl.
(GenerateImplementation): Close the last overloaded function
conditional before generating the distpatch function.

• bindings/scripts/test/JS/JSTestObj.cpp:

(WebCore::jsTestObjConstructorFunctionOverloadedMethod1):
Rebaseline overloaded function tests.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorJS.pm (modified) (3 diffs)
• bindings/scripts/test/JS/JSTestObj.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-07  Philippe Normand  <pnormand@igalia.com>
+
+        Conditional support in bindings code generator for overloaded functions
+        https://bugs.webkit.org/show_bug.cgi?id=122443
+
+        Reviewed by Darin Adler.
+
+        * bindings/scripts/CodeGeneratorJS.pm: 
+        (GenerateOverloadedFunction): Generate conditional for overloaded
+        function, if it's present in the idl.
+        (GenerateImplementation): Close the last overloaded function
+        conditional before generating the distpatch function.
+        * bindings/scripts/test/JS/JSTestObj.cpp:
+        (WebCore::jsTestObjConstructorFunctionOverloadedMethod1):
+        Rebaseline overloaded function tests.
+
 2013-10-07  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -1287 +1287 @@
         }
 
+        my $conditionalString = $codeGenerator->GenerateConditionalString($overload->signature);
+        push(@implContent, "#if ${conditionalString}\n") if $conditionalString;
+
         push(@implContent, "    if ($parametersCheck)\n");
         push(@implContent, "        return ${functionName}$overload->{overloadIndex}(exec);\n");
+        push(@implContent, "#endif\n\n") if $conditionalString;
+
     }
     if ($leastNumMandatoryParams >= 1) {
@@ -2433 +2438 @@
 
             push(@implContent, "}\n\n");
+            push(@implContent, "#endif\n\n") if $conditional;
 
             if (!$isCustom && $isOverloaded && $function->{overloadIndex} == @{$function->{overloads}}) {
@@ -2439 +2445 @@
             }
 
-            push(@implContent, "#endif\n\n") if $conditional;
         }
     }

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp

@@ -2819 +2819 @@
 }
 
+#endif
+
 EncodedJSValue JSC_HOST_CALL jsTestObjConstructorFunctionOverloadedMethod1(ExecState* exec)
 {
     size_t argsCount = exec->argumentCount();
+#if ENABLE(Condition1)
     if (argsCount == 1)
         return jsTestObjConstructorFunctionOverloadedMethod11(exec);
+#endif
+
     JSValue arg0(exec->argument(0));
+#if ENABLE(Condition1)
     if ((argsCount == 1 && (arg0.isUndefinedOrNull() || arg0.isString() || arg0.isObject())))
         return jsTestObjConstructorFunctionOverloadedMethod12(exec);
+#endif
+
     if (argsCount < 1)
         return throwVMError(exec, createNotEnoughArgumentsError(exec));
     return throwVMTypeError(exec);
 }
-
-#endif
 
 EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionClassMethodWithClamp(ExecState* exec)