Improve handling of failed integer type conversions.

Source/bindings/scripts/unstable/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 124 matching lines @@
 
 def sequence_type(idl_type):
     matched = re.match(r'sequence<([\w\s]+)>', idl_type)
     return matched and matched.group(1)
 
 
 def is_union_type(idl_type):
     return isinstance(idl_type, idl_definitions.IdlUnionType)
 
 
+def is_integer_type(idl_type):
+    return any(idl_type in s for s in [CPP_INT_TYPES, CPP_UNSIGNED_TYPES, CPP_LONG_LONG_TYPES])

[Nils Barth (inactive), 2014/01/06 02:58:09]

Simpler:
return idl_type in CPP_INT_TYPES | CPP_UNSIGNED_TYPES | CPP_LONG_LONG_TYPES

Since this is IDL (independent of C++), could we instead split off INTEGER_TYPES
from BASIC_TYPES, as:
BASIC_TYPES = set([
    # Built-in, non-composite, non-object data types
    # (integer types are listed separately below)
    # http://www.w3.org/TR/WebIDL/#dfn-primitive-type
    'boolean',
    'float',
    # unrestricted float is not supported
    'double',
    # unrestricted double is not supported
    # http://www.w3.org/TR/WebIDL/#idl-types
    'DOMString',
    'Date',
    # http://www.w3.org/TR/WebIDL/#es-type-mapping
    'void',
])
INTEGER_TYPES = set([
    # http://www.w3.org/TR/WebIDL/#dfn-integer-type
    'byte',
    'octet',
    'short',
    'unsigned short',
    # int and unsigned are not IDL types
    'long',
    'unsigned long',
    'long long',
    'unsigned long long',
])
BASIC_TYPES.update(INTEGER_TYPES)

...and then we have these two functions:
def is_basic_type(idl_type):
    return idl_type in BASIC_TYPES

def is_integer_type(idl_type):
    return idl_type in INTEGER_TYPES

[sof, 2014/01/06 21:01:25]

Adopted wholesale; the transformation added here is over IDL types, not over
what it maps to in C++.

+
 ################################################################################
 # V8-specific type handling
 ################################################################################
 
 DOM_NODE_TYPES = set([
     'Attr',
     'CDATASection',
     'CharacterData',
     'Comment',
     'Document',
@@ skipping 75 matching lines @@
 ])
 CPP_SPECIAL_CONVERSION_RULES = {
     'CompareHow': 'Range::CompareHow',
     'Date': 'double',
     'Dictionary': 'Dictionary',
     'EventHandler': 'EventListener*',
     'Promise': 'ScriptPromise',
     'ScriptValue': 'ScriptValue',
     'boolean': 'bool',
 }
+CPP_LONG_LONG_TYPES = set([

[Nils Barth (inactive), 2014/01/06 02:58:09]

Could you put this set up *above* CPP_SPECIAL_CONVERSION_RULES?
(So the 3 sets of types are together.)

Actually, we don't need this if we instead use INTEGER_TYPES (above),
as this isn't C++-specific.

[sof, 2014/01/06 21:01:25]

Removed.

+    'long long',
+    'unsigned long long',
+])
 
 def cpp_type(idl_type, extended_attributes=None, used_as_argument=False):
     """Returns C++ type corresponding to IDL type."""
     def string_mode():
         # FIXME: the Web IDL spec requires 'EmptyString', not 'NullString',
         # but we use NullString for performance.
         if extended_attributes.get('TreatNullAs') != 'NullString':
             return ''
         if extended_attributes.get('TreatUndefinedAs') != 'NullString':
             return 'WithNullCheck'
@@ skipping 120 matching lines @@
 
 def v8_value_to_cpp_value(idl_type, extended_attributes, v8_value, index):
     this_array_or_sequence_type = array_or_sequence_type(idl_type)
     if this_array_or_sequence_type:
         return v8_value_to_cpp_value_array_or_sequence(this_array_or_sequence_type, v8_value, index)
 
     idl_type = preprocess_idl_type(idl_type)
     add_includes_for_type(idl_type)
 
     if 'EnforceRange' in extended_attributes:
-        arguments = ', '.join([v8_value, 'EnforceRange', 'ok'])
-    else:  # NormalConversion
+        arguments = ', '.join([v8_value, 'EnforceRange', 'exceptionState'])
+    elif is_integer_type(idl_type):  # NormalConversion

[Nils Barth (inactive), 2014/01/06 02:58:09]

Comment '# NormalConversion' should go on the default 'else:' line.

[sof, 2014/01/06 21:01:25]

Isn't this the correct placement for it? i.e., this is for NormalConversion over
integer types.

[Nils Barth (inactive), 2014/01/07 02:11:35]

OIC, you're right - sorry, thanks!
(NormalConversion as opposed to EnforceRange for integer types;
 for non-integer types this doesn't make sense.)

+        arguments = ', '.join([v8_value, 'exceptionState'])
+    else:
         arguments = v8_value
 
     if idl_type in V8_VALUE_TO_CPP_VALUE:
         cpp_expression_format = V8_VALUE_TO_CPP_VALUE[idl_type]
     elif is_typed_array_type(idl_type):
         cpp_expression_format = (
             '{v8_value}->Is{idl_type}() ? '
             'V8{idl_type}::toNative(v8::Handle<v8::{idl_type}>::Cast({v8_value})) : 0')
     else:
         cpp_expression_format = (
@@ skipping 22 matching lines @@
     return expression
 
 
 def v8_value_to_local_cpp_value(idl_type, extended_attributes, v8_value, variable_name, index=None):
     """Returns an expression that converts a V8 value to a C++ value and stores it as a local value."""
     this_cpp_type = cpp_type(idl_type, extended_attributes=extended_attributes, used_as_argument=True)
 
     idl_type = preprocess_idl_type(idl_type)
     if idl_type == 'DOMString':
         format_string = 'V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID({cpp_type}, {variable_name}, {cpp_value})'
-    elif 'EnforceRange' in extended_attributes:
-        format_string = 'V8TRYCATCH_WITH_TYPECHECK_VOID({cpp_type}, {variable_name}, {cpp_value}, info.GetIsolate())'
+    elif is_integer_type(idl_type):
+        format_string = 'V8TRYCATCH_EXCEPTION_VOID({cpp_type}, {variable_name}, {cpp_value}, exceptionState)'
     else:
         format_string = 'V8TRYCATCH_VOID({cpp_type}, {variable_name}, {cpp_value})'
 
     cpp_value = v8_value_to_cpp_value(idl_type, extended_attributes, v8_value, index)
     return format_string.format(cpp_type=this_cpp_type, cpp_value=cpp_value, variable_name=variable_name)
 
 
 ################################################################################
 # C++ -> V8
 ################################################################################
@@ skipping 139 matching lines @@
 
 
 def cpp_value_to_v8_value(idl_type, cpp_value, isolate='info.GetIsolate()', creation_context='', extended_attributes=None):
     """Returns an expression that converts a C++ value to a V8 value."""
     # the isolate parameter is needed for callback interfaces
     idl_type, cpp_value = preprocess_idl_type_and_value(idl_type, cpp_value, extended_attributes)
     this_v8_conversion_type = v8_conversion_type(idl_type, extended_attributes)
     format_string = CPP_VALUE_TO_V8_VALUE[this_v8_conversion_type]
     statement = format_string.format(cpp_value=cpp_value, isolate=isolate, creation_context=creation_context)
     return statement