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 39 matching lines @@
 ################################################################################
 
 BASIC_TYPES = set([
     # Built-in, non-composite, non-object data types
     # http://www.w3.org/TR/WebIDL/#dfn-primitive-type
     'boolean',
     'float',
     # unrestricted float is not supported
     'double',
     # unrestricted double is not supported
-    # integer types
+    # 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',
-    # http://www.w3.org/TR/WebIDL/#idl-types
-    'DOMString',
-    'Date',
-    # http://www.w3.org/TR/WebIDL/#es-type-mapping
-    'void',
 ])
+BASIC_TYPES.update(INTEGER_TYPES)
 
 enum_types = {}  # name -> values
 callback_function_types = set()
 
 
 def array_or_sequence_type(idl_type):
     return array_type(idl_type) or sequence_type(idl_type)
 
 
 def array_type(idl_type):
     matched = re.match(r'([\w\s]+)\[\]', idl_type)
     return matched and matched.group(1)
 
 
 def is_basic_type(idl_type):
     return idl_type in BASIC_TYPES
 
 
+def is_integer_type(idl_type):
+    return idl_type in INTEGER_TYPES
+
+
 def is_callback_function_type(idl_type):
     return idl_type in callback_function_types
 
 
 def set_callback_function_types(callback_functions):
     callback_function_types.update(callback_functions.keys())
 
 
 def is_composite_type(idl_type):
     return (idl_type == 'any' or
@@ skipping 265 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
+        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