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

Source/bindings/scripts/unstable/v8_interface.py

 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 506 matching lines @@
         return 0
     return min(constructor['number_of_required_arguments']
                for constructor in constructors)
 
 
 ################################################################################
 # Special operations (methods)
 # http://heycam.github.io/webidl/#idl-special-operations
 ################################################################################
 
-def property_getter(getter):
+def property_getter(getter, cpp_arguments):
     def is_null_expression(idl_type):
+        if v8_types.is_union_type(idl_type):
+            return ' && '.join('!result%sEnabled' % i
+                               for i, _ in
+                               enumerate(idl_type.union_member_types))
         if idl_type == 'DOMString':
-            return 'element.isNull()'
+            return 'result.isNull()'
         if is_interface_type(idl_type):
-            return '!element'
+            return '!result'
         return ''
 
-    def union_arguments(idl_type):
-        """Return list of ['element0Enabled', 'element0', 'element1Enabled', ...]"""
-        return [arg
-                for i in range(len(idl_type.union_member_types))
-                for arg in ['element%sEnabled' % i, 'element%s' % i]]
-
     idl_type = getter.idl_type
     extended_attributes = getter.extended_attributes
+    is_raises_exception = 'RaisesException' in extended_attributes
 
-    is_union_type = v8_types.is_union_type(idl_type)
-    if is_union_type:
+    if v8_types.is_union_type(idl_type):
         release = [v8_types.is_interface_type(union_member_type)
                    for union_member_type in idl_type.union_member_types]
     else:
         release = v8_types.is_interface_type(idl_type)
 
+    # FIXME: make more generic, so can use v8_methods.cpp_value
+    cpp_method_name = 'imp->%s' % cpp_name(getter)
+
+    if is_raises_exception:
+        cpp_arguments.append('exceptionState')
+    this_union_arguments = v8_methods.union_arguments(idl_type)
+    if this_union_arguments:
+        cpp_arguments.extend(this_union_arguments)
+
+    cpp_value = '%s(%s)' % (cpp_method_name, ', '.join(cpp_arguments))
+
     return {
         'cpp_type': v8_types.cpp_type(idl_type),
+        'cpp_value': cpp_value,
         'is_custom':
             'Custom' in extended_attributes and
             (not extended_attributes['Custom'] or
              has_extended_attribute_value(getter, 'Custom', 'PropertyGetter')),
         'is_custom_property_enumerator': has_extended_attribute_value(
             getter, 'Custom', 'PropertyEnumerator'),
         'is_custom_property_query': has_extended_attribute_value(
             getter, 'Custom', 'PropertyQuery'),
         'is_enumerable': 'NotEnumerable' not in extended_attributes,
         'is_null_expression': is_null_expression(idl_type),
-        'is_raises_exception': 'RaisesException' in extended_attributes,
+        'is_raises_exception': is_raises_exception,
         'name': cpp_name(getter),
-        'union_arguments': union_arguments(idl_type) if is_union_type else None,
-        'v8_set_return_value': v8_types.v8_set_return_value(idl_type, 'element', extended_attributes=extended_attributes, script_wrappable='collection', release=release),
+        'union_arguments': v8_methods.union_arguments(idl_type),
+        'v8_set_return_value': v8_types.v8_set_return_value(idl_type, 'result', extended_attributes=extended_attributes, script_wrappable='imp', release=release),
     }
 
 
 def property_setter(setter):
     idl_type = setter.arguments[1].idl_type
     extended_attributes = setter.extended_attributes
     is_raises_exception = 'RaisesException' in extended_attributes
     return {
         'has_strict_type_checking':
             'StrictTypeChecking' in extended_attributes and
@@ skipping 34 matching lines @@
         # getter TYPE [OPTIONAL_IDENTIFIER](unsigned long ARG1)
         getter = next(
             method
             for method in interface.operations
             if ('getter' in method.specials and
                 len(method.arguments) == 1 and
                 method.arguments[0].idl_type == 'unsigned long'))
     except StopIteration:
         return None
 
-    return property_getter(getter)
+    return property_getter(getter, ['index'])
 
 
 def indexed_property_setter(interface):
     try:
         # Find indexed property setter, if present; has form:
         # setter RETURN_TYPE [OPTIONAL_IDENTIFIER](unsigned long ARG1, ARG_TYPE ARG2)
         setter = next(
             method
             for method in interface.operations
             if ('setter' in method.specials and
@@ skipping 32 matching lines @@
         # getter TYPE [OPTIONAL_IDENTIFIER](DOMString ARG1)
         getter = next(
             method
             for method in interface.operations
             if ('getter' in method.specials and
                 len(method.arguments) == 1 and
                 method.arguments[0].idl_type == 'DOMString'))
     except StopIteration:
         return None
 
-    return property_getter(getter)
+    getter.name = getter.name or 'anonymousNamedGetter'
+    return property_getter(getter, ['propertyName'])
 
 
 def named_property_setter(interface):
     try:
         # Find named property setter, if present; has form:
         # setter RETURN_TYPE [OPTIONAL_IDENTIFIER](DOMString ARG1, ARG_TYPE ARG2)
         setter = next(
             method
             for method in interface.operations
             if ('setter' in method.specials and
@@ skipping 12 matching lines @@
         deleter = next(
             method
             for method in interface.operations
             if ('deleter' in method.specials and
                 len(method.arguments) == 1 and
                 method.arguments[0].idl_type == 'DOMString'))
     except StopIteration:
         return None
 
     return property_deleter(deleter)