Skip to content

Unify the condition form within the asserts #1066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akosthekiss merged 1 commit into from
May 20, 2016
Merged

Unify the condition form within the asserts #1066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions jerry-core/ecma/base/ecma-helpers-conversion.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
*/
#define ECMA_NUMBER_CONVERSION_128BIT_INTEGER_CHECK_PARTS_ARE_32BIT(name) \
{ \
JERRY_ASSERT (name[0] == (uint32_t) name[0]); \
JERRY_ASSERT (name[1] == (uint32_t) name[1]); \
JERRY_ASSERT (name[2] == (uint32_t) name[2]); \
JERRY_ASSERT (name[3] == (uint32_t) name[3]); \
JERRY_ASSERT (name[0] <= UINT32_MAX); \
JERRY_ASSERT (name[1] <= UINT32_MAX); \
JERRY_ASSERT (name[2] <= UINT32_MAX); \
JERRY_ASSERT (name[3] <= UINT32_MAX); \
}

/**
Expand Down
3 changes: 1 addition & 2 deletions jerry-core/ecma/base/ecma-helpers-string.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@
/**
* The length should be representable with int32_t.
*/
JERRY_STATIC_ASSERT ((int32_t) ECMA_STRING_MAX_CONCATENATION_LENGTH ==
ECMA_STRING_MAX_CONCATENATION_LENGTH,
JERRY_STATIC_ASSERT (ECMA_STRING_MAX_CONCATENATION_LENGTH <= INT32_MAX,
ECMA_STRING_MAX_CONCATENATION_LENGTH_should_be_representable_with_int32_t);

/**
Expand Down
4 changes: 2 additions & 2 deletions jerry-core/ecma/builtin-objects/ecma-builtins.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ ecma_builtin_make_function_object_for_routine (ecma_builtin_id_t builtin_id, /**
ecma_property_t *routine_desc_prop_p = ecma_create_internal_property (func_obj_p,
ECMA_INTERNAL_PROPERTY_BUILT_IN_ROUTINE_DESC);

JERRY_ASSERT ((uint32_t) packed_value == packed_value);
JERRY_ASSERT (packed_value <= UINT32_MAX);
ecma_set_internal_property_value (routine_desc_prop_p, (uint32_t) packed_value);

return func_obj_p;
Expand Down Expand Up @@ -523,7 +523,7 @@ ecma_builtin_dispatch_call (ecma_object_t *obj_p, /**< built-in object */
uint64_t routine_id_field = JRT_EXTRACT_BIT_FIELD (uint64_t, builtin_routine_desc,
ECMA_BUILTIN_ROUTINE_ID_BUILT_IN_ROUTINE_ID_POS,
ECMA_BUILTIN_ROUTINE_ID_BUILT_IN_ROUTINE_ID_WIDTH);
JERRY_ASSERT ((uint16_t) routine_id_field == routine_id_field);
JERRY_ASSERT (routine_id_field <= UINT16_MAX);

ecma_builtin_id_t built_in_id = (ecma_builtin_id_t) built_in_id_field;
uint16_t routine_id = (uint16_t) routine_id_field;
Expand Down