Implementing opfunc_instanceof using ecma_op_has_instance for [[HasInstance]] call

This commit is contained in:
Ruben Ayrapetyan
2014-08-22 15:39:23 +04:00
parent 7a20454047
commit 50a1532801
+9 -16
View File
@@ -2210,36 +2210,29 @@ opfunc_instanceof (OPCODE opdata __unused, /**< operation data */
ecma_completion_value_t ret_value; ecma_completion_value_t ret_value;
ECMA_TRY_CATCH (left_value, get_variable_value (int_data, left_var_idx, false), ret_value);
ECMA_TRY_CATCH (right_value, get_variable_value (int_data, right_var_idx, false), ret_value); ECMA_TRY_CATCH (right_value, get_variable_value (int_data, right_var_idx, false), ret_value);
if ((right_value.value.value_type != ECMA_TYPE_OBJECT) if (right_value.value.value_type != ECMA_TYPE_OBJECT)
|| (true /* TODO (check if rval has no [[HasInstance]] property) */))
{ {
ret_value = ecma_make_throw_value (ecma_new_standard_error (ECMA_ERROR_TYPE)); ret_value = ecma_make_throw_value (ecma_new_standard_error (ECMA_ERROR_TYPE));
} }
else else
{ {
ecma_simple_value_t is_in = ECMA_SIMPLE_VALUE_UNDEFINED;
ecma_string_t *to_string_lval = ecma_new_ecma_string_from_lit_index (left_var_idx);
ecma_object_t *right_value_obj_p = ECMA_GET_POINTER (right_value.value.value); ecma_object_t *right_value_obj_p = ECMA_GET_POINTER (right_value.value.value);
if (ecma_op_object_has_property (right_value_obj_p, to_string_lval)) ECMA_TRY_CATCH (is_instance_of,
{ ecma_op_object_has_instance (right_value_obj_p,
is_in = ECMA_SIMPLE_VALUE_TRUE; left_value.value),
} ret_value);
else
{
is_in = ECMA_SIMPLE_VALUE_FALSE;
}
ecma_deref_ecma_string (to_string_lval); ret_value = set_variable_value (int_data, dst_idx, is_instance_of.value);
ret_value = set_variable_value (int_data, ECMA_FINALIZE (is_instance_of);
dst_idx,
ecma_make_simple_value (is_in));
} }
ECMA_FINALIZE (right_value); ECMA_FINALIZE (right_value);
ECMA_FINALIZE (left_value);
return ret_value; return ret_value;
} /* opfunc_instanceof */ } /* opfunc_instanceof */