IDL: Use IdlNullableType wrapper to represent nullable types

Source/bindings/scripts/v8_types.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 21 matching lines @@
 class methods.
 
 Spec:
 http://www.w3.org/TR/WebIDL/#es-type-mapping
 
 Design doc: http://www.chromium.org/developers/design-documents/idl-compiler
 """
 
 import posixpath
 
-from idl_types import IdlTypeBase, IdlType, IdlUnionType, IdlArrayOrSequenceType
+from idl_types import IdlTypeBase, IdlType, IdlUnionType, IdlArrayOrSequenceType, IdlNullableType
 import v8_attributes  # for IdlType.constructor_type_name
 from v8_globals import includes
 
 
 ################################################################################
 # V8-specific handling of IDL types
 ################################################################################
 
 NON_WRAPPER_TYPES = frozenset([
     'CompareHow',
@@ skipping 15 matching lines @@
     'Int32Array': ('int', 'v8::kExternalIntArray'),
     'Uint8Array': ('unsigned char', 'v8::kExternalUnsignedByteArray'),
     'Uint8ClampedArray': ('unsigned char', 'v8::kExternalPixelArray'),
     'Uint16Array': ('unsigned short', 'v8::kExternalUnsignedShortArray'),
     'Uint32Array': ('unsigned int', 'v8::kExternalUnsignedIntArray'),
 }
 
 IdlTypeBase.is_typed_array_element_type = False
 IdlType.is_typed_array_element_type = property(
     lambda self: self.base_type in TYPED_ARRAYS)
+IdlNullableType.is_typed_array_element_type = property(

[Nils Barth (inactive), 2014/08/19 13:53:38]

Remove?

+    lambda self: self.inner_type.is_typed_array_element_type)
 
 
 IdlTypeBase.is_wrapper_type = False
 IdlType.is_wrapper_type = property(
     lambda self: (self.is_interface_type and
                   self.base_type not in NON_WRAPPER_TYPES))
+IdlNullableType.is_wrapper_type = property(

[Nils Barth (inactive), 2014/08/19 13:53:38]

Remove?

+    lambda self: self.inner_type.is_wrapper_type)
 
 
 ################################################################################
 # C++ types
 ################################################################################
 
 CPP_TYPE_SAME_AS_IDL_TYPE = set([
     'double',
     'float',
     'long long',
@@ skipping 141 matching lines @@
 IdlTypeBase.cpp_type_initializer = property(cpp_type_initializer)
 IdlTypeBase.cpp_type_args = cpp_type
 IdlUnionType.cpp_type = property(cpp_type_union)
 IdlUnionType.cpp_type_initializer = property(cpp_type_initializer_union)
 IdlUnionType.cpp_type_args = cpp_type_union
 
 
 IdlTypeBase.native_array_element_type = None
 IdlArrayOrSequenceType.native_array_element_type = property(
     lambda self: self.element_type)
+IdlNullableType.native_array_element_type = property(

[bashi, 2014/08/19 13:51:42]

If we take this approach, can we remove this?

+    lambda self: self.inner_type.native_array_element_type)
 
 
 def cpp_template_type(template, inner_type):
     """Returns C++ template specialized to type, with space added if needed."""
     if inner_type.endswith('>'):
         format_string = '{template}<{inner_type} >'
     else:
         format_string = '{template}<{inner_type}>'
     return format_string.format(template=template, inner_type=inner_type)
 
@@ skipping 23 matching lines @@
 IdlType.implemented_as_interfaces = {}
 
 
 def implemented_as(idl_type):
     base_idl_type = idl_type.base_type
     if base_idl_type in IdlType.implemented_as_interfaces:
         return IdlType.implemented_as_interfaces[base_idl_type]
     return base_idl_type
 
 
-IdlType.implemented_as = property(implemented_as)
+IdlTypeBase.implemented_as = property(implemented_as)
 
 IdlType.set_implemented_as_interfaces = classmethod(
     lambda cls, new_implemented_as_interfaces:
         cls.implemented_as_interfaces.update(new_implemented_as_interfaces))
 
 
 # [GarbageCollected]
 IdlType.garbage_collected_types = set()
 
-IdlTypeBase.is_garbage_collected = False
-IdlType.is_garbage_collected = property(
+IdlTypeBase.is_garbage_collected = property(
     lambda self: self.base_type in IdlType.garbage_collected_types)
 
 IdlType.set_garbage_collected_types = classmethod(
     lambda cls, new_garbage_collected_types:
         cls.garbage_collected_types.update(new_garbage_collected_types))
 
 
 # [WillBeGarbageCollected]
 IdlType.will_be_garbage_collected_types = set()
 
-IdlTypeBase.is_will_be_garbage_collected = False
-IdlType.is_will_be_garbage_collected = property(
+IdlTypeBase.is_will_be_garbage_collected = property(
     lambda self: self.base_type in IdlType.will_be_garbage_collected_types)
 
 IdlType.set_will_be_garbage_collected_types = classmethod(
     lambda cls, new_will_be_garbage_collected_types:
         cls.will_be_garbage_collected_types.update(new_will_be_garbage_collected_types))
 
 
 def gc_type(idl_type):
     if idl_type.is_garbage_collected:
         return 'GarbageCollectedObject'
@@ skipping 64 matching lines @@
         return set()
     return set(['bindings/%s/v8/V8%s.h' % (component_dir[base_idl_type],
                                            base_idl_type)])
 
 IdlType.includes_for_type = property(includes_for_type)
 IdlUnionType.includes_for_type = property(
     lambda self: set.union(*[includes_for_type(member_type)
                              for member_type in self.member_types]))
 IdlArrayOrSequenceType.includes_for_type = property(
     lambda self: self.element_type.includes_for_type)
+IdlNullableType.includes_for_type = property(

[Nils Barth (inactive), 2014/08/19 13:53:38]

Remove?

+    lambda self: self.inner_type.includes_for_type)
 
 
 def add_includes_for_type(idl_type):
     includes.update(idl_type.includes_for_type)
 
 IdlTypeBase.add_includes_for_type = add_includes_for_type
 
 
 def includes_for_interface(interface_name):
     return IdlType(interface_name).includes_for_type
@@ skipping 192 matching lines @@
 
 
 def preprocess_idl_type_and_value(idl_type, cpp_value, extended_attributes):
     """Returns IDL type and value, with preliminary type conversions applied."""
     idl_type = idl_type.preprocessed_type
     if idl_type.name == 'Promise':
         idl_type = IdlType('ScriptValue')
     if idl_type.base_type in ['long long', 'unsigned long long']:
         # long long and unsigned long long are not representable in ECMAScript;
         # we represent them as doubles.
-        idl_type = IdlType('double', is_nullable=idl_type.is_nullable)
+        is_nullable = idl_type.is_nullable
+        idl_type = IdlType('double')
+        if is_nullable:
+            idl_type = IdlNullableType(idl_type)
         cpp_value = 'static_cast<double>(%s)' % cpp_value
     # HTML5 says that unsigned reflected attributes should be in the range
     # [0, 2^31). When a value isn't in this range, a default value (or 0)
     # should be returned instead.
     extended_attributes = extended_attributes or {}
     if ('Reflect' in extended_attributes and
         idl_type.base_type in ['unsigned long', 'unsigned short']):
         cpp_value = cpp_value.replace('getUnsignedIntegralAttribute',
                                       'getIntegralAttribute')
         cpp_value = 'std::max(0, static_cast<int>(%s))' % cpp_value
@@ skipping 112 matching lines @@
 
 def v8_set_return_value_union(idl_type, cpp_value, extended_attributes=None, script_wrappable='', release=False, for_main_world=False):
     # FIXME: Need to revisit the design of union support.
     # http://crbug.com/240176
     return None
 
 
 IdlTypeBase.v8_set_return_value = v8_set_return_value
 IdlUnionType.v8_set_return_value = v8_set_return_value_union
 
-IdlType.release = property(lambda self: self.is_interface_type)
+IdlTypeBase.release = property(lambda self: self.is_interface_type)
 IdlUnionType.release = property(
     lambda self: [member_type.is_interface_type
                   for member_type in self.member_types])
 IdlArrayOrSequenceType.release = False
 
 
 CPP_VALUE_TO_V8_VALUE = {
     # Built-in types
     'Date': 'v8DateOrNaN({cpp_value}, {isolate})',
     'DOMString': 'v8String({isolate}, {cpp_value})',
@@ skipping 33 matching lines @@
 
 
 def literal_cpp_value(idl_type, idl_literal):
     """Converts an expression that is a valid C++ literal for this type."""
     # FIXME: add validation that idl_type and idl_literal are compatible
     literal_value = str(idl_literal)
     if idl_type.base_type in CPP_UNSIGNED_TYPES:
         return literal_value + 'u'
     return literal_value
 
-IdlType.literal_cpp_value = literal_cpp_value
+IdlTypeBase.literal_cpp_value = literal_cpp_value
 
 
 ################################################################################
 # Utility properties for nullable types
 ################################################################################
 
 
 def cpp_type_has_null_value(idl_type):
     # - String types (String/AtomicString) represent null as a null string,
     #   i.e. one for which String::isNull() returns true.
@@ skipping 10 matching lines @@
 
 
 def is_explicit_nullable(idl_type):
     # Nullable type that isn't implicit nullable (see above.) For such types,
     # we use Nullable<T> or similar explicit ways to represent a null value.
     return idl_type.is_nullable and not idl_type.is_implicit_nullable
 
 IdlTypeBase.is_implicit_nullable = property(is_implicit_nullable)
 IdlUnionType.is_implicit_nullable = False
 IdlTypeBase.is_explicit_nullable = property(is_explicit_nullable)