From aeddb1cd88bc7c63b9fa030b49275fc73b4bbe10 Mon Sep 17 00:00:00 2001 From: Akos Kiss Date: Mon, 29 Oct 2018 14:51:59 +0100 Subject: [PATCH] Get rid of `? true : false` (#2575) JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu --- .../ecma/builtin-objects/ecma-builtin-number-prototype.c | 2 +- jerry-core/ecma/operations/ecma-function-object.c | 8 ++++---- jerry-core/parser/js/js-lexer.c | 2 +- jerry-core/parser/js/js-parser-expr.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.c index c69ba0b39..ceada68d1 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.c @@ -650,7 +650,7 @@ ecma_builtin_number_prototype_object_to_fixed (ecma_value_t this_arg, /**< this num_digits + 1, exponent + frac_digits, &exponent, - ecma_number_is_zero (this_num) ? true : false); + ecma_number_is_zero (this_num)); /* Buffer that is used to construct the string. */ int buffer_size = (exponent > 0) ? exponent + frac_digits + 2 : frac_digits + 3; diff --git a/jerry-core/ecma/operations/ecma-function-object.c b/jerry-core/ecma/operations/ecma-function-object.c index 81785ed32..6aa1936cc 100644 --- a/jerry-core/ecma/operations/ecma-function-object.c +++ b/jerry-core/ecma/operations/ecma-function-object.c @@ -666,7 +666,7 @@ ecma_op_function_call (ecma_object_t *func_obj_p, /**< Function object */ const ecma_compiled_code_t *bytecode_data_p = ecma_op_function_get_compiled_code (ext_func_p); #ifndef CONFIG_DISABLE_ES2015_CLASS - bool is_class_constructor = (bytecode_data_p->status_flags & CBC_CODE_FLAGS_CONSTRUCTOR) ? true : false; + bool is_class_constructor = (bool) (bytecode_data_p->status_flags & CBC_CODE_FLAGS_CONSTRUCTOR); if (is_class_constructor && !ecma_op_function_has_construct_flag (arguments_list_p)) { @@ -674,8 +674,8 @@ ecma_op_function_call (ecma_object_t *func_obj_p, /**< Function object */ } #endif /* !CONFIG_DISABLE_ES2015_CLASS */ - bool is_strict = (bytecode_data_p->status_flags & CBC_CODE_FLAGS_STRICT_MODE) ? true : false; - bool is_no_lex_env = (bytecode_data_p->status_flags & CBC_CODE_FLAGS_LEXICAL_ENV_NOT_NEEDED) ? true : false; + bool is_strict = (bool) (bytecode_data_p->status_flags & CBC_CODE_FLAGS_STRICT_MODE); + bool is_no_lex_env = (bool) (bytecode_data_p->status_flags & CBC_CODE_FLAGS_LEXICAL_ENV_NOT_NEEDED); /* 1. */ if (!is_strict) @@ -775,7 +775,7 @@ ecma_op_function_call (ecma_object_t *func_obj_p, /**< Function object */ const ecma_compiled_code_t *bytecode_data_p = ecma_op_arrow_function_get_compiled_code (arrow_func_p); - is_no_lex_env = (bytecode_data_p->status_flags & CBC_CODE_FLAGS_LEXICAL_ENV_NOT_NEEDED) ? true : false; + is_no_lex_env = (bool) (bytecode_data_p->status_flags & CBC_CODE_FLAGS_LEXICAL_ENV_NOT_NEEDED); ecma_object_t *local_env_p = scope_p; diff --git a/jerry-core/parser/js/js-lexer.c b/jerry-core/parser/js/js-lexer.c index 68c6c874a..3003ed660 100644 --- a/jerry-core/parser/js/js-lexer.c +++ b/jerry-core/parser/js/js-lexer.c @@ -2175,7 +2175,7 @@ lexer_construct_regexp_object (parser_context_t *context_p, /**< context */ current_flags); ecma_deref_ecma_string (pattern_str_p); - bool is_throw = ECMA_IS_VALUE_ERROR (completion_value) ? true : false; + bool is_throw = (bool) ECMA_IS_VALUE_ERROR (completion_value); ecma_free_value (completion_value); diff --git a/jerry-core/parser/js/js-parser-expr.c b/jerry-core/parser/js/js-parser-expr.c index c76c2a233..5f61d8626 100644 --- a/jerry-core/parser/js/js-parser-expr.c +++ b/jerry-core/parser/js/js-parser-expr.c @@ -418,7 +418,7 @@ parser_parse_class_literal (parser_context_t *context_p) /**< context */ JERRY_ASSERT (context_p->last_cbc_opcode == CBC_PUSH_LITERAL); cbc_ext_opcode_t opcode; - bool is_static = (status_flags & PARSER_CLASS_STATIC_FUNCTION) ? true : false; + bool is_static = (bool) (status_flags & PARSER_CLASS_STATIC_FUNCTION); if (is_computed) { @@ -1334,7 +1334,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ break; } - bool is_static = (context_p->status_flags & PARSER_CLASS_STATIC_FUNCTION) ? true : false; + bool is_static = (bool) (context_p->status_flags & PARSER_CLASS_STATIC_FUNCTION); parser_emit_cbc_ext (context_p, is_static ? CBC_EXT_PUSH_STATIC_SUPER : CBC_EXT_PUSH_SUPER); break; }