IDL compiler: sync Python to r166688 (and clean up special operations+union code)

Source/bindings/scripts/code_generator_v8.pm

 # Copyright (C) 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
 # Copyright (C) 2006 Anders Carlsson <andersca@mac.com>
 # Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
 # Copyright (C) 2006 Alexey Proskuryakov <ap@webkit.org>
 # Copyright (C) 2006 Apple Computer, Inc.
 # Copyright (C) 2007, 2008, 2009, 2012 Google Inc.
 # Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
 # Copyright (C) Research In Motion Limited 2010. All rights reserved.
 # Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
 # Copyright (C) 2012 Ericsson AB. All rights reserved.
@@ skipping 3686 matching lines @@
 sub GenerateImplementationIndexedPropertyGetter
 {
     my $interface = shift;
     my $indexedGetterFunction = shift;
     my $implClassName = GetImplName($interface);
     my $v8ClassName = GetV8ClassName($interface);
     my $methodName = GetImplName($indexedGetterFunction) || "anonymousIndexedGetter";
 
     my $returnType = $indexedGetterFunction->type;
     my $nativeType = GetNativeType($returnType);
-    my $nativeValue = "element";
+    my $nativeValue = "result";
     $nativeValue .= ".release()" if (IsRefPtrType($returnType));
-    my $isNull = GenerateIsNullExpression($returnType, "element");
-    my $returnJSValueCode = NativeToJSValue($indexedGetterFunction->type, $indexedGetterFunction->extendedAttributes, $nativeValue, "    ", "", "info.GetIsolate()", "info", "collection", "", "return");
+    my $isNull = GenerateIsNullExpression($returnType, "result");
+    my $returnJSValueCode = NativeToJSValue($indexedGetterFunction->type, $indexedGetterFunction->extendedAttributes, $nativeValue, "    ", "", "info.GetIsolate()", "info", "imp", "", "return");
     my $raisesExceptions = $indexedGetterFunction->extendedAttributes->{"RaisesException"};
-    my $methodCallCode = GenerateMethodCall($returnType, "element", "collection->${methodName}", "index", $raisesExceptions);
+    my $methodCallCode = GenerateMethodCall($returnType, "result", "imp->${methodName}", "index", $raisesExceptions);
     my $getterCode = "static void indexedPropertyGetter(uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& info)\n";
     $getterCode .= "{\n";
-    $getterCode .= "    ${implClassName}* collection = ${v8ClassName}::toNative(info.Holder());\n";
+    $getterCode .= "    ${implClassName}* imp = ${v8ClassName}::toNative(info.Holder());\n";
     if ($raisesExceptions) {
         $getterCode .= "    ExceptionState exceptionState(info.Holder(), info.GetIsolate());\n";
     }
     $getterCode .= $methodCallCode . "\n";
     if ($raisesExceptions) {
         $getterCode .= "    if (exceptionState.throwIfNeeded())\n";
         $getterCode .= "        return;\n";
     }
     if (IsUnionType($returnType)) {
         $getterCode .= "${returnJSValueCode}\n";
@@ skipping 78 matching lines @@
 
     my $type = $indexedSetterFunction->parameters->[1]->type;
     my $raisesExceptions = $indexedSetterFunction->extendedAttributes->{"RaisesException"};
     my $treatNullAs = $indexedSetterFunction->parameters->[1]->extendedAttributes->{"TreatNullAs"};
     my $treatUndefinedAs = $indexedSetterFunction->parameters->[1]->extendedAttributes->{"TreatUndefinedAs"};
 
     my $code = "static void indexedPropertySetter(uint32_t index, v8::Local<v8::Value> jsValue, const v8::PropertyCallbackInfo<v8::Value>& info)\n";
     $code .= "{\n";
 
     my $asSetterValue = 0;
-    $code .= "    ${implClassName}* collection = ${v8ClassName}::toNative(info.Holder());\n";
+    $code .= "    ${implClassName}* imp = ${v8ClassName}::toNative(info.Holder());\n";
     $code .= JSValueToNativeStatement($indexedSetterFunction->parameters->[1]->type, $indexedSetterFunction->extendedAttributes, $asSetterValue, "jsValue", "propertyValue", "    ", "info.GetIsolate()");
 
     my $extraArguments = "";
     if ($raisesExceptions || IsIntegerType($type)) {
         $code .= "    ExceptionState exceptionState(info.Holder(), info.GetIsolate());\n";
         if ($raisesExceptions) {
             $extraArguments = ", exceptionState";
         }
     }
 
     if ($indexedSetterFunction->extendedAttributes->{"StrictTypeChecking"} && IsWrapperType($type)) {
         $code .= <<END;
     if (!isUndefinedOrNull(jsValue) && !V8${type}::hasInstance(jsValue, info.GetIsolate())) {
         exceptionState.throwTypeError("The provided value is not of type '$type'.");
         exceptionState.throwIfNeeded();
         return;
     }
 END
     }
 
-    $code .= "    bool result = collection->${methodName}(index, propertyValue$extraArguments);\n";
+    $code .= "    bool result = imp->${methodName}(index, propertyValue$extraArguments);\n";
 
     if ($raisesExceptions) {
         $code .= "    if (exceptionState.throwIfNeeded())\n";
         $code .= "        return;\n";
     }
     $code .= "    if (!result)\n";
     $code .= "        return;\n";
     $code .= "    v8SetReturnValue(info, jsValue);\n";
     $code .= "}\n\n";
     $implementation{nameSpaceInternal}->add($code);
@@ skipping 205 matching lines @@
             $code .= "    bool ${unionMemberEnabledVariable} = false;\n";
             $code .= "    ${nativeType} ${unionMemberVariable};\n";
             push @extraArguments, $unionMemberEnabledVariable;
             push @extraArguments, $unionMemberVariable;
         }
         push @arguments, @extraArguments;
         $code .= "    ${functionExpression}(" . (join ", ", @arguments) . ");";
         return $code;
     } else {
         my $nativeType = GetNativeType($returnType);
-        return "    ${nativeType} element = ${functionExpression}(" . (join ", ", @arguments) . ");"
+        return "    ${nativeType} result = ${functionExpression}(" . (join ", ", @arguments) . ");"
     }
 }
 
 sub GenerateImplementationNamedPropertyGetter
 {
     my $interface = shift;
     my $namedGetterFunction = shift;
     my $implClassName = GetImplName($interface);
     my $v8ClassName = GetV8ClassName($interface);
     my $methodName = GetImplName($namedGetterFunction) || "anonymousNamedGetter";
 
     my $returnType = $namedGetterFunction->type;
-    my $isNull = GenerateIsNullExpression($returnType, "element");
-    my $nativeValue = "element";
+    my $isNull = GenerateIsNullExpression($returnType, "result");
+    my $nativeValue = "result";
     $nativeValue .= ".release()" if (IsRefPtrType($returnType));
-    my $returnJSValueCode = NativeToJSValue($namedGetterFunction->type, $namedGetterFunction->extendedAttributes, $nativeValue, "    ", "", "info.GetIsolate()", "info", "collection", "", "return");
+    my $returnJSValueCode = NativeToJSValue($namedGetterFunction->type, $namedGetterFunction->extendedAttributes, $nativeValue, "    ", "", "info.GetIsolate()", "info", "imp", "", "return");
     my $raisesExceptions = $namedGetterFunction->extendedAttributes->{"RaisesException"};
-    my $methodCallCode = GenerateMethodCall($returnType, "element", "collection->${methodName}", "propertyName", $raisesExceptions);
+    my $methodCallCode = GenerateMethodCall($returnType, "result", "imp->${methodName}", "propertyName", $raisesExceptions);
 
     my $code = "static void namedPropertyGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)\n";
     $code .= "{\n";
     if (!$interface->extendedAttributes->{"OverrideBuiltins"}) {
         $code .= "    if (!info.Holder()->GetRealNamedPropertyInPrototypeChain(name).IsEmpty())\n";
         $code .= "        return;\n";
         $code .= "    if (info.Holder()->HasRealNamedCallbackProperty(name))\n";
         $code .= "        return;\n";
         $code .= "    if (info.Holder()->HasRealNamedProperty(name))\n";
         $code .= "        return;\n";
         $code .= "\n";
     }
-    $code .= "    ${implClassName}* collection = ${v8ClassName}::toNative(info.Holder());\n";
+    $code .= "    ${implClassName}* imp = ${v8ClassName}::toNative(info.Holder());\n";
     $code .= "    AtomicString propertyName = toCoreAtomicString(name);\n";
     if ($raisesExceptions) {
         $code .= "    ExceptionState exceptionState(info.Holder(), info.GetIsolate());\n";
     }
     $code .= $methodCallCode . "\n";
     if ($raisesExceptions) {
         $code .= "    if (exceptionState.throwIfNeeded())\n";
         $code .= "        return;\n";
     }
     $code .= "    if (${isNull})\n";
@@ skipping 23 matching lines @@
         $code .= "    if (!info.Holder()->GetRealNamedPropertyInPrototypeChain(name).IsEmpty())\n";
         $code .= "        return;\n";
         $code .= "    if (info.Holder()->HasRealNamedCallbackProperty(name))\n";
         $code .= "        return;\n";
         $code .= "    if (info.Holder()->HasRealNamedProperty(name))\n";
         $code .= "        return;\n";
         $code .= "\n";
     }
 
     my $asSetterValue = 0;
-    $code .= "    ${implClassName}* collection = ${v8ClassName}::toNative(info.Holder());\n";
+    $code .= "    ${implClassName}* imp = ${v8ClassName}::toNative(info.Holder());\n";
     $code .= JSValueToNativeStatement($namedSetterFunction->parameters->[0]->type, $namedSetterFunction->extendedAttributes, $asSetterValue, "name", "propertyName", "    ", "info.GetIsolate()");
     $code .= JSValueToNativeStatement($namedSetterFunction->parameters->[1]->type, $namedSetterFunction->extendedAttributes, $asSetterValue, "jsValue", "propertyValue", "    ", "info.GetIsolate()");
 
     my $extraArguments = "";
     if ($raisesExceptions || IsIntegerType($type)) {
         $code .= "    ExceptionState exceptionState(info.Holder(), info.GetIsolate());\n";
         if ($raisesExceptions) {
             $extraArguments = ", exceptionState";
         }
     }
 
-    $code .= "    bool result = collection->$methodName(propertyName, propertyValue$extraArguments);\n";
+    $code .= "    bool result = imp->$methodName(propertyName, propertyValue$extraArguments);\n";
     if ($raisesExceptions) {
         $code .= "    if (exceptionState.throwIfNeeded())\n";
         $code .= "        return;\n";
     }
     $code .= "    if (!result)\n";
     $code .= "        return;\n";
     $code .= "    v8SetReturnValue(info, jsValue);\n";
     $code .= "}\n\n";
     $implementation{nameSpaceInternal}->add($code);
 }
 
 sub GenerateImplementationIndexedPropertyDeleter
 {
     my $interface = shift;
     my $indexedDeleterFunction = shift;
     my $implClassName = GetImplName($interface);
     my $v8ClassName = GetV8ClassName($interface);
     my $methodName = GetImplName($indexedDeleterFunction) || "anonymousIndexedDeleter";
 
     my $raisesExceptions = $indexedDeleterFunction->extendedAttributes->{"RaisesException"};
 
     my $code = "static void indexedPropertyDeleter(uint32_t index, const v8::PropertyCallbackInfo<v8::Boolean>& info)\n";
     $code .= "{\n";
-    $code .= "    ${implClassName}* collection = ${v8ClassName}::toNative(info.Holder());\n";
+    $code .= "    ${implClassName}* imp = ${v8ClassName}::toNative(info.Holder());\n";
     my $extraArguments = "";
     if ($raisesExceptions) {
         $code .= "    ExceptionState exceptionState(info.Holder(), info.GetIsolate());\n";
         $extraArguments = ", exceptionState";
     }
-    $code .= "    DeleteResult result = collection->${methodName}(index$extraArguments);\n";
+    $code .= "    DeleteResult result = imp->${methodName}(index$extraArguments);\n";
     if ($raisesExceptions) {
         $code .= "    if (exceptionState.throwIfNeeded())\n";
         $code .= "        return;\n";
     }
     $code .= "    if (result != DeleteUnknownProperty)\n";
     $code .= "        return v8SetReturnValueBool(info, result == DeleteSuccess);\n";
     $code .= "}\n\n";
     $implementation{nameSpaceInternal}->add($code);
 }
 
 sub GenerateImplementationNamedPropertyDeleter
 {
     my $interface = shift;
     my $namedDeleterFunction = shift;
     my $implClassName = GetImplName($interface);
     my $v8ClassName = GetV8ClassName($interface);
     my $methodName = GetImplName($namedDeleterFunction) || "anonymousNamedDeleter";
 
     my $raisesExceptions = $namedDeleterFunction->extendedAttributes->{"RaisesException"};
 
     my $code = "static void namedPropertyDeleter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Boolean>& info)\n";
     $code .= "{\n";
-    $code .= "    ${implClassName}* collection = ${v8ClassName}::toNative(info.Holder());\n";
+    $code .= "    ${implClassName}* imp = ${v8ClassName}::toNative(info.Holder());\n";
     $code .= "    AtomicString propertyName = toCoreAtomicString(name);\n";
     my $extraArguments = "";
     if ($raisesExceptions) {
         $code .= "    ExceptionState exceptionState(info.Holder(), info.GetIsolate());\n";
         $extraArguments .= ", exceptionState";
     }
-    $code .= "    DeleteResult result = collection->${methodName}(propertyName$extraArguments);\n";
+    $code .= "    DeleteResult result = imp->${methodName}(propertyName$extraArguments);\n";
     if ($raisesExceptions) {
         $code .= "    if (exceptionState.throwIfNeeded())\n";
         $code .= "        return;\n";
     }
     $code .= "    if (result != DeleteUnknownProperty)\n";
     $code .= "        return v8SetReturnValueBool(info, result == DeleteSuccess);\n";
     $code .= "}\n\n";
     $implementation{nameSpaceInternal}->add($code);
 }
 
 sub GenerateImplementationNamedPropertyEnumerator
 {
     my $interface = shift;
     my $implClassName = GetImplName($interface);
     my $v8ClassName = GetV8ClassName($interface);
 
     $implementation{nameSpaceInternal}->add(<<END);
 static void namedPropertyEnumerator(const v8::PropertyCallbackInfo<v8::Array>& info)
 {
-    ${implClassName}* collection = ${v8ClassName}::toNative(info.Holder());
+    ${implClassName}* imp = ${v8ClassName}::toNative(info.Holder());
     Vector<String> names;
     ExceptionState exceptionState(info.Holder(), info.GetIsolate());
-    collection->namedPropertyEnumerator(names, exceptionState);
+    imp->namedPropertyEnumerator(names, exceptionState);
     if (exceptionState.throwIfNeeded())
         return;
     v8::Handle<v8::Array> v8names = v8::Array::New(info.GetIsolate(), names.size());
     for (size_t i = 0; i < names.size(); ++i)
         v8names->Set(v8::Integer::New(info.GetIsolate(), i), v8String(info.GetIsolate(), names[i]));
     v8SetReturnValue(info, v8names);
 }
 
 END
 }
 
 sub GenerateImplementationNamedPropertyQuery
 {
     my $interface = shift;
     my $implClassName = GetImplName($interface);
     my $v8ClassName = GetV8ClassName($interface);
 
     $implementation{nameSpaceInternal}->add(<<END);
 static void namedPropertyQuery(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Integer>& info)
 {
-    ${implClassName}* collection = ${v8ClassName}::toNative(info.Holder());
+    ${implClassName}* imp = ${v8ClassName}::toNative(info.Holder());
     AtomicString propertyName = toCoreAtomicString(name);
     ExceptionState exceptionState(info.Holder(), info.GetIsolate());
-    bool result = collection->namedPropertyQuery(propertyName, exceptionState);
+    bool result = imp->namedPropertyQuery(propertyName, exceptionState);
     if (exceptionState.throwIfNeeded())
         return;
     if (!result)
         return;
     v8SetReturnValueInt(info, v8::None);
 }
 
 END
 }
 
@@ skipping 1461 matching lines @@
             my $unionMemberVariable = $nativeValue . $i;
             my $unionMemberEnabledVariable = $nativeValue . $i . "Enabled";
             my $unionMemberNativeValue = $unionMemberVariable;
             $unionMemberNativeValue .= ".release()" if (IsRefPtrType($unionMemberType));
             my $returnJSValueCode = NativeToJSValue($unionMemberType, $extendedAttributes, $unionMemberNativeValue, $indent . "    ", $receiver, $getIsolate, $getCallbackInfo, $getScriptWrappable, $forMainWorldSuffix, $returnValueArg);
             my $code = "";
             if ($isReturnValue) {
               $code .= "${indent}if (${unionMemberEnabledVariable}) {\n";
               $code .= "${returnJSValueCode}\n";
               $code .= "${indent}    return;\n";
-              $code .= "${indent}}\n";
+              $code .= "${indent}}";
             } else {
               $code .= "${indent}if (${unionMemberEnabledVariable})\n";
               $code .= "${returnJSValueCode}";
             }
             push @codes, $code;
         }
         if ($isReturnValue) {
             # Fall back to returning null if none of the union members results are returned.
             push @codes, "${indent}v8SetReturnValueNull(${getCallbackInfo});";
         }
@@ skipping 735 matching lines @@
         if ($parameter->type eq "SerializedScriptValue") {
             return 1;
         } elsif (IsIntegerType($parameter->type)) {
             return 1;
         }
     }
     return 0;
 }
 
 1;