diff --git a/jerry-core/api/jerry-debugger-transport.c b/jerry-core/api/jerry-debugger-transport.c index 5b3841fe6..f3afd8887 100644 --- a/jerry-core/api/jerry-debugger-transport.c +++ b/jerry-core/api/jerry-debugger-transport.c @@ -17,7 +17,7 @@ #include "jcontext.h" #include "jerryscript.h" -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER /** * Minimum number of bytes transmitted or received. @@ -247,4 +247,4 @@ jerry_debugger_transport_sleep (void) jerry_port_sleep (JERRY_DEBUGGER_TRANSPORT_TIMEOUT); } /* jerry_debugger_transport_sleep */ -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ diff --git a/jerry-core/api/jerry-debugger.c b/jerry-core/api/jerry-debugger.c index 7a59fcaa7..12afd0410 100644 --- a/jerry-core/api/jerry-debugger.c +++ b/jerry-core/api/jerry-debugger.c @@ -26,11 +26,11 @@ bool jerry_debugger_is_connected (void) { -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER return JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED; -#else /* !ENABLED (JERRY_DEBUGGER) */ +#else /* !JERRY_DEBUGGER */ return false; -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ } /* jerry_debugger_is_connected */ /** @@ -39,14 +39,14 @@ jerry_debugger_is_connected (void) void jerry_debugger_stop (void) { -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if ((JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) && !(JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_BREAKPOINT_MODE)) { JERRY_DEBUGGER_SET_FLAGS (JERRY_DEBUGGER_VM_STOP); JERRY_CONTEXT (debugger_stop_context) = NULL; } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ } /* jerry_debugger_stop */ /** @@ -55,14 +55,14 @@ jerry_debugger_stop (void) void jerry_debugger_continue (void) { -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if ((JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) && !(JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_BREAKPOINT_MODE)) { JERRY_DEBUGGER_CLEAR_FLAGS (JERRY_DEBUGGER_VM_STOP); JERRY_CONTEXT (debugger_stop_context) = NULL; } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ } /* jerry_debugger_continue */ /** @@ -71,7 +71,7 @@ jerry_debugger_continue (void) void jerry_debugger_stop_at_breakpoint (bool enable_stop_at_breakpoint) /**< enable/disable stop at breakpoint */ { -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED && !(JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_BREAKPOINT_MODE)) { @@ -84,9 +84,9 @@ jerry_debugger_stop_at_breakpoint (bool enable_stop_at_breakpoint) /**< enable/d JERRY_DEBUGGER_CLEAR_FLAGS (JERRY_DEBUGGER_VM_IGNORE); } } -#else /* !ENABLED (JERRY_DEBUGGER) */ +#else /* !JERRY_DEBUGGER */ JERRY_UNUSED (enable_stop_at_breakpoint); -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ } /* jerry_debugger_stop_at_breakpoint */ /** @@ -104,7 +104,7 @@ jerry_debugger_wait_for_client_source (jerry_debugger_wait_for_source_callback_t { *return_value = jerry_create_undefined (); -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if ((JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) && !(JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_BREAKPOINT_MODE)) { @@ -176,12 +176,12 @@ jerry_debugger_wait_for_client_source (jerry_debugger_wait_for_source_callback_t } return JERRY_DEBUGGER_SOURCE_RECEIVE_FAILED; -#else /* !ENABLED (JERRY_DEBUGGER) */ +#else /* !JERRY_DEBUGGER */ JERRY_UNUSED (callback_p); JERRY_UNUSED (user_p); return JERRY_DEBUGGER_SOURCE_RECEIVE_FAILED; -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ } /* jerry_debugger_wait_for_client_source */ /** @@ -192,7 +192,7 @@ void jerry_debugger_send_output (const jerry_char_t *buffer, /**< buffer */ jerry_size_t str_size) /**< string size */ { -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) { jerry_debugger_send_string (JERRY_DEBUGGER_OUTPUT_RESULT, @@ -200,10 +200,10 @@ jerry_debugger_send_output (const jerry_char_t *buffer, /**< buffer */ (const uint8_t *) buffer, sizeof (uint8_t) * str_size); } -#else /* !ENABLED (JERRY_DEBUGGER) */ +#else /* !JERRY_DEBUGGER */ JERRY_UNUSED (buffer); JERRY_UNUSED (str_size); -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ } /* jerry_debugger_send_output */ /** @@ -214,7 +214,7 @@ jerry_debugger_send_log (jerry_log_level_t level, /**< level of the diagnostics const jerry_char_t *buffer, /**< buffer */ jerry_size_t str_size) /**< string size */ { -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) { jerry_debugger_send_string (JERRY_DEBUGGER_OUTPUT_RESULT, @@ -222,9 +222,9 @@ jerry_debugger_send_log (jerry_log_level_t level, /**< level of the diagnostics (const uint8_t *) buffer, sizeof (uint8_t) * str_size); } -#else /* !ENABLED (JERRY_DEBUGGER) */ +#else /* !JERRY_DEBUGGER */ JERRY_UNUSED (level); JERRY_UNUSED (buffer); JERRY_UNUSED (str_size); -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ } /* jerry_debugger_send_log */ diff --git a/jerry-core/api/jerry-snapshot.c b/jerry-core/api/jerry-snapshot.c index 7936237c0..e2330a476 100644 --- a/jerry-core/api/jerry-snapshot.c +++ b/jerry-core/api/jerry-snapshot.c @@ -27,7 +27,7 @@ #include "js-parser-internal.h" #include "re-compiler.h" -#if ENABLED (JERRY_SNAPSHOT_SAVE) || ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_SAVE || JERRY_SNAPSHOT_EXEC /** * Get snapshot configuration flags. @@ -43,15 +43,15 @@ snapshot_get_global_flags (bool has_regex, /**< regex literal is present */ uint32_t flags = 0; -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP flags |= (has_regex ? JERRY_SNAPSHOT_HAS_REGEX_LITERAL : 0); -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ -#if ENABLED (JERRY_ESNEXT) +#endif /* JERRY_BUILTIN_REGEXP */ +#if JERRY_ESNEXT flags |= (has_class ? JERRY_SNAPSHOT_HAS_CLASS_LITERAL : 0); -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_BUILTIN_REALMS) +#endif /* JERRY_ESNEXT */ +#if JERRY_BUILTIN_REALMS flags |= JERRY_SNAPSHOT_HAS_REALM_VALUE; -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ return flags; } /* snapshot_get_global_flags */ @@ -64,22 +64,22 @@ snapshot_get_global_flags (bool has_regex, /**< regex literal is present */ static inline bool JERRY_ATTR_ALWAYS_INLINE snapshot_check_global_flags (uint32_t global_flags) /**< global flags */ { -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP global_flags &= (uint32_t) ~JERRY_SNAPSHOT_HAS_REGEX_LITERAL; -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ -#if ENABLED (JERRY_ESNEXT) +#endif /* JERRY_BUILTIN_REGEXP */ +#if JERRY_ESNEXT global_flags &= (uint32_t) ~JERRY_SNAPSHOT_HAS_CLASS_LITERAL; -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_BUILTIN_REALMS) +#endif /* JERRY_ESNEXT */ +#if JERRY_BUILTIN_REALMS global_flags |= JERRY_SNAPSHOT_HAS_REALM_VALUE; -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ return global_flags == snapshot_get_global_flags (false, false); } /* snapshot_check_global_flags */ -#endif /* ENABLED (JERRY_SNAPSHOT_SAVE) || ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_SAVE || JERRY_SNAPSHOT_EXEC */ -#if ENABLED (JERRY_SNAPSHOT_SAVE) +#if JERRY_SNAPSHOT_SAVE /** * Variables required to take a snapshot. @@ -127,11 +127,11 @@ snapshot_write_to_buffer_by_offset (uint8_t *buffer_p, /**< buffer */ /** * Maximum snapshot write buffer offset. */ -#if !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if !JERRY_NUMBER_TYPE_FLOAT64 #define JERRY_SNAPSHOT_MAXIMUM_WRITE_OFFSET (0x7fffff >> 1) -#else /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#else /* JERRY_NUMBER_TYPE_FLOAT64 */ #define JERRY_SNAPSHOT_MAXIMUM_WRITE_OFFSET (UINT32_MAX >> 1) -#endif /* !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* !JERRY_NUMBER_TYPE_FLOAT64 */ /** * Save snapshot helper. @@ -167,7 +167,7 @@ snapshot_add_compiled_code (ecma_compiled_code_t *compiled_code_p, /**< compiled uint8_t *copied_code_start_p = snapshot_buffer_p + globals_p->snapshot_buffer_write_offset; ecma_compiled_code_t *copied_code_p = (ecma_compiled_code_t *) copied_code_start_p; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (compiled_code_p->status_flags & CBC_CODE_FLAGS_HAS_TAGGED_LITERALS) { const char * const error_message_p = "Unsupported feature: tagged template literals"; @@ -179,9 +179,9 @@ snapshot_add_compiled_code (ecma_compiled_code_t *compiled_code_p, /**< compiled { globals_p->class_found = true; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP if (!CBC_IS_FUNCTION (compiled_code_p->status_flags)) { /* Regular expression. */ @@ -233,7 +233,7 @@ snapshot_add_compiled_code (ecma_compiled_code_t *compiled_code_p, /**< compiled return start_offset; } -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ JERRY_ASSERT (CBC_IS_FUNCTION (compiled_code_p->status_flags)); @@ -387,9 +387,9 @@ static_snapshot_add_compiled_code (ecma_compiled_code_t *compiled_code_p, /**< c literal_end = (uint32_t) (args_p->literal_end - args_p->register_end); const_literal_end = (uint32_t) (args_p->const_literal_end - args_p->register_end); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS args_p->realm_value = JMEM_CP_NULL; -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ } else { @@ -399,9 +399,9 @@ static_snapshot_add_compiled_code (ecma_compiled_code_t *compiled_code_p, /**< c literal_end = (uint32_t) (args_p->literal_end - args_p->register_end); const_literal_end = (uint32_t) (args_p->const_literal_end - args_p->register_end); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS args_p->realm_value = JMEM_CP_NULL; -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ } for (uint32_t i = 0; i < const_literal_end; i++) @@ -492,9 +492,9 @@ jerry_snapshot_set_offsets (uint32_t *buffer_p, /**< buffer */ for (uint32_t i = 0; i < const_literal_end; i++) { if (ecma_is_value_string (literal_start_p[i]) -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT || ecma_is_value_bigint (literal_start_p[i]) -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ || ecma_is_value_float_number (literal_start_p[i])) { lit_mem_to_snapshot_id_map_entry_t *current_p = lit_map_p; @@ -541,9 +541,9 @@ jerry_snapshot_set_offsets (uint32_t *buffer_p, /**< buffer */ while (size > 0); } /* jerry_snapshot_set_offsets */ -#endif /* ENABLED (JERRY_SNAPSHOT_SAVE) */ +#endif /* JERRY_SNAPSHOT_SAVE */ -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC /** * Byte code blocks shorter than this threshold are always copied into the memory. @@ -566,7 +566,7 @@ snapshot_load_compiled_code (const uint8_t *base_addr_p, /**< base address of th ecma_compiled_code_t *bytecode_p = (ecma_compiled_code_t *) base_addr_p; uint32_t code_size = ((uint32_t) bytecode_p->size) << JMEM_ALIGNMENT_LOG; -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP if (!CBC_IS_FUNCTION (bytecode_p->status_flags)) { const uint8_t *regex_start_p = ((const uint8_t *) bytecode_p) + sizeof (ecma_compiled_code_t); @@ -581,9 +581,9 @@ snapshot_load_compiled_code (const uint8_t *base_addr_p, /**< base address of th return (ecma_compiled_code_t *) re_bytecode_p; } -#else /* !ENABLED (JERRY_BUILTIN_REGEXP) */ +#else /* !JERRY_BUILTIN_REGEXP */ JERRY_ASSERT (CBC_IS_FUNCTION (bytecode_p->status_flags)); -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ size_t header_size; uint32_t argument_end; @@ -600,9 +600,9 @@ snapshot_load_compiled_code (const uint8_t *base_addr_p, /**< base address of th literal_end = (uint32_t) (args_p->literal_end - args_p->register_end); header_size = sizeof (cbc_uint16_arguments_t); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ECMA_SET_INTERNAL_VALUE_POINTER (args_p->realm_value, ecma_builtin_get_global ()); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ } else { @@ -614,9 +614,9 @@ snapshot_load_compiled_code (const uint8_t *base_addr_p, /**< base address of th literal_end = (uint32_t) (args_p->literal_end - args_p->register_end); header_size = sizeof (cbc_uint8_arguments_t); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ECMA_SET_INTERNAL_VALUE_POINTER (args_p->realm_value, ecma_builtin_get_global ()); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ } if (copy_bytecode @@ -624,9 +624,9 @@ snapshot_load_compiled_code (const uint8_t *base_addr_p, /**< base address of th { bytecode_p = (ecma_compiled_code_t *) jmem_heap_alloc_block (code_size); -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_allocate_byte_code_bytes (code_size); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ memcpy (bytecode_p, base_addr_p, code_size); } @@ -643,7 +643,7 @@ snapshot_load_compiled_code (const uint8_t *base_addr_p, /**< base address of th extra_bytes += (uint32_t) (argument_end * sizeof (ecma_value_t)); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* function name */ if (CBC_FUNCTION_GET_TYPE (bytecode_p->status_flags) != CBC_FUNCTION_CONSTRUCTOR) { @@ -655,20 +655,20 @@ snapshot_load_compiled_code (const uint8_t *base_addr_p, /**< base address of th { extra_bytes += (uint32_t) sizeof (ecma_value_t); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_RESOURCE_NAME) +#if JERRY_RESOURCE_NAME /* resource name */ extra_bytes += (uint32_t) sizeof (ecma_value_t); -#endif /* ENABLED (JERRY_RESOURCE_NAME) */ +#endif /* JERRY_RESOURCE_NAME */ new_code_size = JERRY_ALIGNUP (new_code_size + extra_bytes, JMEM_ALIGNMENT); bytecode_p = (ecma_compiled_code_t *) jmem_heap_alloc_block (new_code_size); -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_allocate_byte_code_bytes (new_code_size); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ memcpy (bytecode_p, base_addr_p, start_offset); @@ -685,16 +685,16 @@ snapshot_load_compiled_code (const uint8_t *base_addr_p, /**< base address of th } byte_p[start_offset] = CBC_SET_BYTECODE_PTR; - memcpy (byte_p + start_offset + 1, &real_bytecode_p, sizeof (uint8_t *)); + memcpy (byte_p + start_offset + 1, &real_bytecode_p, sizeof (uintptr_t)); code_size = new_code_size; } JERRY_ASSERT (bytecode_p->refs == 1); -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER bytecode_p->status_flags = (uint16_t) (bytecode_p->status_flags | CBC_CODE_FLAGS_DEBUGGER_IGNORE); -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ ecma_value_t *literal_start_p = (ecma_value_t *) (((uint8_t *) bytecode_p) + header_size); @@ -744,9 +744,9 @@ snapshot_load_compiled_code (const uint8_t *base_addr_p, /**< base address of th return bytecode_p; } /* snapshot_load_compiled_code */ -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ -#if ENABLED (JERRY_SNAPSHOT_SAVE) +#if JERRY_SNAPSHOT_SAVE /** * Generate snapshot from specified source and arguments @@ -773,12 +773,12 @@ jerry_generate_snapshot_with_args (const jerry_char_t *resource_name_p, /**< scr ecma_value_t resource_name = ecma_make_magic_string_value (LIT_MAGIC_STRING_RESOURCE_ANON); -#if ENABLED (JERRY_RESOURCE_NAME) +#if JERRY_RESOURCE_NAME if (resource_name_length > 0) { resource_name = ecma_find_or_create_literal_string (resource_name_p, (lit_utf8_size_t) resource_name_length); } -#endif /* ENABLED (JERRY_RESOURCE_NAME) */ +#endif /* JERRY_RESOURCE_NAME */ snapshot_globals_t globals; const uint32_t aligned_header_size = JERRY_ALIGNUP (sizeof (jerry_snapshot_header_t), @@ -872,7 +872,7 @@ jerry_generate_snapshot_with_args (const jerry_char_t *resource_name_p, /**< scr return ecma_make_number_value ((ecma_number_t) globals.snapshot_buffer_write_offset); } /* jerry_generate_snapshot_with_args */ -#endif /* ENABLED (JERRY_SNAPSHOT_SAVE) */ +#endif /* JERRY_SNAPSHOT_SAVE */ /** * Generate snapshot from specified source and arguments @@ -891,7 +891,7 @@ jerry_generate_snapshot (const jerry_char_t *resource_name_p, /**< script resour uint32_t *buffer_p, /**< buffer to save snapshot to */ size_t buffer_size) /**< the buffer's size */ { -#if ENABLED (JERRY_SNAPSHOT_SAVE) +#if JERRY_SNAPSHOT_SAVE uint32_t allowed_opts = (JERRY_SNAPSHOT_SAVE_STATIC | JERRY_SNAPSHOT_SAVE_STRICT); if ((generate_snapshot_opts & ~(allowed_opts)) != 0) @@ -909,7 +909,7 @@ jerry_generate_snapshot (const jerry_char_t *resource_name_p, /**< script resour generate_snapshot_opts, buffer_p, buffer_size); -#else /* !ENABLED (JERRY_SNAPSHOT_SAVE) */ +#else /* !JERRY_SNAPSHOT_SAVE */ JERRY_UNUSED (resource_name_p); JERRY_UNUSED (resource_name_length); JERRY_UNUSED (source_p); @@ -919,10 +919,10 @@ jerry_generate_snapshot (const jerry_char_t *resource_name_p, /**< script resour JERRY_UNUSED (buffer_size); return jerry_create_error (JERRY_ERROR_COMMON, (const jerry_char_t *) "Snapshot save is not supported"); -#endif /* ENABLED (JERRY_SNAPSHOT_SAVE) */ +#endif /* JERRY_SNAPSHOT_SAVE */ } /* jerry_generate_snapshot */ -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC /** * Execute/load snapshot from specified buffer * @@ -1014,12 +1014,12 @@ jerry_snapshot_result (const uint32_t *snapshot_p, /**< snapshot */ } } -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE if (JERRY_CONTEXT (jerry_init_flags) & ECMA_INIT_SHOW_OPCODES) { util_print_cbc (bytecode_p); } -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ ecma_value_t ret_val; @@ -1027,16 +1027,16 @@ jerry_snapshot_result (const uint32_t *snapshot_p, /**< snapshot */ { ecma_object_t *global_object_p = ecma_builtin_get_global (); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS JERRY_ASSERT (global_object_p == (ecma_object_t *) ecma_op_function_get_realm (bytecode_p)); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (bytecode_p->status_flags & CBC_CODE_FLAGS_LEXICAL_BLOCK_NEEDED) { ecma_create_global_lexical_block (global_object_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_object_t *lex_env_p = ecma_get_global_scope (global_object_p); ecma_object_t *func_obj_p = ecma_op_create_simple_function_object (lex_env_p, bytecode_p); @@ -1063,7 +1063,7 @@ jerry_snapshot_result (const uint32_t *snapshot_p, /**< snapshot */ return ret_val; } /* jerry_snapshot_result */ -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ /** * Execute snapshot from specified buffer @@ -1080,23 +1080,23 @@ jerry_exec_snapshot (const uint32_t *snapshot_p, /**< snapshot */ size_t func_index, /**< index of primary function */ uint32_t exec_snapshot_opts) /**< jerry_exec_snapshot_opts_t option bits */ { -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC return jerry_snapshot_result (snapshot_p, snapshot_size, func_index, exec_snapshot_opts, false); -#else /* !ENABLED (JERRY_SNAPSHOT_EXEC) */ +#else /* !JERRY_SNAPSHOT_EXEC */ JERRY_UNUSED (snapshot_p); JERRY_UNUSED (snapshot_size); JERRY_UNUSED (func_index); JERRY_UNUSED (exec_snapshot_opts); return jerry_create_error (JERRY_ERROR_COMMON, (const jerry_char_t *) "Snapshot execution is not supported"); -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ } /* jerry_exec_snapshot */ /** * @} */ -#if ENABLED (JERRY_SNAPSHOT_SAVE) +#if JERRY_SNAPSHOT_SAVE /** * Collect all literals from a snapshot file. @@ -1244,7 +1244,7 @@ update_literal_offsets (uint8_t *buffer_p, /**< [in,out] snapshot buffer start * while (buffer_p < buffer_end_p); } /* update_literal_offsets */ -#endif /* ENABLED (JERRY_SNAPSHOT_SAVE) */ +#endif /* JERRY_SNAPSHOT_SAVE */ /** * Merge multiple snapshots into a single buffer @@ -1260,7 +1260,7 @@ jerry_merge_snapshots (const uint32_t **inp_buffers_p, /**< array of (pointers t size_t out_buffer_size, /**< output buffer size */ const char **error_p) /**< error description */ { -#if ENABLED (JERRY_SNAPSHOT_SAVE) +#if JERRY_SNAPSHOT_SAVE uint32_t number_of_funcs = 0; uint32_t merged_global_flags = 0; size_t functions_size = sizeof (jerry_snapshot_header_t); @@ -1383,7 +1383,7 @@ jerry_merge_snapshots (const uint32_t **inp_buffers_p, /**< array of (pointers t *error_p = NULL; return functions_size; -#else /* !ENABLED (JERRY_SNAPSHOT_SAVE) */ +#else /* !JERRY_SNAPSHOT_SAVE */ JERRY_UNUSED (inp_buffers_p); JERRY_UNUSED (inp_buffer_sizes_p); JERRY_UNUSED (number_of_snapshots); @@ -1393,10 +1393,10 @@ jerry_merge_snapshots (const uint32_t **inp_buffers_p, /**< array of (pointers t *error_p = "snapshot merge not supported"; return 0; -#endif /* ENABLED (JERRY_SNAPSHOT_SAVE) */ +#endif /* JERRY_SNAPSHOT_SAVE */ } /* jerry_merge_snapshots */ -#if ENABLED (JERRY_SNAPSHOT_SAVE) +#if JERRY_SNAPSHOT_SAVE /** * ====================== Functions for literal saving ========================== @@ -1589,7 +1589,7 @@ jerry_append_number_to_buffer (uint8_t *buffer_p, /**< buffer */ utf8_str_size); } /* jerry_append_number_to_buffer */ -#endif /* ENABLED (JERRY_SNAPSHOT_SAVE) */ +#endif /* JERRY_SNAPSHOT_SAVE */ /** * Get the literals from a snapshot. Copies certain string literals into the given @@ -1609,7 +1609,7 @@ jerry_get_literals_from_snapshot (const uint32_t *snapshot_p, /**< input snapsho size_t lit_buf_size, /**< the buffer's size */ bool is_c_format) /**< format-flag */ { -#if ENABLED (JERRY_SNAPSHOT_SAVE) +#if JERRY_SNAPSHOT_SAVE const uint8_t *snapshot_data_p = (uint8_t *) snapshot_p; const jerry_snapshot_header_t *header_p = (const jerry_snapshot_header_t *) snapshot_data_p; @@ -1786,7 +1786,7 @@ jerry_get_literals_from_snapshot (const uint32_t *snapshot_p, /**< input snapsho JMEM_FINALIZE_LOCAL_ARRAY (literal_array); return lit_buf_p <= buffer_end_p ? (size_t) (lit_buf_p - buffer_start_p) : 0; -#else /* !ENABLED (JERRY_SNAPSHOT_SAVE) */ +#else /* !JERRY_SNAPSHOT_SAVE */ JERRY_UNUSED (snapshot_p); JERRY_UNUSED (snapshot_size); JERRY_UNUSED (lit_buf_p); @@ -1794,7 +1794,7 @@ jerry_get_literals_from_snapshot (const uint32_t *snapshot_p, /**< input snapsho JERRY_UNUSED (is_c_format); return 0; -#endif /* ENABLED (JERRY_SNAPSHOT_SAVE) */ +#endif /* JERRY_SNAPSHOT_SAVE */ } /* jerry_get_literals_from_snapshot */ /** @@ -1816,7 +1816,7 @@ jerry_generate_function_snapshot (const jerry_char_t *resource_name_p, /**< scri uint32_t *buffer_p, /**< buffer to save snapshot to */ size_t buffer_size) /**< the buffer's size */ { -#if ENABLED (JERRY_SNAPSHOT_SAVE) +#if JERRY_SNAPSHOT_SAVE uint32_t allowed_opts = (JERRY_SNAPSHOT_SAVE_STATIC | JERRY_SNAPSHOT_SAVE_STRICT); if ((generate_snapshot_opts & ~(allowed_opts)) != 0) @@ -1834,7 +1834,7 @@ jerry_generate_function_snapshot (const jerry_char_t *resource_name_p, /**< scri generate_snapshot_opts, buffer_p, buffer_size); -#else /* !ENABLED (JERRY_SNAPSHOT_SAVE) */ +#else /* !JERRY_SNAPSHOT_SAVE */ JERRY_UNUSED (resource_name_p); JERRY_UNUSED (resource_name_length); JERRY_UNUSED (source_p); @@ -1846,7 +1846,7 @@ jerry_generate_function_snapshot (const jerry_char_t *resource_name_p, /**< scri JERRY_UNUSED (buffer_size); return jerry_create_error (JERRY_ERROR_COMMON, (const jerry_char_t *) "Snapshot save is not supported"); -#endif /* ENABLED (JERRY_SNAPSHOT_SAVE) */ +#endif /* JERRY_SNAPSHOT_SAVE */ } /* jerry_generate_function_snapshot */ /** @@ -1864,14 +1864,14 @@ jerry_load_function_snapshot (const uint32_t *function_snapshot_p, /**< snapshot size_t func_index, /**< index of the function to load */ uint32_t exec_snapshot_opts) /**< jerry_exec_snapshot_opts_t option bits */ { -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC return jerry_snapshot_result (function_snapshot_p, function_snapshot_size, func_index, exec_snapshot_opts, true); -#else /* !ENABLED (JERRY_SNAPSHOT_EXEC) */ +#else /* !JERRY_SNAPSHOT_EXEC */ JERRY_UNUSED (function_snapshot_p); JERRY_UNUSED (function_snapshot_size); JERRY_UNUSED (func_index); JERRY_UNUSED (exec_snapshot_opts); return jerry_create_error (JERRY_ERROR_COMMON, (const jerry_char_t *) "Snapshot execution is not supported"); -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ } /* jerry_load_function_snapshot */ diff --git a/jerry-core/api/jerry.c b/jerry-core/api/jerry.c index f76bca270..783190a26 100644 --- a/jerry-core/api/jerry.c +++ b/jerry-core/api/jerry.c @@ -69,7 +69,7 @@ JERRY_STATIC_ASSERT ((int) ECMA_INIT_EMPTY == (int) JERRY_INIT_EMPTY && (int) ECMA_INIT_MEM_STATS == (int) JERRY_INIT_MEM_STATS, ecma_init_flag_t_must_be_equal_to_jerry_init_flag_t); -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP JERRY_STATIC_ASSERT ((int) RE_FLAG_GLOBAL == (int) JERRY_REGEXP_FLAG_GLOBAL && (int) RE_FLAG_MULTILINE == (int) JERRY_REGEXP_FLAG_MULTILINE && (int) RE_FLAG_IGNORE_CASE == (int) JERRY_REGEXP_FLAG_IGNORE_CASE @@ -77,14 +77,14 @@ JERRY_STATIC_ASSERT ((int) RE_FLAG_GLOBAL == (int) JERRY_REGEXP_FLAG_GLOBAL && (int) RE_FLAG_UNICODE == (int) JERRY_REGEXP_FLAG_UNICODE && (int) RE_FLAG_DOTALL == (int) JERRY_REGEXP_FLAG_DOTALL, re_flags_t_must_be_equal_to_jerry_regexp_flags_t); -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE /* The internal ECMA_PROMISE_STATE_* values are "one byte away" from the API values */ JERRY_STATIC_ASSERT ((int) ECMA_PROMISE_IS_PENDING == (int) JERRY_PROMISE_STATE_PENDING && (int) ECMA_PROMISE_IS_FULFILLED == (int) JERRY_PROMISE_STATE_FULFILLED, promise_internal_state_matches_external); -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ /** * Offset between internal and external arithmetic operator types @@ -97,11 +97,11 @@ JERRY_STATIC_ASSERT (((NUMBER_ARITHMETIC_SUBTRACTION + ECMA_NUMBER_ARITHMETIC_OP && ((NUMBER_ARITHMETIC_REMAINDER + ECMA_NUMBER_ARITHMETIC_OP_API_OFFSET) == JERRY_BIN_OP_REM), number_arithmetics_operation_type_matches_external); -#if !ENABLED (JERRY_PARSER) && !ENABLED (JERRY_SNAPSHOT_EXEC) +#if !JERRY_PARSER && !JERRY_SNAPSHOT_EXEC #error "JERRY_SNAPSHOT_EXEC must be enabled if JERRY_PARSER is disabled!" -#endif /* !ENABLED (JERRY_PARSER) && !ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* !JERRY_PARSER && !JERRY_SNAPSHOT_EXEC */ -#if ENABLED (JERRY_ERROR_MESSAGES) +#if JERRY_ERROR_MESSAGES /** * Error message, if an argument is has an error flag @@ -113,56 +113,56 @@ static const char * const error_value_msg_p = "Argument cannot be marked as erro */ static const char * const wrong_args_msg_p = "This type of argument is not allowed"; -#if !ENABLED (JERRY_PARSER) +#if !JERRY_PARSER /** * Error message, if parsing is disabled */ static const char * const error_parser_not_supported_p = "Source code parsing is disabled"; -#endif /* !ENABLED (JERRY_PARSER) */ +#endif /* !JERRY_PARSER */ -#if !ENABLED (JERRY_BUILTIN_JSON) +#if !JERRY_BUILTIN_JSON /** * Error message, if JSON support is disabled */ static const char * const error_json_not_supported_p = "JSON support is disabled"; -#endif /* !ENABLED (JERRY_BUILTIN_JSON) */ +#endif /* !JERRY_BUILTIN_JSON */ -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT /** * Error message, if Symbol support is disabled */ static const char * const error_symbol_not_supported_p = "Symbol support is disabled"; -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ -#if !ENABLED (JERRY_BUILTIN_PROMISE) +#if !JERRY_BUILTIN_PROMISE /** * Error message, if Promise support is disabled */ static const char * const error_promise_not_supported_p = "Promise support is disabled"; -#endif /* !ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* !JERRY_BUILTIN_PROMISE */ -#if !ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if !JERRY_BUILTIN_TYPEDARRAY /** * Error message, if TypedArray support is disabled */ static const char * const error_typed_array_not_supported_p = "TypedArray support is disabled"; -#endif /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* !JERRY_BUILTIN_TYPEDARRAY */ -#if !ENABLED (JERRY_BUILTIN_DATAVIEW) +#if !JERRY_BUILTIN_DATAVIEW /** * Error message, if DataView support is disabled */ static const char * const error_data_view_not_supported_p = "DataView support is disabled"; -#endif /* !ENABLED (JERRY_BUILTIN_DATAVIEW) */ +#endif /* !JERRY_BUILTIN_DATAVIEW */ -#if !ENABLED (JERRY_BUILTIN_BIGINT) +#if !JERRY_BUILTIN_BIGINT /** * Error message, if BigInt support is disabled */ static const char * const error_bigint_not_supported_p = "BigInt support is disabled"; -#endif /* !ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* !JERRY_BUILTIN_BIGINT */ -#endif /* ENABLED (JERRY_ERROR_MESSAGES) */ +#endif /* JERRY_ERROR_MESSAGES */ /** \addtogroup jerry Jerry engine interface * @{ @@ -266,14 +266,14 @@ jerry_cleanup (void) { jerry_assert_api_available (); -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) { jerry_debugger_send_type (JERRY_DEBUGGER_CLOSE_CONNECTION); jerry_debugger_transport_close (); } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ for (jerry_context_data_header_t *this_p = JERRY_CONTEXT (context_data_p); this_p != NULL; @@ -286,9 +286,9 @@ jerry_cleanup (void) } } -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE ecma_free_all_enqueued_jobs (); -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ ecma_finalize (); jerry_make_api_unavailable (); @@ -392,7 +392,7 @@ jerry_gc (jerry_gc_mode_t mode) /**< operational mode */ bool jerry_get_memory_stats (jerry_heap_stats_t *out_stats_p) /**< [out] heap memory stats */ { -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS if (out_stats_p == NULL) { return false; @@ -411,10 +411,10 @@ jerry_get_memory_stats (jerry_heap_stats_t *out_stats_p) /**< [out] heap memory }; return true; -#else /* !ENABLED (JERRY_MEM_STATS) */ +#else /* !JERRY_MEM_STATS */ JERRY_UNUSED (out_stats_p); return false; -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ } /* jerry_get_memory_stats */ /** @@ -466,7 +466,7 @@ jerry_parse (const jerry_char_t *resource_name_p, /**< resource name (usually a size_t source_size, /**< script source size */ uint32_t parse_opts) /**< jerry_parse_opts_t option bits */ { -#if ENABLED (JERRY_DEBUGGER) && ENABLED (JERRY_PARSER) +#if JERRY_DEBUGGER && JERRY_PARSER if ((JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) && resource_name_length > 0) { @@ -475,30 +475,30 @@ jerry_parse (const jerry_char_t *resource_name_p, /**< resource name (usually a resource_name_p, resource_name_length); } -#else /* !(ENABLED (JERRY_DEBUGGER) && ENABLED (JERRY_PARSER)) */ +#else /* !(JERRY_DEBUGGER && JERRY_PARSER) */ JERRY_UNUSED (resource_name_p); JERRY_UNUSED (resource_name_length); -#endif /* ENABLED (JERRY_DEBUGGER) && ENABLED (JERRY_PARSER) */ +#endif /* JERRY_DEBUGGER && JERRY_PARSER */ -#if ENABLED (JERRY_PARSER) +#if JERRY_PARSER jerry_assert_api_available (); ecma_value_t resource_name = ecma_make_magic_string_value (LIT_MAGIC_STRING_RESOURCE_ANON); -#if ENABLED (JERRY_RESOURCE_NAME) +#if JERRY_RESOURCE_NAME if (resource_name_length > 0) { resource_name = ecma_find_or_create_literal_string (resource_name_p, (lit_utf8_size_t) resource_name_length); } -#endif /* ENABLED (JERRY_RESOURCE_NAME) */ +#endif /* JERRY_RESOURCE_NAME */ if ((parse_opts & JERRY_PARSE_MODULE) != 0) { -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM ecma_module_initialize_context (ecma_get_string_from_value (resource_name)); -#else /* !ENABLED (JERRY_MODULE_SYSTEM) */ +#else /* !JERRY_MODULE_SYSTEM */ return jerry_throw (ecma_raise_syntax_error (ECMA_ERR_MSG ("Module system has been disabled"))); -#endif /* !ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ } ecma_compiled_code_t *bytecode_data_p = parser_parse_script (NULL, @@ -510,17 +510,17 @@ jerry_parse (const jerry_char_t *resource_name_p, /**< resource name (usually a if (JERRY_UNLIKELY (bytecode_data_p == NULL)) { -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM if ((parse_opts & JERRY_PARSE_MODULE) != 0) { ecma_module_cleanup_context (); } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ return ecma_create_error_reference_from_context (); } -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM if ((parse_opts & JERRY_PARSE_MODULE) != 0) { if (ECMA_IS_VALUE_ERROR (ecma_module_parse_referenced_modules ())) @@ -546,13 +546,13 @@ jerry_parse (const jerry_char_t *resource_name_p, /**< resource name (usually a return ecma_make_object_value (obj_p); } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ ecma_object_t *global_object_p = ecma_builtin_get_global (); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS JERRY_ASSERT (global_object_p == (ecma_object_t *) ecma_op_function_get_realm (bytecode_data_p)); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ ecma_object_t *lex_env_p = ecma_get_global_environment (global_object_p); @@ -562,13 +562,13 @@ jerry_parse (const jerry_char_t *resource_name_p, /**< resource name (usually a ecma_bytecode_deref (bytecode_data_p); return ecma_make_object_value (func_obj_p); -#else /* !ENABLED (JERRY_PARSER) */ +#else /* !JERRY_PARSER */ JERRY_UNUSED (source_p); JERRY_UNUSED (source_size); JERRY_UNUSED (parse_opts); return jerry_throw (ecma_raise_syntax_error (ECMA_ERR_MSG (error_parser_not_supported_p))); -#endif /* ENABLED (JERRY_PARSER) */ +#endif /* JERRY_PARSER */ } /* jerry_parse */ /** @@ -587,7 +587,7 @@ jerry_parse_function (const jerry_char_t *resource_name_p, /**< resource name (u size_t source_size, /**< script source size */ uint32_t parse_opts) /**< jerry_parse_opts_t option bits */ { -#if ENABLED (JERRY_DEBUGGER) && ENABLED (JERRY_PARSER) +#if JERRY_DEBUGGER && JERRY_PARSER if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) { jerry_debugger_send_string (JERRY_DEBUGGER_SOURCE_CODE_NAME, @@ -595,22 +595,22 @@ jerry_parse_function (const jerry_char_t *resource_name_p, /**< resource name (u resource_name_p, resource_name_length); } -#else /* !(ENABLED (JERRY_DEBUGGER) && ENABLED (JERRY_PARSER)) */ +#else /* !(JERRY_DEBUGGER && JERRY_PARSER) */ JERRY_UNUSED (resource_name_p); JERRY_UNUSED (resource_name_length); -#endif /* ENABLED (JERRY_DEBUGGER) && ENABLED (JERRY_PARSER) */ +#endif /* JERRY_DEBUGGER && JERRY_PARSER */ -#if ENABLED (JERRY_PARSER) +#if JERRY_PARSER jerry_assert_api_available (); ecma_value_t resource_name = ecma_make_magic_string_value (LIT_MAGIC_STRING_RESOURCE_ANON); -#if ENABLED (JERRY_RESOURCE_NAME) +#if JERRY_RESOURCE_NAME if (resource_name_length > 0) { resource_name = ecma_find_or_create_literal_string (resource_name_p, (lit_utf8_size_t) resource_name_length); } -#endif /* ENABLED (JERRY_RESOURCE_NAME) */ +#endif /* JERRY_RESOURCE_NAME */ if (arg_list_p == NULL) { @@ -632,16 +632,16 @@ jerry_parse_function (const jerry_char_t *resource_name_p, /**< resource name (u ecma_object_t *global_object_p = ecma_builtin_get_global (); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS JERRY_ASSERT (global_object_p == (ecma_object_t *) ecma_op_function_get_realm (bytecode_p)); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ ecma_object_t *lex_env_p = ecma_get_global_environment (global_object_p); ecma_object_t *func_obj_p = ecma_op_create_simple_function_object (lex_env_p, bytecode_p); ecma_bytecode_deref (bytecode_p); return ecma_make_object_value (func_obj_p); -#else /* !ENABLED (JERRY_PARSER) */ +#else /* !JERRY_PARSER */ JERRY_UNUSED (arg_list_p); JERRY_UNUSED (arg_list_size); JERRY_UNUSED (source_p); @@ -649,7 +649,7 @@ jerry_parse_function (const jerry_char_t *resource_name_p, /**< resource name (u JERRY_UNUSED (parse_opts); return jerry_throw (ecma_raise_syntax_error (ECMA_ERR_MSG (error_parser_not_supported_p))); -#endif /* ENABLED (JERRY_PARSER) */ +#endif /* JERRY_PARSER */ } /* jerry_parse_function */ /** @@ -673,25 +673,25 @@ jerry_run (const jerry_value_t func_val) /**< function to run */ ecma_object_t *obj_p = ecma_get_object_from_value (func_val); -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM if (ecma_object_class_is (obj_p, LIT_MAGIC_STRING_RUNNABLE_UL)) { ecma_extended_object_t *wrapper_p = (ecma_extended_object_t *) obj_p; JERRY_ASSERT (wrapper_p->u.class_prop.extra_info == ECMA_RUNNABLE_FLAGS_MODULE); ecma_module_t *root_module_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_module_t, wrapper_p->u.class_prop.u.value); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_object_t *global_object_p = (ecma_object_t *) ecma_op_function_get_realm (root_module_p->compiled_code_p); -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ ecma_object_t *global_object_p = ecma_builtin_get_global (); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ ecma_create_global_lexical_block (global_object_p); root_module_p->scope_p = ecma_get_global_scope (global_object_p); return jerry_return (vm_run_module (root_module_p)); } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ if (ecma_get_object_type (obj_p) != ECMA_OBJECT_TYPE_FUNCTION || ecma_get_object_is_builtin (obj_p)) @@ -744,11 +744,11 @@ jerry_run_all_enqueued_jobs (void) { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE return ecma_process_all_enqueued_jobs (); -#else /* !ENABLED (JERRY_BUILTIN_PROMISE) */ +#else /* !JERRY_BUILTIN_PROMISE */ return ECMA_VALUE_UNDEFINED; -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ } /* jerry_run_all_enqueued_jobs */ /** @@ -871,7 +871,7 @@ jerry_value_is_async_function (const jerry_value_t value) /**< api value */ { jerry_assert_api_available (); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ecma_is_value_object (value)) { ecma_object_t *obj_p = ecma_get_object_from_value (value); @@ -888,9 +888,9 @@ jerry_value_is_async_function (const jerry_value_t value) /**< api value */ || type == CBC_FUNCTION_ASYNC_GENERATOR); } } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_UNUSED (value); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return false; } /* jerry_value_is_async_function */ @@ -947,13 +947,13 @@ bool jerry_value_is_promise (const jerry_value_t value) /**< api value */ { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE return (ecma_is_value_object (value) && ecma_is_promise (ecma_get_object_from_value (value))); -#else /* !ENABLED (JERRY_BUILTIN_PROMISE) */ +#else /* !JERRY_BUILTIN_PROMISE */ JERRY_UNUSED (value); return false; -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ } /* jerry_value_is_promise */ /** @@ -966,13 +966,13 @@ bool jerry_value_is_proxy (const jerry_value_t value) /**< api value */ { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY return (ecma_is_value_object (value) && ECMA_OBJECT_IS_PROXY (ecma_get_object_from_value (value))); -#else /* !ENABLED (JERRY_BUILTIN_PROXY) */ +#else /* !JERRY_BUILTIN_PROXY */ JERRY_UNUSED (value); return false; -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ } /* jerry_value_is_proxy */ /** @@ -1000,12 +1000,12 @@ jerry_value_is_symbol (const jerry_value_t value) /**< api value */ { jerry_assert_api_available (); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT return ecma_is_value_symbol (value); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_UNUSED (value); return false; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* jerry_value_is_symbol */ /** @@ -1019,12 +1019,12 @@ jerry_value_is_bigint (const jerry_value_t value) /**< api value */ { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT return ecma_is_value_bigint (value); -#else /* !ENABLED (JERRY_BUILTIN_BIGINT) */ +#else /* !JERRY_BUILTIN_BIGINT */ JERRY_UNUSED (value); return false; -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ } /* jerry_value_is_bigint */ /** @@ -1078,22 +1078,22 @@ jerry_value_get_type (const jerry_value_t value) /**< input value to check */ { return JERRY_TYPE_STRING; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LIT_MAGIC_STRING_SYMBOL: { return JERRY_TYPE_SYMBOL; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case LIT_MAGIC_STRING_FUNCTION: { return JERRY_TYPE_FUNCTION; } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT case LIT_MAGIC_STRING_BIGINT: { return JERRY_TYPE_BIGINT; } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ default: { JERRY_ASSERT (lit_id == LIT_MAGIC_STRING_OBJECT); @@ -1137,12 +1137,12 @@ jerry_object_get_type (const jerry_value_t value) /**< input value to check */ { return JERRY_OBJECT_TYPE_ARRAY; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case ECMA_OBJECT_TYPE_PROXY: { return JERRY_OBJECT_TYPE_PROXY; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case ECMA_OBJECT_TYPE_PSEUDO_ARRAY: { switch (ext_obj_p->u.pseudo_array.type) @@ -1151,26 +1151,26 @@ jerry_object_get_type (const jerry_value_t value) /**< input value to check */ { return JERRY_OBJECT_TYPE_ARGUMENTS; } -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY case ECMA_PSEUDO_ARRAY_TYPEDARRAY: case ECMA_PSEUDO_ARRAY_TYPEDARRAY_WITH_INFO: { return JERRY_OBJECT_TYPE_TYPEDARRAY; } -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ -#if ENABLED (JERRY_ESNEXT) +#endif /* JERRY_BUILTIN_TYPEDARRAY */ +#if JERRY_ESNEXT case ECMA_PSEUDO_STRING_ITERATOR: case ECMA_PSEUDO_ARRAY_ITERATOR: -#if ENABLED (JERRY_BUILTIN_MAP) +#if JERRY_BUILTIN_MAP case ECMA_PSEUDO_MAP_ITERATOR: -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ -#if ENABLED (JERRY_BUILTIN_SET) +#endif /* JERRY_BUILTIN_MAP */ +#if JERRY_BUILTIN_SET case ECMA_PSEUDO_SET_ITERATOR: -#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#endif /* JERRY_BUILTIN_SET */ { return JERRY_OBJECT_TYPE_ITERATOR; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } break; } @@ -1202,7 +1202,7 @@ jerry_object_get_type (const jerry_value_t value) /**< input value to check */ { return JERRY_OBJECT_TYPE_STRING; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LIT_MAGIC_STRING_SYMBOL_UL: { return JERRY_OBJECT_TYPE_SYMBOL; @@ -1211,30 +1211,30 @@ jerry_object_get_type (const jerry_value_t value) /**< input value to check */ { return JERRY_OBJECT_TYPE_GENERATOR; } -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#endif /* JERRY_ESNEXT */ +#if JERRY_BUILTIN_BIGINT case LIT_MAGIC_STRING_BIGINT_UL: { return JERRY_OBJECT_TYPE_BIGINT; } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ -#if ENABLED (JERRY_BUILTIN_CONTAINER) -#if ENABLED (JERRY_BUILTIN_MAP) +#endif /* JERRY_BUILTIN_BIGINT */ +#if JERRY_BUILTIN_CONTAINER +#if JERRY_BUILTIN_MAP case LIT_MAGIC_STRING_MAP_UL: -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ -#if ENABLED (JERRY_BUILTIN_SET) +#endif /* JERRY_BUILTIN_MAP */ +#if JERRY_BUILTIN_SET case LIT_MAGIC_STRING_SET_UL: -#endif /* ENABLED (JERRY_BUILTIN_SET) */ -#if ENABLED (JERRY_BUILTIN_WEAKMAP) +#endif /* JERRY_BUILTIN_SET */ +#if JERRY_BUILTIN_WEAKMAP case LIT_MAGIC_STRING_WEAKMAP_UL: -#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ -#if ENABLED (JERRY_BUILTIN_WEAKSET) +#endif /* JERRY_BUILTIN_WEAKMAP */ +#if JERRY_BUILTIN_WEAKSET case LIT_MAGIC_STRING_WEAKSET_UL: -#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ +#endif /* JERRY_BUILTIN_WEAKSET */ { return JERRY_OBJECT_TYPE_CONTAINER; } -#endif /* ENABLED (JERRY_BUILTIN_CONTAINER) */ +#endif /* JERRY_BUILTIN_CONTAINER */ default: { break; @@ -1285,7 +1285,7 @@ jerry_function_get_type (const jerry_value_t value) /**< input value to check */ switch (CBC_FUNCTION_GET_TYPE (bytecode_data_p->status_flags)) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case CBC_FUNCTION_ARROW: case CBC_FUNCTION_ASYNC_ARROW: { @@ -1296,7 +1296,7 @@ jerry_function_get_type (const jerry_value_t value) /**< input value to check */ { return JERRY_FUNCTION_TYPE_GENERATOR; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case CBC_FUNCTION_ACCESSOR: { return JERRY_FUNCTION_TYPE_ACCESSOR; @@ -1330,7 +1330,7 @@ jerry_iterator_get_type (const jerry_value_t value) /**< input value to check */ { jerry_assert_api_available (); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ecma_is_value_object (value)) { ecma_object_t *obj_p = ecma_get_object_from_value (value); @@ -1348,18 +1348,18 @@ jerry_iterator_get_type (const jerry_value_t value) /**< input value to check */ { return JERRY_ITERATOR_TYPE_STRING; } -#if ENABLED (JERRY_BUILTIN_MAP) +#if JERRY_BUILTIN_MAP case ECMA_PSEUDO_MAP_ITERATOR: { return JERRY_ITERATOR_TYPE_MAP; } -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ -#if ENABLED (JERRY_BUILTIN_SET) +#endif /* JERRY_BUILTIN_MAP */ +#if JERRY_BUILTIN_SET case ECMA_PSEUDO_SET_ITERATOR: { return JERRY_ITERATOR_TYPE_SET; } -#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#endif /* JERRY_BUILTIN_SET */ default: { break; @@ -1367,9 +1367,9 @@ jerry_iterator_get_type (const jerry_value_t value) /**< input value to check */ } } } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_UNUSED (value); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return JERRY_ITERATOR_TYPE_NONE; } /* jerry_iterator_get_type */ @@ -1386,84 +1386,84 @@ jerry_is_feature_enabled (const jerry_feature_t feature) /**< feature to check * JERRY_ASSERT (feature < JERRY_FEATURE__COUNT); return (false -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT || feature == JERRY_FEATURE_CPOINTER_32_BIT -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ -#if ENABLED (JERRY_ERROR_MESSAGES) +#endif /* JERRY_CPOINTER_32_BIT */ +#if JERRY_ERROR_MESSAGES || feature == JERRY_FEATURE_ERROR_MESSAGES -#endif /* ENABLED (JERRY_ERROR_MESSAGES) */ -#if ENABLED (JERRY_PARSER) +#endif /* JERRY_ERROR_MESSAGES */ +#if JERRY_PARSER || feature == JERRY_FEATURE_JS_PARSER -#endif /* ENABLED (JERRY_PARSER) */ -#if ENABLED (JERRY_MEM_STATS) +#endif /* JERRY_PARSER */ +#if JERRY_MEM_STATS || feature == JERRY_FEATURE_MEM_STATS -#endif /* ENABLED (JERRY_MEM_STATS) */ -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#endif /* JERRY_MEM_STATS */ +#if JERRY_PARSER_DUMP_BYTE_CODE || feature == JERRY_FEATURE_PARSER_DUMP -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ -#if ENABLED (JERRY_REGEXP_DUMP_BYTE_CODE) +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ +#if JERRY_REGEXP_DUMP_BYTE_CODE || feature == JERRY_FEATURE_REGEXP_DUMP -#endif /* ENABLED (JERRY_REGEXP_DUMP_BYTE_CODE) */ -#if ENABLED (JERRY_SNAPSHOT_SAVE) +#endif /* JERRY_REGEXP_DUMP_BYTE_CODE */ +#if JERRY_SNAPSHOT_SAVE || feature == JERRY_FEATURE_SNAPSHOT_SAVE -#endif /* ENABLED (JERRY_SNAPSHOT_SAVE) */ -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#endif /* JERRY_SNAPSHOT_SAVE */ +#if JERRY_SNAPSHOT_EXEC || feature == JERRY_FEATURE_SNAPSHOT_EXEC -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ -#if ENABLED (JERRY_DEBUGGER) +#endif /* JERRY_SNAPSHOT_EXEC */ +#if JERRY_DEBUGGER || feature == JERRY_FEATURE_DEBUGGER -#endif /* ENABLED (JERRY_DEBUGGER) */ -#if ENABLED (JERRY_VM_EXEC_STOP) +#endif /* JERRY_DEBUGGER */ +#if JERRY_VM_EXEC_STOP || feature == JERRY_FEATURE_VM_EXEC_STOP -#endif /* ENABLED (JERRY_VM_EXEC_STOP) */ -#if ENABLED (JERRY_BUILTIN_JSON) +#endif /* JERRY_VM_EXEC_STOP */ +#if JERRY_BUILTIN_JSON || feature == JERRY_FEATURE_JSON -#endif /* ENABLED (JERRY_BUILTIN_JSON) */ -#if ENABLED (JERRY_BUILTIN_PROMISE) +#endif /* JERRY_BUILTIN_JSON */ +#if JERRY_BUILTIN_PROMISE || feature == JERRY_FEATURE_PROMISE -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ -#if ENABLED (JERRY_ESNEXT) +#endif /* JERRY_BUILTIN_PROMISE */ +#if JERRY_ESNEXT || feature == JERRY_FEATURE_SYMBOL -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#endif /* JERRY_ESNEXT */ +#if JERRY_BUILTIN_TYPEDARRAY || feature == JERRY_FEATURE_TYPEDARRAY -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#endif /* JERRY_BUILTIN_TYPEDARRAY */ +#if JERRY_BUILTIN_DATAVIEW || feature == JERRY_FEATURE_DATAVIEW -#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW) */ -#if ENABLED (JERRY_BUILTIN_PROXY) +#endif /* JERRY_BUILTIN_DATAVIEW */ +#if JERRY_BUILTIN_PROXY || feature == JERRY_FEATURE_PROXY -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ -#if ENABLED (JERRY_BUILTIN_DATE) +#endif /* JERRY_BUILTIN_PROXY */ +#if JERRY_BUILTIN_DATE || feature == JERRY_FEATURE_DATE -#endif /* ENABLED (JERRY_BUILTIN_DATE) */ -#if ENABLED (JERRY_BUILTIN_REGEXP) +#endif /* JERRY_BUILTIN_DATE */ +#if JERRY_BUILTIN_REGEXP || feature == JERRY_FEATURE_REGEXP -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ -#if ENABLED (JERRY_LINE_INFO) +#endif /* JERRY_BUILTIN_REGEXP */ +#if JERRY_LINE_INFO || feature == JERRY_FEATURE_LINE_INFO -#endif /* ENABLED (JERRY_LINE_INFO) */ -#if ENABLED (JERRY_LOGGING) +#endif /* JERRY_LINE_INFO */ +#if JERRY_LOGGING || feature == JERRY_FEATURE_LOGGING -#endif /* ENABLED (JERRY_LOGGING) */ -#if ENABLED (JERRY_BUILTIN_MAP) +#endif /* JERRY_LOGGING */ +#if JERRY_BUILTIN_MAP || feature == JERRY_FEATURE_MAP -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ -#if ENABLED (JERRY_BUILTIN_SET) +#endif /* JERRY_BUILTIN_MAP */ +#if JERRY_BUILTIN_SET || feature == JERRY_FEATURE_SET -#endif /* ENABLED (JERRY_BUILTIN_SET) */ -#if ENABLED (JERRY_BUILTIN_WEAKMAP) +#endif /* JERRY_BUILTIN_SET */ +#if JERRY_BUILTIN_WEAKMAP || feature == JERRY_FEATURE_WEAKMAP -#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ -#if ENABLED (JERRY_BUILTIN_WEAKSET) +#endif /* JERRY_BUILTIN_WEAKMAP */ +#if JERRY_BUILTIN_WEAKSET || feature == JERRY_FEATURE_WEAKSET -#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#endif /* JERRY_BUILTIN_WEAKSET */ +#if JERRY_BUILTIN_BIGINT || feature == JERRY_FEATURE_BIGINT -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ -#if ENABLED (JERRY_BUILTIN_REALMS) +#endif /* JERRY_BUILTIN_BIGINT */ +#if JERRY_BUILTIN_REALMS || feature == JERRY_FEATURE_REALM -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ ); } /* jerry_is_feature_enabled */ @@ -1847,17 +1847,17 @@ jerry_value_to_bigint (const jerry_value_t value) /**< input value */ { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (ecma_is_value_error_reference (value)) { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_value_msg_p))); } return jerry_return (ecma_bigint_to_bigint (value, true)); -#else /* !ENABLED (JERRY_BUILTIN_BIGINT) */ +#else /* !JERRY_BUILTIN_BIGINT */ JERRY_UNUSED (value); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_bigint_not_supported_p))); -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ } /* jerry_value_to_bigint */ /** @@ -2183,7 +2183,7 @@ jerry_create_promise (void) { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target_p); if (old_new_target_p == NULL) @@ -2195,9 +2195,9 @@ jerry_create_promise (void) JERRY_CONTEXT (current_new_target_p) = old_new_target_p; return promise_value; -#else /* !ENABLED (JERRY_BUILTIN_PROMISE) */ +#else /* !JERRY_BUILTIN_PROMISE */ return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_promise_not_supported_p))); -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ } /* jerry_create_promise */ /** @@ -2220,22 +2220,22 @@ jerry_create_proxy (const jerry_value_t target, /**< target argument */ return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (wrong_args_msg_p))); } -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY ecma_object_t *proxy_p = ecma_proxy_create (target, handler, 0); return jerry_return (proxy_p == NULL ? ECMA_VALUE_ERROR : ecma_make_object_value (proxy_p)); -#else /* !ENABLED (JERRY_BUILTIN_PROXY) */ +#else /* !JERRY_BUILTIN_PROXY */ return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Proxy is not supported"))); -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ } /* jerry_create_proxy */ -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY JERRY_STATIC_ASSERT ((int) JERRY_PROXY_SKIP_GET_CHECKS == (int) ECMA_PROXY_SKIP_GET_CHECKS, jerry_and_ecma_proxy_skip_get_checks_must_be_equal); JERRY_STATIC_ASSERT ((int) JERRY_PROXY_SKIP_GET_OWN_PROPERTY_CHECKS == (int) ECMA_PROXY_SKIP_GET_OWN_PROPERTY_CHECKS, jerry_and_ecma_proxy_skip_get_own_property_checks_must_be_equal); -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ /** * Create a new Proxy object with the given target, handler, and special options @@ -2258,17 +2258,17 @@ jerry_create_special_proxy (const jerry_value_t target, /**< target argument */ return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (wrong_args_msg_p))); } -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY const uint32_t options_mask = (JERRY_PROXY_SKIP_GET_CHECKS | JERRY_PROXY_SKIP_GET_OWN_PROPERTY_CHECKS); options &= options_mask; ecma_object_t *proxy_p = ecma_proxy_create (target, handler, options); return jerry_return (proxy_p == NULL ? ECMA_VALUE_ERROR : ecma_make_object_value (proxy_p)); -#else /* !ENABLED (JERRY_BUILTIN_PROXY) */ +#else /* !JERRY_BUILTIN_PROXY */ JERRY_UNUSED (options); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Proxy is not supported"))); -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ } /* jerry_create_special_proxy */ /** @@ -2394,11 +2394,11 @@ jerry_create_symbol (const jerry_value_t value) /**< api value */ return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (wrong_args_msg_p))); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT return jerry_return (ecma_op_create_symbol (&value, 1)); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_symbol_not_supported_p))); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* jerry_create_symbol */ /** @@ -2414,14 +2414,14 @@ jerry_create_bigint (const uint64_t *digits_p, /**< BigInt digits (lowest digit { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT return jerry_return (ecma_bigint_create_from_digits (digits_p, size, sign)); -#else /* !ENABLED (JERRY_BUILTIN_BIGINT) */ +#else /* !JERRY_BUILTIN_BIGINT */ JERRY_UNUSED (digits_p); JERRY_UNUSED (size); JERRY_UNUSED (sign); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_bigint_not_supported_p))); -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ } /* jerry_create_bigint */ /** @@ -2448,7 +2448,7 @@ jerry_create_regexp_sz (const jerry_char_t *pattern_p, /**< zero-terminated UTF- { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP if (!lit_is_valid_utf8_string (pattern_p, pattern_size)) { return jerry_throw (ecma_raise_common_error (ECMA_ERR_MSG ("Input must be a valid utf8 string"))); @@ -2470,13 +2470,13 @@ jerry_create_regexp_sz (const jerry_char_t *pattern_p, /**< zero-terminated UTF- return ret_val; -#else /* !ENABLED (JERRY_BUILTIN_REGEXP) */ +#else /* !JERRY_BUILTIN_REGEXP */ JERRY_UNUSED (pattern_p); JERRY_UNUSED (pattern_size); JERRY_UNUSED (flags); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("RegExp is not supported"))); -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ } /* jerry_create_regexp_sz */ /** @@ -2489,12 +2489,12 @@ jerry_create_realm (void) { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_global_object_t *global_object_p = ecma_builtin_create_global_object (); return ecma_make_object_value ((ecma_object_t *) global_object_p); -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Realms are disabled"))); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ } /* jerry_create_realm */ /** @@ -2798,7 +2798,7 @@ jerry_has_own_property (const jerry_value_t obj_val, /**< object value */ ecma_object_t *obj_p = ecma_get_object_from_value (obj_val); ecma_string_t *prop_name_p = ecma_get_prop_name_from_value (prop_name_val); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (obj_p)) { ecma_property_descriptor_t prop_desc; @@ -2812,7 +2812,7 @@ jerry_has_own_property (const jerry_value_t obj_val, /**< object value */ return jerry_return (status); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ return ecma_make_boolean_value (ecma_op_ordinary_object_has_own_property (obj_p, prop_name_p)); } /* jerry_has_own_property */ @@ -2879,13 +2879,13 @@ jerry_delete_property (const jerry_value_t obj_val, /**< object value */ ecma_get_prop_name_from_value (prop_name_val), false); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (ret_value)) { // TODO: Due to Proxies the return value must be changed to jerry_value_t on next release jcontext_release_exception (); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ return ecma_is_value_true (ret_value); } /* jerry_delete_property */ @@ -2913,13 +2913,13 @@ jerry_delete_property_by_index (const jerry_value_t obj_val, /**< object value * false); ecma_deref_ecma_string (str_idx_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (ret_value)) { // TODO: Due to Proxies the return value must be changed to jerry_value_t on next release jcontext_release_exception (); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ return ecma_is_value_true (ret_value); } /* jerry_delete_property_by_index */ @@ -3450,13 +3450,13 @@ jerry_get_own_property_descriptor (const jerry_value_t obj_val, /**< object val ecma_get_prop_name_from_value (prop_name_val), &prop_desc); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (status)) { // TODO: Due to Proxies the return value must be changed to jerry_value_t on next release jcontext_release_exception (); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ if (!ecma_is_value_true (status)) { @@ -3677,12 +3677,12 @@ jerry_get_object_keys (const jerry_value_t obj_val) /**< object value */ ecma_collection_t *prop_names = ecma_op_object_get_enumerable_property_names (ecma_get_object_from_value (obj_val), ECMA_ENUMERABLE_PROPERTY_KEYS); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (JERRY_UNLIKELY (prop_names == NULL)) { return ECMA_VALUE_ERROR; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ return ecma_op_new_array_object_from_collection (prop_names, false); } /* jerry_get_object_keys */ @@ -3708,12 +3708,12 @@ jerry_get_prototype (const jerry_value_t obj_val) /**< object value */ ecma_object_t *obj_p = ecma_get_object_from_value (obj_val); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (obj_p)) { return jerry_return (ecma_proxy_object_get_prototype_of (obj_p)); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ if (obj_p->u2.prototype_cp == JMEM_CP_NULL) { @@ -3746,12 +3746,12 @@ jerry_set_prototype (const jerry_value_t obj_val, /**< object value */ } ecma_object_t *obj_p = ecma_get_object_from_value (obj_val); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (obj_p)) { return jerry_return (ecma_proxy_object_set_prototype_of (obj_p, proto_obj_val)); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ return ecma_op_ordinary_object_set_prototype_of (obj_p, proto_obj_val); } /* jerry_set_prototype */ @@ -3982,14 +3982,14 @@ jerry_foreach_object_property (const jerry_value_t obj_val, /**< object value */ ecma_object_t *object_p = ecma_get_object_from_value (obj_val); ecma_collection_t *names_p = ecma_op_object_enumerate (object_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (names_p == NULL) { // TODO: Due to Proxies the return value must be changed to jerry_value_t on next release jcontext_release_exception (); return false; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ ecma_value_t *buffer_p = names_p->buffer_p; @@ -4051,13 +4051,13 @@ jerry_object_get_property_names (const jerry_value_t obj_val, /**< object */ /* Step 1. Get Object.[[OwnKeys]] */ ecma_collection_t *prop_names_p = ecma_op_object_own_property_keys (obj_iter_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (prop_names_p == NULL) { ecma_deref_object (obj_iter_p); return jerry_throw (ECMA_VALUE_ERROR); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ for (uint32_t i = 0; i < prop_names_p->item_count; i++) { @@ -4100,7 +4100,7 @@ jerry_object_get_property_names (const jerry_value_t obj_val, /**< object */ ecma_property_descriptor_t prop_desc; ecma_value_t status = ecma_op_object_get_own_property_descriptor (obj_iter_p, key_p, &prop_desc); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (status)) { ecma_collection_free (prop_names_p); @@ -4108,7 +4108,7 @@ jerry_object_get_property_names (const jerry_value_t obj_val, /**< object */ ecma_deref_object (obj_iter_p); return jerry_throw (ECMA_VALUE_ERROR); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ JERRY_ASSERT (ecma_is_value_true (status)); uint16_t flags = prop_desc.flags; @@ -4265,7 +4265,7 @@ jerry_resolve_or_reject_promise (jerry_value_t promise, /**< the promise value * { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE if (!ecma_is_value_object (promise) || !ecma_is_promise (ecma_get_object_from_value (promise))) { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (wrong_args_msg_p))); @@ -4283,13 +4283,13 @@ jerry_resolve_or_reject_promise (jerry_value_t promise, /**< the promise value * ECMA_VALUE_UNDEFINED, &argument, 1); -#else /* !ENABLED (JERRY_BUILTIN_PROMISE) */ +#else /* !JERRY_BUILTIN_PROMISE */ JERRY_UNUSED (promise); JERRY_UNUSED (argument); JERRY_UNUSED (is_resolve); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_promise_not_supported_p))); -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ } /* jerry_resolve_or_reject_promise */ /** @@ -4303,17 +4303,17 @@ jerry_get_promise_result (const jerry_value_t promise) /**< promise object to ge { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE if (!jerry_value_is_promise (promise)) { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (wrong_args_msg_p))); } return ecma_promise_get_result (ecma_get_object_from_value (promise)); -#else /* !ENABLED (JERRY_BUILTIN_PROMISE) */ +#else /* !JERRY_BUILTIN_PROMISE */ JERRY_UNUSED (promise); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_promise_not_supported_p))); -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ } /* jerry_get_promise_result */ /** @@ -4328,7 +4328,7 @@ jerry_get_promise_state (const jerry_value_t promise) /**< promise object to get { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE if (!jerry_value_is_promise (promise)) { return JERRY_PROMISE_STATE_NONE; @@ -4338,10 +4338,10 @@ jerry_get_promise_state (const jerry_value_t promise) /**< promise object to get flags &= (ECMA_PROMISE_IS_PENDING | ECMA_PROMISE_IS_FULFILLED); return (flags ? flags : JERRY_PROMISE_STATE_REJECTED); -#else /* !ENABLED (JERRY_BUILTIN_PROMISE) */ +#else /* !JERRY_BUILTIN_PROMISE */ JERRY_UNUSED (promise); return JERRY_PROMISE_STATE_NONE; -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ } /* jerry_get_promise_state */ /** @@ -4358,7 +4358,7 @@ jerry_get_well_known_symbol (jerry_well_known_symbol_t symbol) /**< jerry_well_k { jerry_assert_api_available (); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT lit_magic_string_id_t id = (lit_magic_string_id_t) (LIT_GLOBAL_SYMBOL__FIRST + symbol); if (!LIT_IS_GLOBAL_SYMBOL (id)) @@ -4367,11 +4367,11 @@ jerry_get_well_known_symbol (jerry_well_known_symbol_t symbol) /**< jerry_well_k } return ecma_make_symbol_value (ecma_op_get_global_symbol (id)); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_UNUSED (symbol); return ECMA_VALUE_UNDEFINED; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /** jerry_get_well_known_symbol */ /** @@ -4388,7 +4388,7 @@ jerry_get_symbol_description (const jerry_value_t symbol) /**< symbol value */ { jerry_assert_api_available (); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (!ecma_is_value_symbol (symbol)) { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (wrong_args_msg_p))); @@ -4396,11 +4396,11 @@ jerry_get_symbol_description (const jerry_value_t symbol) /**< symbol value */ /* Note: This operation cannot throw an error */ return ecma_copy_value (ecma_get_symbol_description (ecma_get_symbol_from_value (symbol))); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_UNUSED (symbol); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_symbol_not_supported_p))); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* jerry_get_symbol_description */ /** @@ -4417,7 +4417,7 @@ jerry_get_symbol_descriptive_string (const jerry_value_t symbol) /**< symbol val { jerry_assert_api_available (); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (!ecma_is_value_symbol (symbol)) { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (wrong_args_msg_p))); @@ -4425,11 +4425,11 @@ jerry_get_symbol_descriptive_string (const jerry_value_t symbol) /**< symbol val /* Note: This operation cannot throw an error */ return ecma_get_symbol_descriptive_string (symbol); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_UNUSED (symbol); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_symbol_not_supported_p))); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /** jerry_get_symbol_descriptive_string */ /** @@ -4442,17 +4442,17 @@ jerry_get_bigint_size_in_digits (jerry_value_t value) /**< BigInt value */ { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (!ecma_is_value_bigint (value)) { return 0; } return ecma_bigint_get_size_in_digits (value); -#else /* !ENABLED (JERRY_BUILTIN_BIGINT) */ +#else /* !JERRY_BUILTIN_BIGINT */ JERRY_UNUSED (value); return 0; -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ } /* jerry_get_bigint_size_in_digits */ /** @@ -4464,7 +4464,7 @@ jerry_get_bigint_digits (jerry_value_t value, /**< BigInt value */ uint32_t size, /**< buffer size in digits */ bool *sign_p) /**< [out] sign of BigInt */ { -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (!ecma_is_value_bigint (value)) { if (sign_p != NULL) @@ -4475,7 +4475,7 @@ jerry_get_bigint_digits (jerry_value_t value, /**< BigInt value */ } ecma_bigint_get_digits_and_sign (value, digits_p, size, sign_p); -#else /* !ENABLED (JERRY_BUILTIN_BIGINT) */ +#else /* !JERRY_BUILTIN_BIGINT */ JERRY_UNUSED (value); if (sign_p != NULL) @@ -4483,7 +4483,7 @@ jerry_get_bigint_digits (jerry_value_t value, /**< BigInt value */ *sign_p = false; } memset (digits_p, 0, size * sizeof (uint64_t)); -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ } /* jerry_get_bigint_digits */ /** @@ -4497,7 +4497,7 @@ jerry_get_proxy_target (jerry_value_t proxy_value) /**< proxy value */ { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ecma_is_value_object (proxy_value)) { ecma_object_t *object_p = ecma_get_object_from_value (proxy_value); @@ -4513,9 +4513,9 @@ jerry_get_proxy_target (jerry_value_t proxy_value) /**< proxy value */ return proxy_object_p->target; } } -#else /* !ENABLED (JERRY_BUILTIN_PROXY) */ +#else /* !JERRY_BUILTIN_PROXY */ JERRY_UNUSED (proxy_value); -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Passed value is not a proxy object"))); } /* jerry_get_proxy_target */ @@ -4591,11 +4591,11 @@ jerry_create_context (uint32_t heap_size, /**< the size of heap */ { JERRY_UNUSED (heap_size); -#if ENABLED (JERRY_EXTERNAL_CONTEXT) +#if JERRY_EXTERNAL_CONTEXT size_t total_size = sizeof (jerry_context_t) + JMEM_ALIGNMENT; -#if !ENABLED (JERRY_SYSTEM_ALLOCATOR) +#if !JERRY_SYSTEM_ALLOCATOR heap_size = JERRY_ALIGNUP (heap_size, JMEM_ALIGNMENT); /* Minimum heap size is 1Kbyte. */ @@ -4605,7 +4605,7 @@ jerry_create_context (uint32_t heap_size, /**< the size of heap */ } total_size += heap_size; -#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */ +#endif /* !JERRY_SYSTEM_ALLOCATOR */ total_size = JERRY_ALIGNUP (total_size, JMEM_ALIGNMENT); @@ -4623,25 +4623,25 @@ jerry_create_context (uint32_t heap_size, /**< the size of heap */ uint8_t *byte_p = (uint8_t *) context_ptr; -#if !ENABLED (JERRY_SYSTEM_ALLOCATOR) +#if !JERRY_SYSTEM_ALLOCATOR context_p->heap_p = (jmem_heap_t *) byte_p; context_p->heap_size = heap_size; byte_p += heap_size; -#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */ +#endif /* !JERRY_SYSTEM_ALLOCATOR */ JERRY_ASSERT (byte_p <= ((uint8_t *) context_p) + total_size); JERRY_UNUSED (byte_p); return context_p; -#else /* !ENABLED (JERRY_EXTERNAL_CONTEXT) */ +#else /* !JERRY_EXTERNAL_CONTEXT */ JERRY_UNUSED (alloc); JERRY_UNUSED (cb_data_p); return NULL; -#endif /* ENABLED (JERRY_EXTERNAL_CONTEXT) */ +#endif /* JERRY_EXTERNAL_CONTEXT */ } /* jerry_create_context */ /** @@ -4654,7 +4654,7 @@ jerry_set_vm_exec_stop_callback (jerry_vm_exec_stop_callback_t stop_cb, /**< per void *user_p, /**< pointer passed to the function */ uint32_t frequency) /**< frequency of the function call */ { -#if ENABLED (JERRY_VM_EXEC_STOP) +#if JERRY_VM_EXEC_STOP if (frequency == 0) { frequency = 1; @@ -4664,11 +4664,11 @@ jerry_set_vm_exec_stop_callback (jerry_vm_exec_stop_callback_t stop_cb, /**< per JERRY_CONTEXT (vm_exec_stop_counter) = frequency; JERRY_CONTEXT (vm_exec_stop_user_p) = user_p; JERRY_CONTEXT (vm_exec_stop_cb) = stop_cb; -#else /* !ENABLED (JERRY_VM_EXEC_STOP) */ +#else /* !JERRY_VM_EXEC_STOP */ JERRY_UNUSED (stop_cb); JERRY_UNUSED (user_p); JERRY_UNUSED (frequency); -#endif /* ENABLED (JERRY_VM_EXEC_STOP) */ +#endif /* JERRY_VM_EXEC_STOP */ } /* jerry_set_vm_exec_stop_callback */ /** @@ -4731,7 +4731,7 @@ jerry_backtrace_get_location (jerry_backtrace_frame_t *frame_p) /**< frame point { JERRY_UNUSED (frame_p); -#if ENABLED (JERRY_LINE_INFO) +#if JERRY_LINE_INFO if (frame_p->frame_type == JERRY_BACKTRACE_FRAME_JS) { vm_frame_ctx_t *context_p = frame_p->context_p; @@ -4741,7 +4741,7 @@ jerry_backtrace_get_location (jerry_backtrace_frame_t *frame_p) /**< frame point frame_p->location.column = 1; return &frame_p->location; } -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ return NULL; } /* jerry_backtrace_get_location */ @@ -4798,7 +4798,7 @@ jerry_backtrace_is_strict (jerry_backtrace_frame_t *frame_p) /**< frame pointer jerry_value_t jerry_get_resource_name (const jerry_value_t value) /**< jerry api value */ { -#if ENABLED (JERRY_RESOURCE_NAME) +#if JERRY_RESOURCE_NAME if (ecma_is_value_undefined (value)) { if (JERRY_CONTEXT (vm_top_context_p) != NULL) @@ -4820,7 +4820,7 @@ jerry_get_resource_name (const jerry_value_t value) /**< jerry api value */ return ecma_copy_value (ecma_get_resource_name (bytecode_data_p)); } } -#endif /* ENABLED (JERRY_RESOURCE_NAME) */ +#endif /* JERRY_RESOURCE_NAME */ JERRY_UNUSED (value); return ecma_make_magic_string_value (LIT_MAGIC_STRING_RESOURCE_ANON); @@ -4839,7 +4839,7 @@ jerry_get_resource_name (const jerry_value_t value) /**< jerry api value */ jerry_value_t jerry_get_new_target (void) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_object_t *current_new_target_p = JERRY_CONTEXT (current_new_target_p); if (current_new_target_p == NULL) @@ -4849,9 +4849,9 @@ jerry_get_new_target (void) ecma_ref_object (current_new_target_p); return ecma_make_object_value (current_new_target_p); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ return jerry_create_undefined (); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* jerry_get_new_target */ /** @@ -4871,7 +4871,7 @@ jerry_set_realm (jerry_value_t realm_value) /**< jerry api value */ { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS if (ecma_is_value_object (realm_value)) { ecma_object_t *object_p = ecma_get_object_from_value (realm_value); @@ -4886,10 +4886,10 @@ jerry_set_realm (jerry_value_t realm_value) /**< jerry api value */ } return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Passed argument is not a realm"))); -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ JERRY_UNUSED (realm_value); return jerry_throw (ecma_raise_reference_error (ECMA_ERR_MSG ("Realm is not available"))); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ } /* jerry_set_realm */ /** @@ -4903,7 +4903,7 @@ jerry_realm_get_this (jerry_value_t realm_value) /**< realm value */ { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS if (ecma_is_value_object (realm_value)) { ecma_object_t *object_p = ecma_get_object_from_value (realm_value); @@ -4918,7 +4918,7 @@ jerry_realm_get_this (jerry_value_t realm_value) /**< realm value */ } } -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ ecma_object_t *global_object_p = ecma_builtin_get_global (); if (realm_value == ecma_make_object_value (global_object_p)) @@ -4926,7 +4926,7 @@ jerry_realm_get_this (jerry_value_t realm_value) /**< realm value */ ecma_ref_object (global_object_p); return realm_value; } -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Passed argument is not a realm"))); } /* jerry_realm_get_this */ @@ -4946,7 +4946,7 @@ jerry_realm_set_this (jerry_value_t realm_value, /**< realm value */ { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS if (!ecma_is_value_object (this_value)) { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Second argument must be an object"))); @@ -4967,20 +4967,20 @@ jerry_realm_set_this (jerry_value_t realm_value, /**< realm value */ ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND); ECMA_SET_NON_NULL_POINTER (global_object_p->global_env_cp, global_lex_env_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT global_object_p->global_scope_cp = global_object_p->global_env_cp; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_deref_object (global_lex_env_p); return ECMA_VALUE_TRUE; } } return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("First argument is not a realm"))); -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ JERRY_UNUSED (realm_value); JERRY_UNUSED (this_value); return jerry_throw (ecma_raise_reference_error (ECMA_ERR_MSG ("Realm is not available"))); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ } /* jerry_realm_set_this */ /** @@ -4994,12 +4994,12 @@ jerry_value_is_arraybuffer (const jerry_value_t value) /**< value to check if it { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY return ecma_is_arraybuffer (value); -#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#else /* !JERRY_BUILTIN_TYPEDARRAY */ JERRY_UNUSED (value); return false; -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ } /* jerry_value_is_arraybuffer */ /** @@ -5017,12 +5017,12 @@ jerry_create_arraybuffer (const jerry_length_t size) /**< size of the ArrayBuffe { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY return jerry_return (ecma_make_object_value (ecma_arraybuffer_new_object (size))); -#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#else /* !JERRY_BUILTIN_TYPEDARRAY */ JERRY_UNUSED (size); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_typed_array_not_supported_p))); -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ } /* jerry_create_arraybuffer */ /** @@ -5043,7 +5043,7 @@ jerry_create_arraybuffer_external (const jerry_length_t size, /**< size of the b { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY ecma_object_t *arraybuffer; if (JERRY_UNLIKELY (size == 0 || buffer_p == NULL)) @@ -5058,12 +5058,12 @@ jerry_create_arraybuffer_external (const jerry_length_t size, /**< size of the b } return jerry_return (ecma_make_object_value (arraybuffer)); -#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#else /* !JERRY_BUILTIN_TYPEDARRAY */ JERRY_UNUSED (size); JERRY_UNUSED (buffer_p); JERRY_UNUSED (free_cb); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_typed_array_not_supported_p))); -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ } /* jerry_create_arraybuffer_external */ /** @@ -5082,7 +5082,7 @@ jerry_arraybuffer_write (const jerry_value_t value, /**< target ArrayBuffer */ { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY if (!ecma_is_arraybuffer (value)) { return 0; @@ -5106,13 +5106,13 @@ jerry_arraybuffer_write (const jerry_value_t value, /**< target ArrayBuffer */ } return copy_count; -#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#else /* !JERRY_BUILTIN_TYPEDARRAY */ JERRY_UNUSED (value); JERRY_UNUSED (offset); JERRY_UNUSED (buf_p); JERRY_UNUSED (buf_size); return 0; -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ } /* jerry_arraybuffer_write */ /** @@ -5131,7 +5131,7 @@ jerry_arraybuffer_read (const jerry_value_t value, /**< ArrayBuffer to read from { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY if (!ecma_is_arraybuffer (value)) { return 0; @@ -5155,13 +5155,13 @@ jerry_arraybuffer_read (const jerry_value_t value, /**< ArrayBuffer to read from } return copy_count; -#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#else /* !JERRY_BUILTIN_TYPEDARRAY */ JERRY_UNUSED (value); JERRY_UNUSED (offset); JERRY_UNUSED (buf_p); JERRY_UNUSED (buf_size); return 0; -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ } /* jerry_arraybuffer_read */ /** @@ -5177,15 +5177,15 @@ jerry_get_arraybuffer_byte_length (const jerry_value_t value) /**< ArrayBuffer * { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY if (ecma_is_arraybuffer (value)) { ecma_object_t *buffer_p = ecma_get_object_from_value (value); return ecma_arraybuffer_get_length (buffer_p); } -#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#else /* !JERRY_BUILTIN_TYPEDARRAY */ JERRY_UNUSED (value); -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ return 0; } /* jerry_get_arraybuffer_byte_length */ @@ -5206,7 +5206,7 @@ jerry_get_arraybuffer_pointer (const jerry_value_t array_buffer) /**< Array Buff { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY if (ecma_is_value_error_reference (array_buffer) || !ecma_is_arraybuffer (array_buffer)) { @@ -5216,9 +5216,9 @@ jerry_get_arraybuffer_pointer (const jerry_value_t array_buffer) /**< Array Buff ecma_object_t *buffer_p = ecma_get_object_from_value (array_buffer); lit_utf8_byte_t *mem_buffer_p = ecma_arraybuffer_get_buffer (buffer_p); return (uint8_t *const) mem_buffer_p; -#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#else /* !JERRY_BUILTIN_TYPEDARRAY */ JERRY_UNUSED (array_buffer); -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ return NULL; } /* jerry_get_arraybuffer_pointer */ @@ -5234,15 +5234,15 @@ jerry_is_arraybuffer_detachable (const jerry_value_t value) /**< ArrayBuffer */ { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY if (ecma_is_arraybuffer (value)) { ecma_object_t *buffer_p = ecma_get_object_from_value (value); return ecma_arraybuffer_is_detached (buffer_p) ? ECMA_VALUE_FALSE : ECMA_VALUE_TRUE; } -#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#else /* !JERRY_BUILTIN_TYPEDARRAY */ JERRY_UNUSED (value); -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Expected an ArrayBuffer"))); } /* jerry_is_arraybuffer_detachable */ @@ -5260,7 +5260,7 @@ jerry_detach_arraybuffer (const jerry_value_t value) /**< ArrayBuffer */ { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY if (ecma_is_arraybuffer (value)) { ecma_object_t *buffer_p = ecma_get_object_from_value (value); @@ -5270,9 +5270,9 @@ jerry_detach_arraybuffer (const jerry_value_t value) /**< ArrayBuffer */ } return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("ArrayBuffer has already been detached"))); } -#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#else /* !JERRY_BUILTIN_TYPEDARRAY */ JERRY_UNUSED (value); -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Expected an ArrayBuffer"))); } /* jerry_detach_arraybuffer */ @@ -5297,7 +5297,7 @@ jerry_create_dataview (const jerry_value_t array_buffer, /**< arraybuffer to cre { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW if (ecma_is_value_error_reference (array_buffer)) { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (wrong_args_msg_p))); @@ -5318,12 +5318,12 @@ jerry_create_dataview (const jerry_value_t array_buffer, /**< arraybuffer to cre ecma_value_t dataview_value = ecma_op_dataview_create (arguments_p, 3); JERRY_CONTEXT (current_new_target_p) = old_new_target_p; return jerry_return (dataview_value); -#else /* !ENABLED (JERRY_BUILTIN_DATAVIEW) */ +#else /* !JERRY_BUILTIN_DATAVIEW */ JERRY_UNUSED (array_buffer); JERRY_UNUSED (byte_offset); JERRY_UNUSED (byte_length); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_data_view_not_supported_p))); -#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW) */ +#endif /* JERRY_BUILTIN_DATAVIEW */ } /* jerry_create_dataview */ /** @@ -5337,12 +5337,12 @@ jerry_value_is_dataview (const jerry_value_t value) /**< value to check if it is { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW return ecma_is_dataview (value); -#else /* !ENABLED (JERRY_BUILTIN_DATAVIEW) */ +#else /* !JERRY_BUILTIN_DATAVIEW */ JERRY_UNUSED (value); return false; -#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW) */ +#endif /* JERRY_BUILTIN_DATAVIEW */ } /* jerry_value_is_dataview */ /** @@ -5364,7 +5364,7 @@ jerry_get_dataview_buffer (const jerry_value_t value, /**< DataView to get the a { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW if (ecma_is_value_error_reference (value)) { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (wrong_args_msg_p))); @@ -5391,12 +5391,12 @@ jerry_get_dataview_buffer (const jerry_value_t value, /**< DataView to get the a ecma_ref_object (arraybuffer_p); return ecma_make_object_value (arraybuffer_p); -#else /* !ENABLED (JERRY_BUILTIN_DATAVIEW) */ +#else /* !JERRY_BUILTIN_DATAVIEW */ JERRY_UNUSED (value); JERRY_UNUSED (byte_offset); JERRY_UNUSED (byte_length); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_data_view_not_supported_p))); -#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW) */ +#endif /* JERRY_BUILTIN_DATAVIEW */ } /* jerry_get_dataview_buffer */ /** @@ -5414,15 +5414,15 @@ jerry_value_is_typedarray (jerry_value_t value) /**< value to check if it is a T { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY return ecma_is_typedarray (value); -#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#else /* !JERRY_BUILTIN_TYPEDARRAY */ JERRY_UNUSED (value); return false; -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ } /* jerry_value_is_typedarray */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY /** * TypedArray mapping type */ @@ -5451,13 +5451,13 @@ static jerry_typedarray_mapping_t jerry_typedarray_mappings[] = TYPEDARRAY_ENTRY (UINT32, UINT32, 2), TYPEDARRAY_ENTRY (INT32, INT32, 2), TYPEDARRAY_ENTRY (FLOAT32, FLOAT32, 2), -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 TYPEDARRAY_ENTRY (FLOAT64, FLOAT64, 3), -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ +#if JERRY_BUILTIN_BIGINT TYPEDARRAY_ENTRY (BIGINT64, BIGINT64, 3), TYPEDARRAY_ENTRY (BIGUINT64, BIGUINT64, 3), -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ #undef TYPEDARRAY_ENTRY }; @@ -5492,7 +5492,7 @@ jerry_typedarray_find_by_type (jerry_typedarray_type_t type_name, /**< type of t return false; } /* jerry_typedarray_find_by_type */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ /** * Create a TypedArray object with a given type and length. @@ -5510,7 +5510,7 @@ jerry_create_typedarray (jerry_typedarray_type_t type_name, /**< type of TypedAr { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY ecma_builtin_id_t prototype_id = 0; ecma_typedarray_type_t id = 0; uint8_t element_size_shift = 0; @@ -5531,11 +5531,11 @@ jerry_create_typedarray (jerry_typedarray_type_t type_name, /**< type of TypedAr JERRY_ASSERT (!ECMA_IS_VALUE_ERROR (array_value)); return array_value; -#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#else /* !JERRY_BUILTIN_TYPEDARRAY */ JERRY_UNUSED (type_name); JERRY_UNUSED (length); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_typed_array_not_supported_p))); -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ } /* jerry_create_typedarray */ /** @@ -5555,7 +5555,7 @@ jerry_create_typedarray_for_arraybuffer_sz (jerry_typedarray_type_t type_name, / { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY if (ecma_is_value_error_reference (arraybuffer)) { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_value_msg_p))); @@ -5588,13 +5588,13 @@ jerry_create_typedarray_for_arraybuffer_sz (jerry_typedarray_type_t type_name, / ecma_free_value (arguments_p[2]); return jerry_return (array_value); -#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#else /* !JERRY_BUILTIN_TYPEDARRAY */ JERRY_UNUSED (type_name); JERRY_UNUSED (arraybuffer); JERRY_UNUSED (byte_offset); JERRY_UNUSED (length); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_typed_array_not_supported_p))); -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ } /* jerry_create_typedarray_for_arraybuffer_sz */ /** @@ -5612,7 +5612,7 @@ jerry_create_typedarray_for_arraybuffer (jerry_typedarray_type_t type_name, /**< { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY if (ecma_is_value_error_reference (arraybuffer)) { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_value_msg_p))); @@ -5620,11 +5620,11 @@ jerry_create_typedarray_for_arraybuffer (jerry_typedarray_type_t type_name, /**< jerry_length_t byteLength = jerry_get_arraybuffer_byte_length (arraybuffer); return jerry_create_typedarray_for_arraybuffer_sz (type_name, arraybuffer, 0, byteLength); -#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#else /* !JERRY_BUILTIN_TYPEDARRAY */ JERRY_UNUSED (type_name); JERRY_UNUSED (arraybuffer); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_typed_array_not_supported_p))); -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ } /* jerry_create_typedarray_for_arraybuffer */ /** @@ -5638,7 +5638,7 @@ jerry_get_typedarray_type (jerry_value_t value) /**< object to get the TypedArra { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY if (!ecma_is_typedarray (value)) { return JERRY_TYPEDARRAY_INVALID; @@ -5654,9 +5654,9 @@ jerry_get_typedarray_type (jerry_value_t value) /**< object to get the TypedArra return jerry_typedarray_mappings[i].api_type; } } -#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#else /* !JERRY_BUILTIN_TYPEDARRAY */ JERRY_UNUSED (value); -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ return JERRY_TYPEDARRAY_INVALID; } /* jerry_get_typedarray_type */ @@ -5671,15 +5671,15 @@ jerry_get_typedarray_length (jerry_value_t value) /**< TypedArray to query */ { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY if (ecma_is_typedarray (value)) { ecma_object_t *array_p = ecma_get_object_from_value (value); return ecma_typedarray_get_length (array_p); } -#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#else /* !JERRY_BUILTIN_TYPEDARRAY */ JERRY_UNUSED (value); -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ return 0; } /* jerry_get_typedarray_length */ @@ -5703,7 +5703,7 @@ jerry_get_typedarray_buffer (jerry_value_t value, /**< TypedArray to get the arr { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY if (!ecma_is_typedarray (value)) { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Object is not a TypedArray"))); @@ -5725,12 +5725,12 @@ jerry_get_typedarray_buffer (jerry_value_t value, /**< TypedArray to get the arr ecma_object_t *arraybuffer_p = ecma_typedarray_get_arraybuffer (array_p); ecma_ref_object (arraybuffer_p); return jerry_return (ecma_make_object_value (arraybuffer_p)); -#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#else /* !JERRY_BUILTIN_TYPEDARRAY */ JERRY_UNUSED (value); JERRY_UNUSED (byte_length); JERRY_UNUSED (byte_offset); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_typed_array_not_supported_p))); -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ } /* jerry_get_typedarray_buffer */ /** @@ -5750,7 +5750,7 @@ jerry_json_parse (const jerry_char_t *string_p, /**< json string */ { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_JSON) +#if JERRY_BUILTIN_JSON ecma_value_t ret_value = ecma_builtin_json_parse_buffer (string_p, string_size); if (ecma_is_value_undefined (ret_value)) @@ -5759,12 +5759,12 @@ jerry_json_parse (const jerry_char_t *string_p, /**< json string */ } return jerry_return (ret_value); -#else /* !ENABLED (JERRY_BUILTIN_JSON) */ +#else /* !JERRY_BUILTIN_JSON */ JERRY_UNUSED (string_p); JERRY_UNUSED (string_size); return jerry_throw (ecma_raise_syntax_error (ECMA_ERR_MSG (error_json_not_supported_p))); -#endif /* ENABLED (JERRY_BUILTIN_JSON) */ +#endif /* JERRY_BUILTIN_JSON */ } /* jerry_json_parse */ /** @@ -5782,7 +5782,7 @@ jerry_value_t jerry_json_stringify (const jerry_value_t input_value) /**< a value to stringify */ { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_JSON) +#if JERRY_BUILTIN_JSON if (ecma_is_value_error_reference (input_value)) { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG (error_value_msg_p))); @@ -5796,11 +5796,11 @@ jerry_json_stringify (const jerry_value_t input_value) /**< a value to stringify } return jerry_return (ret_value); -#else /* ENABLED (JERRY_BUILTIN_JSON) */ +#else /* JERRY_BUILTIN_JSON */ JERRY_UNUSED (input_value); return jerry_throw (ecma_raise_syntax_error (ECMA_ERR_MSG (error_json_not_supported_p))); -#endif /* ENABLED (JERRY_BUILTIN_JSON) */ +#endif /* JERRY_BUILTIN_JSON */ } /* jerry_json_stringify */ /** @@ -5819,7 +5819,7 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_CONTAINER) +#if JERRY_BUILTIN_CONTAINER for (jerry_length_t i = 0; i < arguments_list_len; i++) { if (ecma_is_value_error_reference (arguments_list_p[i])) @@ -5834,7 +5834,7 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the switch (container_type) { -#if ENABLED (JERRY_BUILTIN_MAP) +#if JERRY_BUILTIN_MAP case JERRY_CONTAINER_TYPE_MAP: { lit_id = LIT_MAGIC_STRING_MAP_UL; @@ -5842,8 +5842,8 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the ctor_id = ECMA_BUILTIN_ID_MAP; break; } -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ -#if ENABLED (JERRY_BUILTIN_SET) +#endif /* JERRY_BUILTIN_MAP */ +#if JERRY_BUILTIN_SET case JERRY_CONTAINER_TYPE_SET: { lit_id = LIT_MAGIC_STRING_SET_UL; @@ -5851,8 +5851,8 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the ctor_id = ECMA_BUILTIN_ID_SET; break; } -#endif /* ENABLED (JERRY_BUILTIN_SET) */ -#if ENABLED (JERRY_BUILTIN_WEAKMAP) +#endif /* JERRY_BUILTIN_SET */ +#if JERRY_BUILTIN_WEAKMAP case JERRY_CONTAINER_TYPE_WEAKMAP: { lit_id = LIT_MAGIC_STRING_WEAKMAP_UL; @@ -5860,8 +5860,8 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the ctor_id = ECMA_BUILTIN_ID_WEAKMAP; break; } -#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ -#if ENABLED (JERRY_BUILTIN_WEAKSET) +#endif /* JERRY_BUILTIN_WEAKMAP */ +#if JERRY_BUILTIN_WEAKSET case JERRY_CONTAINER_TYPE_WEAKSET: { lit_id = LIT_MAGIC_STRING_WEAKSET_UL; @@ -5869,7 +5869,7 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the ctor_id = ECMA_BUILTIN_ID_WEAKSET; break; } -#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ +#endif /* JERRY_BUILTIN_WEAKSET */ default: { return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Invalid container type"))); @@ -5889,12 +5889,12 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the JERRY_CONTEXT (current_new_target_p) = old_new_target_p; return container_value; -#else /* !ENABLED (JERRY_BUILTIN_CONTAINER) */ +#else /* !JERRY_BUILTIN_CONTAINER */ JERRY_UNUSED (arguments_list_p); JERRY_UNUSED (arguments_list_len); JERRY_UNUSED (container_type); return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Containers are disabled"))); -#endif /* ENABLED (JERRY_BUILTIN_CONTAINER) */ +#endif /* JERRY_BUILTIN_CONTAINER */ } /* jerry_create_container */ /** @@ -5907,7 +5907,7 @@ jerry_get_container_type (const jerry_value_t value) /**< the container object * { jerry_assert_api_available (); -#if ENABLED (JERRY_BUILTIN_CONTAINER) +#if JERRY_BUILTIN_CONTAINER if (ecma_is_value_object (value)) { ecma_object_t *obj_p = ecma_get_object_from_value (value); @@ -5918,30 +5918,30 @@ jerry_get_container_type (const jerry_value_t value) /**< the container object * switch (type) { -#if ENABLED (JERRY_BUILTIN_MAP) +#if JERRY_BUILTIN_MAP case LIT_MAGIC_STRING_MAP_UL: { return JERRY_CONTAINER_TYPE_MAP; } -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ -#if ENABLED (JERRY_BUILTIN_SET) +#endif /* JERRY_BUILTIN_MAP */ +#if JERRY_BUILTIN_SET case LIT_MAGIC_STRING_SET_UL: { return JERRY_CONTAINER_TYPE_SET; } -#endif /* ENABLED (JERRY_BUILTIN_SET) */ -#if ENABLED (JERRY_BUILTIN_WEAKMAP) +#endif /* JERRY_BUILTIN_SET */ +#if JERRY_BUILTIN_WEAKMAP case LIT_MAGIC_STRING_WEAKMAP_UL: { return JERRY_CONTAINER_TYPE_WEAKMAP; } -#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ -#if ENABLED (JERRY_BUILTIN_WEAKSET) +#endif /* JERRY_BUILTIN_WEAKMAP */ +#if JERRY_BUILTIN_WEAKSET case LIT_MAGIC_STRING_WEAKSET_UL: { return JERRY_CONTAINER_TYPE_WEAKSET; } -#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ +#endif /* JERRY_BUILTIN_WEAKSET */ default: { return JERRY_CONTAINER_TYPE_INVALID; @@ -5950,9 +5950,9 @@ jerry_get_container_type (const jerry_value_t value) /**< the container object * } } -#else /* !ENABLED (JERRY_BUILTIN_CONTAINER) */ +#else /* !JERRY_BUILTIN_CONTAINER */ JERRY_UNUSED (value); -#endif /* ENABLED (JERRY_BUILTIN_CONTAINER) */ +#endif /* JERRY_BUILTIN_CONTAINER */ return JERRY_CONTAINER_TYPE_INVALID; } /* jerry_get_container_type */ diff --git a/jerry-core/config.h b/jerry-core/config.h index cfc82f664..0a06ae322 100644 --- a/jerry-core/config.h +++ b/jerry-core/config.h @@ -691,9 +691,6 @@ # error "Invalid value for 'JERRY_VM_EXEC_STOP' macro." #endif -#define ENABLED(FEATURE) ((FEATURE) == 1) -#define DISABLED(FEATURE) ((FEATURE) != 1) - /** * Cross component requirements check. */ @@ -701,15 +698,15 @@ * The date module can only use the float 64 number types. * Do a check for this. */ -#if ENABLED (JERRY_BUILTIN_DATE) && !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_BUILTIN_DATE && !JERRY_NUMBER_TYPE_FLOAT64 # error "Date does not support float32" #endif /** * Wrap container types into a single guard */ -#if ENABLED (JERRY_BUILTIN_MAP) || ENABLED (JERRY_BUILTIN_SET) \ -|| ENABLED (JERRY_BUILTIN_WEAKMAP) || ENABLED (JERRY_BUILTIN_WEAKSET) +#if JERRY_BUILTIN_MAP || JERRY_BUILTIN_SET \ +|| JERRY_BUILTIN_WEAKMAP || JERRY_BUILTIN_WEAKSET # define JERRY_BUILTIN_CONTAINER 1 #else # define JERRY_BUILTIN_CONTAINER 0 @@ -718,7 +715,7 @@ /** * Resource name related types into a single guard */ -#if ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ERROR_MESSAGES) || ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_LINE_INFO || JERRY_ERROR_MESSAGES || JERRY_MODULE_SYSTEM # define JERRY_RESOURCE_NAME 1 #else # define JERRY_RESOURCE_NAME 0 diff --git a/jerry-core/debugger/debugger.c b/jerry-core/debugger/debugger.c index 1b7d9a6dc..c22ffb4a8 100644 --- a/jerry-core/debugger/debugger.c +++ b/jerry-core/debugger/debugger.c @@ -25,7 +25,7 @@ #include "jerryscript-port.h" #include "lit-char-helpers.h" -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER /** * Incoming message: next message of string data. @@ -763,9 +763,9 @@ jerry_debugger_process_message (const uint8_t *recv_buffer_p, /**< pointer to th JERRY_CONTEXT (debugger_byte_code_free_tail) = ECMA_NULL_POINTER; } -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_free_byte_code_bytes (((size_t) byte_code_free_p->size) << JMEM_ALIGNMENT_LOG); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ jmem_heap_free_block (byte_code_free_p, ((size_t) byte_code_free_p->size) << JMEM_ALIGNMENT_LOG); @@ -1378,7 +1378,7 @@ jerry_debugger_send_memstats (void) memstats_p->type = JERRY_DEBUGGER_MEMSTATS_RECEIVE; -#if ENABLED (JERRY_MEM_STATS) /* if memory statistics feature is enabled */ +#if JERRY_MEM_STATS /* if memory statistics feature is enabled */ jmem_heap_stats_t *heap_stats = &JERRY_CONTEXT (jmem_heap_stats); uint32_t allocated_bytes = (uint32_t) heap_stats->allocated_bytes; @@ -1391,13 +1391,13 @@ jerry_debugger_send_memstats (void) memcpy (memstats_p->object_bytes, &object_bytes, sizeof (uint32_t)); uint32_t property_bytes = (uint32_t) heap_stats->property_bytes; memcpy (memstats_p->property_bytes, &property_bytes, sizeof (uint32_t)); -#else /* !ENABLED (JERRY_MEM_STATS) if not, just put zeros */ +#else /* !JERRY_MEM_STATS if not, just put zeros */ memset (memstats_p->allocated_bytes, 0, sizeof (uint32_t)); memset (memstats_p->byte_code_bytes, 0, sizeof (uint32_t)); memset (memstats_p->string_bytes, 0, sizeof (uint32_t)); memset (memstats_p->object_bytes, 0, sizeof (uint32_t)); memset (memstats_p->property_bytes, 0, sizeof (uint32_t)); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ jerry_debugger_send (sizeof (jerry_debugger_send_memstats_t)); } /* jerry_debugger_send_memstats */ @@ -1431,7 +1431,7 @@ jerry_debugger_exception_object_to_string (ecma_value_t exception_obj_value) /** switch (((ecma_extended_object_t *) prototype_p)->u.built_in.id) { -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS case ECMA_BUILTIN_ID_EVAL_ERROR_PROTOTYPE: { string_id = LIT_MAGIC_STRING_EVAL_ERROR_UL; @@ -1462,7 +1462,7 @@ jerry_debugger_exception_object_to_string (ecma_value_t exception_obj_value) /** string_id = LIT_MAGIC_STRING_URI_ERROR_UL; break; } -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ case ECMA_BUILTIN_ID_ERROR_PROTOTYPE: { string_id = LIT_MAGIC_STRING_ERROR_UL; @@ -1545,4 +1545,4 @@ jerry_debugger_send_exception_string (ecma_value_t exception_value) return result; } /* jerry_debugger_send_exception_string */ -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ diff --git a/jerry-core/debugger/debugger.h b/jerry-core/debugger/debugger.h index b940eeeeb..cd45e3ab5 100644 --- a/jerry-core/debugger/debugger.h +++ b/jerry-core/debugger/debugger.h @@ -19,7 +19,7 @@ #include "ecma-globals.h" #include "jerryscript-debugger-transport.h" -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER /* JerryScript debugger protocol is a simplified version of RFC-6455 (WebSockets). */ @@ -486,6 +486,6 @@ bool jerry_debugger_send_parse_function (uint32_t line, uint32_t column); void jerry_debugger_send_memstats (void); bool jerry_debugger_send_exception_string (ecma_value_t exception_value); -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ #endif /* !DEBUGGER_H */ diff --git a/jerry-core/ecma/base/ecma-alloc.c b/jerry-core/ecma/base/ecma-alloc.c index e694b93a3..f60a7d0d6 100644 --- a/jerry-core/ecma/base/ecma-alloc.c +++ b/jerry-core/ecma/base/ecma-alloc.c @@ -74,9 +74,9 @@ ecma_dealloc_number (ecma_number_t *number_p) /**< number to be freed */ extern inline ecma_object_t * JERRY_ATTR_ALWAYS_INLINE ecma_alloc_object (void) { -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_allocate_object_bytes (sizeof (ecma_object_t)); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ return (ecma_object_t *) jmem_pools_alloc (sizeof (ecma_object_t)); } /* ecma_alloc_object */ @@ -87,9 +87,9 @@ ecma_alloc_object (void) extern inline void JERRY_ATTR_ALWAYS_INLINE ecma_dealloc_object (ecma_object_t *object_p) /**< object to be freed */ { -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_free_object_bytes (sizeof (ecma_object_t)); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ jmem_pools_free (object_p, sizeof (ecma_object_t)); } /* ecma_dealloc_object */ @@ -102,9 +102,9 @@ ecma_dealloc_object (ecma_object_t *object_p) /**< object to be freed */ extern inline ecma_extended_object_t * JERRY_ATTR_ALWAYS_INLINE ecma_alloc_extended_object (size_t size) /**< size of object */ { -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_allocate_object_bytes (size); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ return jmem_heap_alloc_block (size); } /* ecma_alloc_extended_object */ @@ -116,9 +116,9 @@ extern inline void JERRY_ATTR_ALWAYS_INLINE ecma_dealloc_extended_object (ecma_object_t *object_p, /**< extended object */ size_t size) /**< size of object */ { -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_free_object_bytes (size); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ jmem_heap_free_block (object_p, size); } /* ecma_dealloc_extended_object */ @@ -131,9 +131,9 @@ ecma_dealloc_extended_object (ecma_object_t *object_p, /**< extended object */ extern inline ecma_string_t * JERRY_ATTR_ALWAYS_INLINE ecma_alloc_string (void) { -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_allocate_string_bytes (sizeof (ecma_string_t)); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ return (ecma_string_t *) jmem_pools_alloc (sizeof (ecma_string_t)); } /* ecma_alloc_string */ @@ -144,9 +144,9 @@ ecma_alloc_string (void) extern inline void JERRY_ATTR_ALWAYS_INLINE ecma_dealloc_string (ecma_string_t *string_p) /**< string to be freed */ { -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_free_string_bytes (sizeof (ecma_string_t)); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ jmem_pools_free (string_p, sizeof (ecma_string_t)); } /* ecma_dealloc_string */ @@ -159,9 +159,9 @@ ecma_dealloc_string (ecma_string_t *string_p) /**< string to be freed */ extern inline ecma_extended_string_t * JERRY_ATTR_ALWAYS_INLINE ecma_alloc_extended_string (void) { -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_allocate_string_bytes (sizeof (ecma_extended_string_t)); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ return (ecma_extended_string_t *) jmem_heap_alloc_block (sizeof (ecma_extended_string_t)); } /* ecma_alloc_extended_string */ @@ -172,9 +172,9 @@ ecma_alloc_extended_string (void) extern inline void JERRY_ATTR_ALWAYS_INLINE ecma_dealloc_extended_string (ecma_extended_string_t *ext_string_p) /**< extended string to be freed */ { -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_free_string_bytes (sizeof (ecma_extended_string_t)); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ jmem_heap_free_block (ext_string_p, sizeof (ecma_extended_string_t)); } /* ecma_dealloc_extended_string */ @@ -187,9 +187,9 @@ ecma_dealloc_extended_string (ecma_extended_string_t *ext_string_p) /**< extende extern inline ecma_external_string_t * JERRY_ATTR_ALWAYS_INLINE ecma_alloc_external_string (void) { -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_allocate_string_bytes (sizeof (ecma_external_string_t)); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ return (ecma_external_string_t *) jmem_heap_alloc_block (sizeof (ecma_external_string_t)); } /* ecma_alloc_external_string */ @@ -200,9 +200,9 @@ ecma_alloc_external_string (void) extern inline void JERRY_ATTR_ALWAYS_INLINE ecma_dealloc_external_string (ecma_external_string_t *ext_string_p) /**< external string to be freed */ { -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_free_string_bytes (sizeof (ecma_external_string_t)); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ jmem_heap_free_block (ext_string_p, sizeof (ecma_external_string_t)); } /* ecma_dealloc_external_string */ @@ -215,9 +215,9 @@ ecma_dealloc_external_string (ecma_external_string_t *ext_string_p) /**< externa extern inline ecma_string_t * JERRY_ATTR_ALWAYS_INLINE ecma_alloc_string_buffer (size_t size) /**< size of string */ { -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_allocate_string_bytes (size); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ return jmem_heap_alloc_block (size); } /* ecma_alloc_string_buffer */ @@ -229,9 +229,9 @@ extern inline void JERRY_ATTR_ALWAYS_INLINE ecma_dealloc_string_buffer (ecma_string_t *string_p, /**< string with data */ size_t size) /**< size of string */ { -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_free_string_bytes (size); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ jmem_heap_free_block (string_p, size); } /* ecma_dealloc_string_buffer */ @@ -244,9 +244,9 @@ ecma_dealloc_string_buffer (ecma_string_t *string_p, /**< string with data */ extern inline ecma_property_pair_t * JERRY_ATTR_ALWAYS_INLINE ecma_alloc_property_pair (void) { -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_allocate_property_bytes (sizeof (ecma_property_pair_t)); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ return jmem_heap_alloc_block (sizeof (ecma_property_pair_t)); } /* ecma_alloc_property_pair */ @@ -257,9 +257,9 @@ ecma_alloc_property_pair (void) extern inline void JERRY_ATTR_ALWAYS_INLINE ecma_dealloc_property_pair (ecma_property_pair_t *property_pair_p) /**< property pair to be freed */ { -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_free_property_bytes (sizeof (ecma_property_pair_t)); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ jmem_heap_free_block (property_pair_p, sizeof (ecma_property_pair_t)); } /* ecma_dealloc_property_pair */ diff --git a/jerry-core/ecma/base/ecma-gc.c b/jerry-core/ecma/base/ecma-gc.c index 32cb908a6..ad8b1350a 100644 --- a/jerry-core/ecma/base/ecma-gc.c +++ b/jerry-core/ecma/base/ecma-gc.c @@ -37,12 +37,12 @@ #include "vm-defines.h" #include "vm-stack.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #include "ecma-typedarray-object.h" -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ -#if ENABLED (JERRY_BUILTIN_PROMISE) +#endif /* JERRY_BUILTIN_TYPEDARRAY */ +#if JERRY_BUILTIN_PROMISE #include "ecma-promise-object.h" -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ /* TODO: Extract GC to a separate component */ @@ -160,16 +160,16 @@ ecma_gc_mark_global_object (ecma_global_object_t *global_object_p) /**< global o ecma_gc_set_object_visited (ECMA_GET_NON_NULL_POINTER (ecma_object_t, global_object_p->global_env_cp)); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_gc_set_object_visited (ecma_get_object_from_value (global_object_p->this_binding)); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (global_object_p->global_scope_cp != global_object_p->global_env_cp) { ecma_gc_set_object_visited (ECMA_GET_NON_NULL_POINTER (ecma_object_t, global_object_p->global_scope_cp)); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ jmem_cpointer_t *builtin_objects_p = global_object_p->builtin_objects; @@ -264,7 +264,7 @@ ecma_gc_mark_properties (ecma_property_pair_t *property_pair_p) /**< property pa JERRY_ASSERT (property_pair_p->names_cp[index] >= LIT_INTERNAL_MAGIC_STRING_FIRST_DATA && property_pair_p->names_cp[index] < LIT_MAGIC_STRING__COUNT); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (property_pair_p->names_cp[index] == LIT_INTERNAL_MAGIC_STRING_ENVIRONMENT_RECORD) { ecma_environment_record_t *environment_record_p; @@ -280,7 +280,7 @@ ecma_gc_mark_properties (ecma_property_pair_t *property_pair_p) /**< property pa JERRY_ASSERT (ecma_is_value_object (environment_record_p->function_object)); ecma_gc_set_object_visited (ecma_get_object_from_value (environment_record_p->function_object)); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } } /* ecma_gc_mark_properties */ @@ -326,7 +326,7 @@ ecma_gc_mark_bound_function_object (ecma_object_t *object_p) /**< bound function } } /* ecma_gc_mark_bound_function_object */ -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE /** * Mark objects referenced by Promise built-in. */ @@ -378,9 +378,9 @@ ecma_gc_mark_promise_object (ecma_extended_object_t *ext_object_p) /**< extended } } /* ecma_gc_mark_promise_object */ -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ -#if ENABLED (JERRY_BUILTIN_MAP) +#if JERRY_BUILTIN_MAP /** * Mark objects referenced by Map built-in. */ @@ -415,9 +415,9 @@ ecma_gc_mark_map_object (ecma_object_t *object_p) /**< object */ } } } /* ecma_gc_mark_map_object */ -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ +#endif /* JERRY_BUILTIN_MAP */ -#if ENABLED (JERRY_BUILTIN_WEAKMAP) +#if JERRY_BUILTIN_WEAKMAP /** * Mark objects referenced by WeakMap built-in. */ @@ -447,9 +447,9 @@ ecma_gc_mark_weakmap_object (ecma_object_t *object_p) /**< object */ } } } /* ecma_gc_mark_weakmap_object */ -#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ +#endif /* JERRY_BUILTIN_WEAKMAP */ -#if ENABLED (JERRY_BUILTIN_SET) +#if JERRY_BUILTIN_SET /** * Mark objects referenced by Set built-in. */ @@ -479,9 +479,9 @@ ecma_gc_mark_set_object (ecma_object_t *object_p) /**< object */ } } } /* ecma_gc_mark_set_object */ -#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#endif /* JERRY_BUILTIN_SET */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Mark objects referenced by inactive generator functions, async functions, etc. */ @@ -615,9 +615,9 @@ ecma_gc_mark_executable_object (ecma_object_t *object_p) /**< object */ } } /* ecma_gc_mark_executable_object */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY /** * Mark the objects referenced by a proxy object */ @@ -638,7 +638,7 @@ ecma_gc_mark_proxy_object (ecma_object_t *object_p) /**< proxy object */ ecma_gc_set_object_visited (ecma_get_object_from_value (proxy_p->handler)); } } /* ecma_gc_mark_proxy_object */ -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ /** * Mark objects as visited starting from specified object as root @@ -669,7 +669,7 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ { ecma_object_type_t object_type = ecma_get_object_type (object_p); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS if (JERRY_UNLIKELY (ecma_get_object_is_builtin (object_p))) { ecma_value_t realm_value; @@ -693,7 +693,7 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ ecma_gc_set_object_visited (ECMA_GET_INTERNAL_VALUE_POINTER (ecma_object_t, realm_value)); } -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ /** * Have the object's prototype here so the object could set it to JMEM_CP_NULL @@ -703,7 +703,7 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ switch (object_type) { -#if !ENABLED (JERRY_BUILTIN_REALMS) +#if !JERRY_BUILTIN_REALMS case ECMA_OBJECT_TYPE_GENERAL: { if (JERRY_UNLIKELY (ecma_get_object_is_builtin (object_p)) @@ -713,58 +713,58 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ } break; } -#endif /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* !JERRY_BUILTIN_REALMS */ case ECMA_OBJECT_TYPE_CLASS: { ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) object_p; switch (ext_object_p->u.class_prop.class_id) { -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE case LIT_MAGIC_STRING_PROMISE_UL: { ecma_gc_mark_promise_object (ext_object_p); break; } -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#endif /* JERRY_BUILTIN_PROMISE */ +#if JERRY_BUILTIN_DATAVIEW case LIT_MAGIC_STRING_DATAVIEW_UL: { ecma_dataview_object_t *dataview_p = (ecma_dataview_object_t *) object_p; ecma_gc_set_object_visited (dataview_p->buffer_p); break; } -#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW) */ -#if ENABLED (JERRY_BUILTIN_CONTAINER) -#if ENABLED (JERRY_BUILTIN_WEAKSET) +#endif /* JERRY_BUILTIN_DATAVIEW */ +#if JERRY_BUILTIN_CONTAINER +#if JERRY_BUILTIN_WEAKSET case LIT_MAGIC_STRING_WEAKSET_UL: { break; } -#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ -#if ENABLED (JERRY_BUILTIN_SET) +#endif /* JERRY_BUILTIN_WEAKSET */ +#if JERRY_BUILTIN_SET case LIT_MAGIC_STRING_SET_UL: { ecma_gc_mark_set_object (object_p); break; } -#endif /* ENABLED (JERRY_BUILTIN_SET) */ -#if ENABLED (JERRY_BUILTIN_WEAKMAP) +#endif /* JERRY_BUILTIN_SET */ +#if JERRY_BUILTIN_WEAKMAP case LIT_MAGIC_STRING_WEAKMAP_UL: { ecma_gc_mark_weakmap_object (object_p); break; } -#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ -#if ENABLED (JERRY_BUILTIN_MAP) +#endif /* JERRY_BUILTIN_WEAKMAP */ +#if JERRY_BUILTIN_MAP case LIT_MAGIC_STRING_MAP_UL: { ecma_gc_mark_map_object (object_p); break; } -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ -#endif /* ENABLED (JERRY_BUILTIN_CONTAINER) */ -#if ENABLED (JERRY_ESNEXT) +#endif /* JERRY_BUILTIN_MAP */ +#endif /* JERRY_BUILTIN_CONTAINER */ +#if JERRY_ESNEXT case LIT_MAGIC_STRING_GENERATOR_UL: case LIT_MAGIC_STRING_ASYNC_GENERATOR_UL: { @@ -789,7 +789,7 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ } break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { break; @@ -804,15 +804,15 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ switch (ext_object_p->u.pseudo_array.type) { -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY case ECMA_PSEUDO_ARRAY_TYPEDARRAY: case ECMA_PSEUDO_ARRAY_TYPEDARRAY_WITH_INFO: { ecma_gc_set_object_visited (ecma_typedarray_get_arraybuffer (object_p)); break; } -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ -#if ENABLED (JERRY_ESNEXT) +#endif /* JERRY_BUILTIN_TYPEDARRAY */ +#if JERRY_ESNEXT case ECMA_PSEUDO_ARRAY_ITERATOR: case ECMA_PSEUDO_SET_ITERATOR: case ECMA_PSEUDO_MAP_ITERATOR: @@ -835,7 +835,7 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ ecma_gc_set_object_visited (ecma_get_object_from_value (regexp)); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { JERRY_ASSERT (ext_object_p->u.pseudo_array.type == ECMA_PSEUDO_ARRAY_ARGUMENTS); @@ -851,14 +851,14 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ { ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) object_p; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (ext_object_p->u.array.length_prop_and_hole_count & ECMA_ARRAY_TEMPLATE_LITERAL)) { /* Template objects are never marked. */ JERRY_ASSERT (object_p->type_flags_refs >= ECMA_OBJECT_REF_ONE); return; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (ecma_op_array_is_fast_array (ext_object_p)) { @@ -883,7 +883,7 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ } break; } -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY case ECMA_OBJECT_TYPE_PROXY: { ecma_gc_mark_proxy_object (object_p); @@ -891,7 +891,7 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ proto_cp = JMEM_CP_NULL; break; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ case ECMA_OBJECT_TYPE_BOUND_FUNCTION: { ecma_gc_mark_bound_function_object (object_p); @@ -905,11 +905,11 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ ecma_gc_set_object_visited (ECMA_GET_NON_NULL_POINTER_FROM_POINTER_TAG (ecma_object_t, ext_func_p->u.function.scope_cp)); -#if ENABLED (JERRY_ESNEXT) || ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_ESNEXT || JERRY_BUILTIN_REALMS const ecma_compiled_code_t *byte_code_p = ecma_op_function_get_compiled_code (ext_func_p); -#endif /* ENABLED (JERRY_ESNEXT) || ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_ESNEXT || JERRY_BUILTIN_REALMS */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (CBC_FUNCTION_IS_ARROW (byte_code_p->status_flags)) { ecma_arrow_function_t *arrow_func_p = (ecma_arrow_function_t *) object_p; @@ -924,16 +924,16 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ ecma_gc_set_object_visited (ecma_get_object_from_value (arrow_func_p->new_target)); } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_BUILTIN_REALMS) -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_BUILTIN_REALMS +#if JERRY_SNAPSHOT_EXEC if (ext_func_p->u.function.bytecode_cp == JMEM_CP_NULL) { /* Static snapshot functions have a global realm */ break; } -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ ecma_object_t *realm_p; @@ -949,25 +949,25 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ } ecma_gc_set_object_visited (realm_p); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ break; } -#if ENABLED (JERRY_ESNEXT) || ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_ESNEXT || JERRY_BUILTIN_REALMS case ECMA_OBJECT_TYPE_NATIVE_FUNCTION: { -#endif /* ENABLED (JERRY_ESNEXT) || ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_ESNEXT || JERRY_BUILTIN_REALMS */ if (!ecma_get_object_is_builtin (object_p)) { -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_native_function_t *native_function_p = (ecma_native_function_t *) object_p; ecma_gc_set_object_visited (ECMA_GET_INTERNAL_VALUE_POINTER (ecma_object_t, native_function_p->realm_value)); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_extended_object_t *ext_func_p = (ecma_extended_object_t *) object_p; if (ext_func_p->u.built_in.id == ECMA_BUILTIN_ID_HANDLER) @@ -1003,7 +1003,7 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ ecma_gc_set_object_visited (ecma_get_object_from_value (executor_p->remaining_elements)); break; } -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY case ECMA_NATIVE_HANDLER_PROXY_REVOKE: { ecma_revocable_proxy_object_t *rev_proxy_p = (ecma_revocable_proxy_object_t *) object_p; @@ -1015,7 +1015,7 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ break; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ case ECMA_NATIVE_HANDLER_VALUE_THUNK: case ECMA_NATIVE_HANDLER_VALUE_THROWER: { @@ -1033,12 +1033,12 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ } } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_ESNEXT) || ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_ESNEXT || JERRY_BUILTIN_REALMS break; } -#endif /* ENABLED (JERRY_ESNEXT) || ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_ESNEXT || JERRY_BUILTIN_REALMS */ default: { break; @@ -1053,7 +1053,7 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ jmem_cpointer_t prop_iter_cp = object_p->u1.property_list_cp; -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP if (prop_iter_cp != JMEM_CP_NULL) { ecma_property_header_t *prop_iter_p = ECMA_GET_NON_NULL_POINTER (ecma_property_header_t, prop_iter_cp); @@ -1062,7 +1062,7 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ prop_iter_cp = prop_iter_p->next_property_cp; } } -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ while (prop_iter_cp != JMEM_CP_NULL) { @@ -1126,9 +1126,9 @@ ecma_free_arguments_object (ecma_extended_object_t *ext_object_p) /**< arguments ecma_mapped_arguments_t *mapped_arguments_p = (ecma_mapped_arguments_t *) ext_object_p; object_size = sizeof (ecma_mapped_arguments_t); -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC if (!(mapped_arguments_p->unmapped.header.u.pseudo_array.extra_info & ECMA_ARGUMENTS_OBJECT_STATIC_BYTECODE)) -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ { ecma_compiled_code_t *byte_code_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_compiled_code_t, mapped_arguments_p->u.byte_code); @@ -1178,7 +1178,7 @@ ecma_free_fast_access_array (ecma_object_t *object_p) /**< fast access mode arra ecma_dealloc_extended_object (object_p, sizeof (ecma_extended_object_t)); } /* ecma_free_fast_access_array */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Free non-objects referenced by inactive generator functions, async functions, etc. @@ -1302,7 +1302,7 @@ ecma_gc_free_executable_object (ecma_object_t *object_p) /**< object */ return size; } /* ecma_gc_free_executable_object */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Free properties of an object @@ -1312,7 +1312,7 @@ ecma_gc_free_properties (ecma_object_t *object_p) /**< object */ { jmem_cpointer_t prop_iter_cp = object_p->u1.property_list_cp; -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP if (prop_iter_cp != JMEM_CP_NULL) { ecma_property_header_t *prop_iter_p = ECMA_GET_NON_NULL_POINTER (ecma_property_header_t, @@ -1323,7 +1323,7 @@ ecma_gc_free_properties (ecma_object_t *object_p) /**< object */ prop_iter_cp = object_p->u1.property_list_cp; } } -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ while (prop_iter_cp != JMEM_CP_NULL) { @@ -1355,7 +1355,7 @@ ecma_gc_free_properties (ecma_object_t *object_p) /**< object */ /* Call the native's free callback. */ switch (name_cp) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LIT_INTERNAL_MAGIC_STRING_ENVIRONMENT_RECORD: { ecma_environment_record_t *environment_record_p; @@ -1372,8 +1372,8 @@ ecma_gc_free_properties (ecma_object_t *object_p) /**< object */ ecma_compact_collection_free (compact_collection_p); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_BUILTIN_WEAKMAP) || ENABLED (JERRY_BUILTIN_WEAKSET) +#endif /* JERRY_ESNEXT */ +#if JERRY_BUILTIN_WEAKMAP || JERRY_BUILTIN_WEAKSET case LIT_INTERNAL_MAGIC_STRING_WEAK_REFS: { ecma_collection_t *refs_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, @@ -1393,7 +1393,7 @@ ecma_gc_free_properties (ecma_object_t *object_p) /**< object */ ecma_collection_destroy (refs_p); break; } -#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) || ENABLED (JERRY_BUILTIN_WEAKSET) */ +#endif /* JERRY_BUILTIN_WEAKMAP || JERRY_BUILTIN_WEAKSET */ default: { JERRY_ASSERT (name_cp == LIT_INTERNAL_MAGIC_STRING_NATIVE_POINTER); @@ -1402,12 +1402,12 @@ ecma_gc_free_properties (ecma_object_t *object_p) /**< object */ } } -#if ENABLED (JERRY_LCACHE) +#if JERRY_LCACHE if (ecma_is_property_lcached (property_p)) { ecma_lcache_invalidate (object_p, name_cp, property_p); } -#endif /* ENABLED (JERRY_LCACHE) */ +#endif /* JERRY_LCACHE */ } prop_iter_cp = prop_iter_p->next_property_cp; @@ -1460,7 +1460,7 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ { JERRY_ASSERT (object_type == ECMA_OBJECT_TYPE_NATIVE_FUNCTION); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (extended_object_p->u.built_in.id == ECMA_BUILTIN_ID_HANDLER) { switch (extended_object_p->u.built_in.routine_id) @@ -1487,13 +1487,13 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ ext_object_size = sizeof (ecma_promise_all_executor_t); break; } -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY case ECMA_NATIVE_HANDLER_PROXY_REVOKE: { ext_object_size = sizeof (ecma_revocable_proxy_object_t); break; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ case ECMA_NATIVE_HANDLER_VALUE_THUNK: case ECMA_NATIVE_HANDLER_VALUE_THROWER: { @@ -1507,7 +1507,7 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ } } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } else if (extended_object_p->u.built_in.id == ECMA_BUILTIN_ID_GLOBAL) { @@ -1556,12 +1556,12 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ { case LIT_MAGIC_STRING_STRING_UL: case LIT_MAGIC_STRING_NUMBER_UL: -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LIT_MAGIC_STRING_SYMBOL_UL: -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#endif /* JERRY_ESNEXT */ +#if JERRY_BUILTIN_BIGINT case LIT_MAGIC_STRING_BIGINT_UL: -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ { ecma_free_value (ext_object_p->u.class_prop.u.value); break; @@ -1583,7 +1583,7 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ break; } -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY case LIT_MAGIC_STRING_ARRAY_BUFFER_UL: { uint32_t arraybuffer_length = ext_object_p->u.class_prop.u.length; @@ -1607,8 +1607,8 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ break; } -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ -#if ENABLED (JERRY_BUILTIN_PROMISE) +#endif /* JERRY_BUILTIN_TYPEDARRAY */ +#if JERRY_BUILTIN_PROMISE case LIT_MAGIC_STRING_PROMISE_UL: { ecma_free_value_if_not_object (ext_object_p->u.class_prop.u.value); @@ -1619,20 +1619,20 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ ext_object_size = sizeof (ecma_promise_object_t); break; } -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ -#if ENABLED (JERRY_BUILTIN_CONTAINER) -#if ENABLED (JERRY_BUILTIN_MAP) +#endif /* JERRY_BUILTIN_PROMISE */ +#if JERRY_BUILTIN_CONTAINER +#if JERRY_BUILTIN_MAP case LIT_MAGIC_STRING_MAP_UL: -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ -#if ENABLED (JERRY_BUILTIN_SET) +#endif /* JERRY_BUILTIN_MAP */ +#if JERRY_BUILTIN_SET case LIT_MAGIC_STRING_SET_UL: -#endif /* ENABLED (JERRY_BUILTIN_SET) */ -#if ENABLED (JERRY_BUILTIN_WEAKMAP) +#endif /* JERRY_BUILTIN_SET */ +#if JERRY_BUILTIN_WEAKMAP case LIT_MAGIC_STRING_WEAKMAP_UL: -#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ -#if ENABLED (JERRY_BUILTIN_WEAKSET) +#endif /* JERRY_BUILTIN_WEAKMAP */ +#if JERRY_BUILTIN_WEAKSET case LIT_MAGIC_STRING_WEAKSET_UL: -#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ +#endif /* JERRY_BUILTIN_WEAKSET */ { ecma_extended_object_t *map_object_p = (ecma_extended_object_t *) object_p; ecma_collection_t *container_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, @@ -1642,15 +1642,15 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ break; } -#endif /* ENABLED (JERRY_BUILTIN_CONTAINER) */ -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#endif /* JERRY_BUILTIN_CONTAINER */ +#if JERRY_BUILTIN_DATAVIEW case LIT_MAGIC_STRING_DATAVIEW_UL: { ext_object_size = sizeof (ecma_dataview_object_t); break; } -#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW) */ -#if ENABLED (JERRY_ESNEXT) +#endif /* JERRY_BUILTIN_DATAVIEW */ +#if JERRY_ESNEXT case LIT_MAGIC_STRING_GENERATOR_UL: case LIT_MAGIC_STRING_ASYNC_GENERATOR_UL: { @@ -1662,8 +1662,8 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ ext_object_size = sizeof (ecma_promise_capabality_t); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_MODULE_SYSTEM) +#endif /* JERRY_ESNEXT */ +#if JERRY_MODULE_SYSTEM case LIT_MAGIC_STRING_RUNNABLE_UL: { ecma_extended_object_t *wrapper_p = (ecma_extended_object_t *) object_p; @@ -1676,7 +1676,7 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ ecma_module_cleanup (root_module_p); break; } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ default: { /* The undefined id represents an uninitialized class. */ @@ -1691,42 +1691,42 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ break; } -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY case ECMA_OBJECT_TYPE_PROXY: { ext_object_size = sizeof (ecma_proxy_object_t); break; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ case ECMA_OBJECT_TYPE_FUNCTION: { /* Function with byte-code (not a built-in function). */ ecma_extended_object_t *ext_func_p = (ecma_extended_object_t *) object_p; -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC if (ext_func_p->u.function.bytecode_cp != ECMA_NULL_POINTER) { -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ ecma_compiled_code_t *byte_code_p = (ECMA_GET_INTERNAL_VALUE_POINTER (ecma_compiled_code_t, ext_func_p->u.function.bytecode_cp)); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (CBC_FUNCTION_IS_ARROW (byte_code_p->status_flags)) { ecma_free_value_if_not_object (((ecma_arrow_function_t *) object_p)->this_binding); ecma_free_value_if_not_object (((ecma_arrow_function_t *) object_p)->new_target); ext_object_size = sizeof (ecma_arrow_function_t); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_bytecode_deref (byte_code_p); -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC } else { ext_object_size = sizeof (ecma_static_function_t); } -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ break; } case ECMA_OBJECT_TYPE_PSEUDO_ARRAY: @@ -1740,14 +1740,14 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ ext_object_size = ecma_free_arguments_object (ext_object_p); break; } -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY case ECMA_PSEUDO_ARRAY_TYPEDARRAY_WITH_INFO: { ext_object_size = sizeof (ecma_extended_typedarray_object_t); break; } -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ -#if ENABLED (JERRY_ESNEXT) +#endif /* JERRY_BUILTIN_TYPEDARRAY */ +#if JERRY_ESNEXT case ECMA_PSEUDO_STRING_ITERATOR: { ecma_value_t iterated_value = ext_object_p->u.pseudo_array.u2.iterated_value; @@ -1772,7 +1772,7 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ ext_object_size = sizeof (ecma_regexp_string_iterator_t); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { JERRY_ASSERT (ext_object_p->u.pseudo_array.type == ECMA_PSEUDO_ARRAY_TYPEDARRAY @@ -1792,9 +1792,9 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ ecma_value_t args_len_or_this = bound_func_p->header.u.bound_function.args_len_or_this; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_free_value (bound_func_p->target_length); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (!ecma_is_value_integer_number (args_len_or_this)) { @@ -1953,10 +1953,10 @@ ecma_gc_run (void) obj_iter_cp = obj_next_cp; } -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP /* Free RegExp bytecodes stored in cache */ re_cache_gc (); -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ } /* ecma_gc_run */ /** @@ -1967,24 +1967,24 @@ ecma_gc_run (void) void ecma_free_unused_memory (jmem_pressure_t pressure) /**< current pressure */ { -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER while ((JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) && JERRY_CONTEXT (debugger_byte_code_free_tail) != ECMA_NULL_POINTER) { /* Wait until all byte code is freed or the connection is aborted. */ jerry_debugger_receive (NULL); } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ if (JERRY_LIKELY (pressure == JMEM_PRESSURE_LOW)) { -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP if (JERRY_CONTEXT (ecma_prop_hashmap_alloc_state) > ECMA_PROP_HASHMAP_ALLOC_ON) { --JERRY_CONTEXT (ecma_prop_hashmap_alloc_state); } JERRY_CONTEXT (status_flags) &= (uint32_t) ~ECMA_STATUS_HIGH_PRESSURE_GC; -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ /* * If there is enough newly allocated objects since last GC, probably it is worthwhile to start GC now. * Otherwise, probability to free sufficient space is considered to be low. @@ -2001,7 +2001,7 @@ ecma_free_unused_memory (jmem_pressure_t pressure) /**< current pressure */ else if (pressure == JMEM_PRESSURE_HIGH) { /* Freeing as much memory as we currently can */ -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP if (JERRY_CONTEXT (status_flags) & ECMA_STATUS_HIGH_PRESSURE_GC) { JERRY_CONTEXT (ecma_prop_hashmap_alloc_state) = ECMA_PROP_HASHMAP_ALLOC_MAX; @@ -2011,11 +2011,11 @@ ecma_free_unused_memory (jmem_pressure_t pressure) /**< current pressure */ ++JERRY_CONTEXT (ecma_prop_hashmap_alloc_state); JERRY_CONTEXT (status_flags) |= ECMA_STATUS_HIGH_PRESSURE_GC; } -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ ecma_gc_run (); -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP /* Free hashmaps of remaining objects. */ jmem_cpointer_t obj_iter_cp = JERRY_CONTEXT (ecma_gc_objects_cp); @@ -2049,7 +2049,7 @@ ecma_free_unused_memory (jmem_pressure_t pressure) /**< current pressure */ obj_iter_cp = obj_iter_p->gc_next_cp; } -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ jmem_pools_collect_empty (); return; diff --git a/jerry-core/ecma/base/ecma-globals.h b/jerry-core/ecma/base/ecma-globals.h index d98bcc813..66e5d6687 100644 --- a/jerry-core/ecma/base/ecma-globals.h +++ b/jerry-core/ecma/base/ecma-globals.h @@ -67,9 +67,9 @@ typedef enum { ECMA_STATUS_API_AVAILABLE = (1u << 0), /**< api available */ ECMA_STATUS_DIRECT_EVAL = (1u << 1), /**< eval is called directly */ -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP ECMA_STATUS_HIGH_PRESSURE_GC = (1u << 2), /**< last gc was under high pressure */ -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ ECMA_STATUS_EXCEPTION = (1u << 3), /**< last exception is a normal exception */ ECMA_STATUS_ABORT = (1u << 4), /**< last exception is an abort */ ECMA_STATUS_ERROR_UPDATE = (1u << 5), /**< the error_object_created_callback_p is called */ @@ -92,12 +92,12 @@ typedef enum ECMA_TYPE___MAX = ECMA_TYPE_ERROR /** highest value for ecma types */ } ecma_type_t; -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER /** * Shift for scope chain index part in ecma_parse_opts */ #define ECMA_PARSE_CHAIN_INDEX_SHIFT 16 -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ /** * Option flags for parser_parse_script and internal flags for global_status_flags in parser context. @@ -126,9 +126,9 @@ typedef enum ECMA_PARSE_ASYNC_FUNCTION = (1u << 11), /**< async function is parsed */ /* These flags are internally used by the parser. */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ECMA_PARSE_INTERNAL_PRE_SCANNING = (1u << 12), -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #ifndef JERRY_NDEBUG /** * This flag represents an error in for in/of statements, which cannot be set @@ -217,14 +217,14 @@ enum * or function call argument list */ /* Other values */ ECMA_VALUE_INITIALIZED = ECMA_MAKE_VALUE (12), /**< represents initialized mapped arguments formal parameter */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ECMA_VALUE_SYNC_ITERATOR = ECMA_MAKE_VALUE (13), /**< option for ecma_op_get_iterator: sync iterator is requested */ ECMA_VALUE_ASYNC_ITERATOR = ECMA_MAKE_VALUE (14), /**< option for ecma_op_get_iterator: async iterator is requested */ ECMA_VALUE_GLOBAL_THIS = ECMA_MAKE_VALUE (15), /**< globalThis built-in */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ }; -#if !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if !JERRY_NUMBER_TYPE_FLOAT64 /** * Maximum integer number for an ecma value */ @@ -233,7 +233,7 @@ enum * Maximum integer number for an ecma value (shifted left with ECMA_DIRECT_SHIFT) */ #define ECMA_INTEGER_NUMBER_MAX_SHIFTED 0x7fffff0 -#else /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#else /* JERRY_NUMBER_TYPE_FLOAT64 */ /** * Maximum integer number for an ecma value */ @@ -242,9 +242,9 @@ enum * Maximum integer number for an ecma value (shifted left with ECMA_DIRECT_SHIFT) */ #define ECMA_INTEGER_NUMBER_MAX_SHIFTED 0x7ffffff0 -#endif /* !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* !JERRY_NUMBER_TYPE_FLOAT64 */ -#if !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if !JERRY_NUMBER_TYPE_FLOAT64 /** * Minimum integer number for an ecma value */ @@ -253,7 +253,7 @@ enum * Minimum integer number for an ecma value (shifted left with ECMA_DIRECT_SHIFT) */ #define ECMA_INTEGER_NUMBER_MIN_SHIFTED -0x7fffff0 -#else /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#else /* JERRY_NUMBER_TYPE_FLOAT64 */ /** * Minimum integer number for an ecma value */ @@ -262,7 +262,7 @@ enum * Minimum integer number for an ecma value (shifted left with ECMA_DIRECT_SHIFT) */ #define ECMA_INTEGER_NUMBER_MIN_SHIFTED (-0x7fffffff - 1) /* -0x80000000 */ -#endif /* !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* !JERRY_NUMBER_TYPE_FLOAT64 */ #if ECMA_DIRECT_SHIFT != 4 #error "Please update ECMA_INTEGER_NUMBER_MIN/MAX_SHIFTED according to the new value of ECMA_DIRECT_SHIFT." @@ -277,11 +277,11 @@ enum /** * Maximum integer number, which if squared, still fits in ecma_integer_value_t */ -#if !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if !JERRY_NUMBER_TYPE_FLOAT64 #define ECMA_INTEGER_MULTIPLY_MAX 0xb50 -#else /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#else /* JERRY_NUMBER_TYPE_FLOAT64 */ #define ECMA_INTEGER_MULTIPLY_MAX 0x2d41 -#endif /* !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* !JERRY_NUMBER_TYPE_FLOAT64 */ /** * Checks whether the error flag is set. @@ -325,7 +325,7 @@ typedef struct ecma_native_pointer_t struct ecma_native_pointer_t *next_p; /**< points to the next ecma_native_pointer_t element */ } ecma_native_pointer_t; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Representation for class constructor environment record. @@ -336,7 +336,7 @@ typedef struct ecma_value_t function_object; /**< function object */ } ecma_environment_record_t; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Property list: @@ -360,10 +360,10 @@ typedef enum * that are not indices */ ECMA_LIST_ENUMERABLE = (1 << 1), /**< exclude non-enumerable properties */ ECMA_LIST_PROTOTYPE = (1 << 2), /**< list properties from prototype chain */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ECMA_LIST_SYMBOLS = (1 << 3), /**< list symbol properties */ ECMA_LIST_SYMBOLS_ONLY = (1 << 4), /**< list symbol properties only */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ECMA_LIST_CONVERT_FAST_ARRAYS = (1 << 5), /**< after listing the properties convert * the fast access mode array back to normal array */ } ecma_list_properties_options_t; @@ -393,9 +393,9 @@ typedef enum ECMA_PROPERTY_FLAG_DELETED = 1u << 0, /**< property is deleted */ ECMA_FAST_ARRAY_FLAG = 1u << 0, /**< array is fast array */ ECMA_PROPERTY_FLAG_LCACHED = 1u << 1, /**< property is lcached */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ECMA_ARRAY_TEMPLATE_LITERAL = 1u << 1, /**< array is a template literal constructed by the parser */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ECMA_PROPERTY_FLAG_CONFIGURABLE = 1u << 2, /**< property is configurable */ ECMA_PROPERTY_FLAG_ENUMERABLE = 1u << 3, /**< property is enumerable */ ECMA_PROPERTY_FLAG_WRITABLE = 1u << 4, /**< property is writable */ @@ -434,11 +434,11 @@ typedef enum /** * Default flag of length property. */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define ECMA_PROPERTY_FLAG_DEFAULT_LENGTH ECMA_PROPERTY_FLAG_CONFIGURABLE -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ #define ECMA_PROPERTY_FLAG_DEFAULT_LENGTH ECMA_PROPERTY_FIXED -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Shift for property name part. @@ -499,16 +499,16 @@ typedef uint8_t ecma_property_t; /**< ecma_property_types_t (3 bit) and ecma_pro */ typedef struct { -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT jmem_cpointer_t next_property_cp; /**< next cpointer */ -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ ecma_property_t types[ECMA_PROPERTY_PAIR_ITEM_COUNT]; /**< two property type slot. The first represent * the type of this property (e.g. property pair) */ -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT uint16_t padding; /**< an unused value */ -#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* !JERRY_CPOINTER_32_BIT */ jmem_cpointer_t next_property_cp; /**< next cpointer */ -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ } ecma_property_header_t; /** @@ -526,11 +526,11 @@ typedef struct typedef union { ecma_value_t value; /**< value of a property */ -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT jmem_cpointer_t getter_setter_pair_cp; /**< cpointer to getter setter pair */ -#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* !JERRY_CPOINTER_32_BIT */ ecma_getter_setter_pointers_t getter_setter_pair; /**< getter setter pair */ -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ } ecma_property_value_t; /** @@ -707,7 +707,7 @@ typedef enum ECMA_LEXICAL_ENVIRONMENT_TYPE__MAX = ECMA_LEXICAL_ENVIRONMENT_HOME_OBJECT_BOUND /**< maximum value */ } ecma_lexical_environment_type_t; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Types of array iterators. @@ -720,7 +720,7 @@ typedef enum ECMA_ITERATOR__COUNT, /**< number of iterator kinds */ } ecma_iterator_kind_t; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Offset for JERRY_CONTEXT (status_flags) top 8 bits. @@ -783,7 +783,7 @@ typedef enum */ #define ECMA_OBJECT_REF_ONE (1u << ECMA_OBJECT_REF_SHIFT) -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT /** * Bitmask for an ecma-object reference count field @@ -795,7 +795,7 @@ typedef enum */ typedef uint32_t ecma_object_descriptor_t; -#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* !JERRY_CPOINTER_32_BIT */ /** * Bitmask for an ecma-object reference count field @@ -807,7 +807,7 @@ typedef uint32_t ecma_object_descriptor_t; */ typedef uint16_t ecma_object_descriptor_t; -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ /** * Represents non-visited white object @@ -872,28 +872,28 @@ typedef struct uint8_t routine_flags; /**< flags for built-in routines */ } u2; -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_value_t realm_value; /**< realm value */ -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ uint32_t continue_instantiated_bitset[1]; /**< bit set for instantiated properties */ -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ } ecma_built_in_props_t; -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS /** * Number of bits available in the instantiated bitset without allocation */ #define ECMA_BUILTIN_INSTANTIATED_BITSET_MIN_SIZE (8) -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ /** * Number of bits available in the instantiated bitset without allocation */ #define ECMA_BUILTIN_INSTANTIATED_BITSET_MIN_SIZE (8 + 32) -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ /** * Builtin routine function object status flags @@ -1025,9 +1025,9 @@ typedef struct typedef struct { ecma_extended_object_t extended_object; /**< extended object part */ -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_value_t realm_value; /**< realm value */ -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ ecma_native_handler_t native_handler_cb; /**< external function */ } ecma_native_function_t; @@ -1063,12 +1063,12 @@ typedef struct typedef struct { ecma_extended_object_t header; /**< extended object header */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t target_length; /**< length of target function */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } ecma_bound_function_t; -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC /** * Description of static function objects. @@ -1079,9 +1079,9 @@ typedef struct const ecma_compiled_code_t *bytecode_p; /**< real byte code pointer */ } ecma_static_function_t; -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Flags for runnable objects. */ @@ -1101,7 +1101,7 @@ typedef struct ecma_value_t new_target; /**< value of new.target */ } ecma_arrow_function_t; -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC /** * Description of static arrow function objects. @@ -1112,11 +1112,11 @@ typedef struct const ecma_compiled_code_t *bytecode_p; } ecma_static_arrow_function_t; -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_BUILTIN_CONTAINER) +#if JERRY_BUILTIN_CONTAINER /** * Flags for container objects */ @@ -1169,7 +1169,7 @@ typedef struct #define ECMA_CONTAINER_START(collection_p) \ (collection_p->buffer_p + 1) -#endif /* ENABLED (JERRY_BUILTIN_CONTAINER) */ +#endif /* JERRY_BUILTIN_CONTAINER */ typedef enum { @@ -1242,7 +1242,7 @@ typedef struct */ #define ECMA_IS_THROW ((uint8_t) ECMA_PROP_IS_THROW) -#if !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if !JERRY_NUMBER_TYPE_FLOAT64 /** * Description of an ecma-number */ @@ -1287,7 +1287,7 @@ typedef union * IEEE-754 2008, 3.6, Table 3.5 */ #define ECMA_NUMBER_FRACTION_WIDTH (23) -#elif ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#elif JERRY_NUMBER_TYPE_FLOAT64 /** * Description of an ecma-number */ @@ -1332,7 +1332,7 @@ typedef union * IEEE-754 2008, 3.6, Table 3.5 */ #define ECMA_NUMBER_FRACTION_WIDTH (52) -#endif /* !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* !JERRY_NUMBER_TYPE_FLOAT64 */ /** * Value '0' of ecma_number_t @@ -1359,7 +1359,7 @@ typedef union */ #define ECMA_NUMBER_MINUS_ONE ((ecma_number_t) -1) -#if !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if !JERRY_NUMBER_TYPE_FLOAT64 /** * Number.MIN_VALUE (i.e., the smallest positive value of ecma-number) * @@ -1392,7 +1392,7 @@ typedef union * See also: ECMA_262 v6, 20.1.2.8 */ # define ECMA_NUMBER_MIN_SAFE_INTEGER ((ecma_number_t) -0xFFFFFF) -#elif ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#elif JERRY_NUMBER_TYPE_FLOAT64 /** * Number.MAX_VALUE (i.e., the maximum value of ecma-number) * @@ -1427,7 +1427,7 @@ typedef union * See also: ECMA_262 v6, 20.1.2.8 */ # define ECMA_NUMBER_MIN_SAFE_INTEGER ((ecma_number_t) -0x1FFFFFFFFFFFFF) -#endif /* !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* !JERRY_NUMBER_TYPE_FLOAT64 */ /** * Euler number @@ -1541,11 +1541,11 @@ typedef enum * Maximum value of the immediate part of a direct magic string. * Must be compatible with the immediate property name. */ -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT #define ECMA_DIRECT_STRING_MAX_IMM 0x07ffffff -#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* !JERRY_CPOINTER_32_BIT */ #define ECMA_DIRECT_STRING_MAX_IMM 0x0000ffff -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ /** * Shift for direct string value part in ecma_value_t. @@ -1843,7 +1843,7 @@ typedef struct */ #define ECMA_EXTENDED_PRIMITIVE_MAX_REF (UINT32_MAX - (ECMA_EXTENDED_PRIMITIVE_REF_ONE - 1)) -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP /** * The lowest state of the ecma_prop_hashmap_alloc_state counter. @@ -1857,7 +1857,7 @@ typedef struct */ #define ECMA_PROP_HASHMAP_ALLOC_MAX 4 -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ /** * Number of values in a literal storage item @@ -1873,15 +1873,15 @@ typedef struct jmem_cpointer_t values[ECMA_LIT_STORAGE_VALUE_COUNT]; /**< list of values */ } ecma_lit_storage_item_t; -#if ENABLED (JERRY_LCACHE) +#if JERRY_LCACHE /** * Container of an LCache entry identifier */ -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT typedef uint64_t ecma_lcache_hash_entry_id_t; -#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* !JERRY_CPOINTER_32_BIT */ typedef uint32_t ecma_lcache_hash_entry_id_t; -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ /** * Entry of LCache hash table @@ -1905,9 +1905,9 @@ typedef struct */ #define ECMA_LCACHE_HASH_ROW_LENGTH 2 -#endif /* ENABLED (JERRY_LCACHE) */ +#endif /* JERRY_LCACHE */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY /** * Function callback descriptor of a %TypedArray% object getter @@ -1998,17 +1998,17 @@ typedef struct uint8_t element_size; /**< element size based on [[TypedArrayName]] in Table 49 */ } ecma_typedarray_info_t; -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT /** * Checks whether a given typedarray is BigInt type or not. **/ #define ECMA_TYPEDARRAY_IS_BIGINT_TYPE(id) \ ((id) >= ECMA_BIGINT64_ARRAY) -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_BIGINT */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Executable (e.g. generator, async) object flags. @@ -2113,9 +2113,9 @@ typedef struct * real index + 1 in the [[Values]] list - otherwise */ } ecma_promise_all_executor_t; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW /** * Description of DataView objects. */ @@ -2125,7 +2125,7 @@ typedef struct ecma_object_t *buffer_p; /**< [[ViewedArrayBuffer]] internal slot */ uint32_t byte_offset; /**< [[ByteOffset]] internal slot */ } ecma_dataview_object_t; -#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW) */ +#endif /* JERRY_BUILTIN_DATAVIEW */ /** * Flag for indicating whether the symbol is a well known symbol @@ -2175,7 +2175,7 @@ do \ */ #define ECMA_PROPERTY_POINTER_ERROR ((ecma_property_t *) 0x01) -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY /** * Proxy object flags. @@ -2210,25 +2210,25 @@ typedef struct ecma_extended_object_t header; /**< header part */ ecma_value_t proxy; /**< [[RevocableProxy]] internal slot */ } ecma_revocable_proxy_object_t; -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Type to repesent the maximum property index * * For ES6+ the maximum valid property index is 2**53 - 1 */ typedef uint64_t ecma_length_t; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ /** * Type to repesent the maximum property index * * For ES5+ the maximum valid property index is 2**32 - 1 */ typedef uint32_t ecma_length_t; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT /** * BigUInt data is a sequence of uint32_t numbers. @@ -2258,7 +2258,7 @@ typedef uint32_t ecma_bigint_digit_t; #define ECMA_BIGINT_GET_BYTE_SIZE(size) \ (size_t) (((size) + sizeof (ecma_bigint_digit_t)) & ~(2 * sizeof (ecma_bigint_digit_t) - 1)) -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ /** * Struct for counting the different types properties in objects @@ -2305,9 +2305,9 @@ typedef struct union { ecma_value_t byte_code; /**< callee's compiled code */ -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC ecma_compiled_code_t *byte_code_p; /**< real byte code pointer */ -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ } u; } ecma_mapped_arguments_t; diff --git a/jerry-core/ecma/base/ecma-helpers-collection.c b/jerry-core/ecma/base/ecma-helpers-collection.c index 7ba90c359..e3b17fd69 100644 --- a/jerry-core/ecma/base/ecma-helpers-collection.c +++ b/jerry-core/ecma/base/ecma-helpers-collection.c @@ -79,7 +79,7 @@ ecma_collection_free_objects (ecma_collection_t *collection_p) /**< value collec ecma_collection_destroy (collection_p); } /* ecma_collection_free_objects */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Free the template literal objects and deallocate the collection @@ -117,7 +117,7 @@ ecma_collection_free_template_literal (ecma_collection_t *collection_p) /**< val ecma_collection_destroy (collection_p); } /* ecma_collection_free_template_literal */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Free the non-object collection elements and deallocate the collection diff --git a/jerry-core/ecma/base/ecma-helpers-conversion.c b/jerry-core/ecma/base/ecma-helpers-conversion.c index 160e67c58..d42f49afe 100644 --- a/jerry-core/ecma/base/ecma-helpers-conversion.c +++ b/jerry-core/ecma/base/ecma-helpers-conversion.c @@ -28,7 +28,7 @@ * @{ */ -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 /** * \addtogroup ecmahelpersbigintegers Helpers for operations intermediate 128-bit integers @@ -262,7 +262,7 @@ static const uint8_t ecma_uint4_clz[] = { 4, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, */ #define NUMBER_MIN_DECIMAL_EXPONENT -324 -#elif !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#elif !JERRY_NUMBER_TYPE_FLOAT64 /** * Number.MAX_VALUE exponent part when using 32 bit float representation. @@ -273,7 +273,7 @@ static const uint8_t ecma_uint4_clz[] = { 4, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, */ #define NUMBER_MIN_DECIMAL_EXPONENT -45 -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ /** * Value of epsilon @@ -295,15 +295,15 @@ ecma_utf8_string_to_number_by_radix (const lit_utf8_byte_t *str_p, /**< utf-8 st const lit_utf8_byte_t *end_p, /**< end of utf-8 string */ uint32_t radix) /**< radix */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT bool allow_underscore = (radix & ECMA_CONVERSION_ALLOW_UNDERSCORE); radix &= (uint32_t) ~ECMA_CONVERSION_ALLOW_UNDERSCORE; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ JERRY_ASSERT (radix == 2 || radix == 8 || radix == 16); ecma_number_t num = ECMA_NUMBER_ZERO; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (radix <= 8) { lit_code_point_t upper_limit = LIT_CHAR_0 + radix; @@ -326,7 +326,7 @@ ecma_utf8_string_to_number_by_radix (const lit_utf8_byte_t *str_p, /**< utf-8 st return num; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ for (const lit_utf8_byte_t * iter_p = str_p; iter_p <= end_p; iter_p++) { @@ -347,12 +347,12 @@ ecma_utf8_string_to_number_by_radix (const lit_utf8_byte_t *str_p, /**< utf-8 st { digit_value = 10 + (*iter_p - LIT_CHAR_UPPERCASE_A); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (*iter_p == LIT_CHAR_UNDERSCORE && allow_underscore) { continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ else { return ecma_number_make_nan (); @@ -461,13 +461,13 @@ ecma_utf8_string_to_number (const lit_utf8_byte_t *str_p, /**< utf-8 string */ digit_seen = true; digit_value = (*str_p - LIT_CHAR_0); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (*str_p == LIT_CHAR_UNDERSCORE && (options & ECMA_CONVERSION_ALLOW_UNDERSCORE)) { str_p++; continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ else { break; @@ -574,13 +574,13 @@ ecma_utf8_string_to_number (const lit_utf8_byte_t *str_p, /**< utf-8 string */ { digit_value = (*str_p - LIT_CHAR_0); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (*str_p == LIT_CHAR_UNDERSCORE && (options & ECMA_CONVERSION_ALLOW_UNDERSCORE)) { str_p++; continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ else { return ecma_number_make_nan (); @@ -636,7 +636,7 @@ ecma_utf8_string_to_number (const lit_utf8_byte_t *str_p, /**< utf-8 string */ return sign ? -ECMA_NUMBER_ZERO : ECMA_NUMBER_ZERO; } -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 /* * 128-bit mantissa storage * @@ -721,7 +721,7 @@ ecma_utf8_string_to_number (const lit_utf8_byte_t *str_p, /**< utf-8 string */ fraction_uint64 = ecma_round_high_to_uint64 (&fraction_uint128); return ecma_number_make_from_sign_mantissa_and_exponent (sign, fraction_uint64, binary_exponent); -#elif !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#elif !JERRY_NUMBER_TYPE_FLOAT64 /* Less precise conversion */ ecma_number_t num = (ecma_number_t) (uint32_t) fraction_uint64; @@ -739,7 +739,7 @@ ecma_utf8_string_to_number (const lit_utf8_byte_t *str_p, /**< utf-8 string */ } return num; -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ } /* ecma_utf8_string_to_number */ /** diff --git a/jerry-core/ecma/base/ecma-helpers-number.c b/jerry-core/ecma/base/ecma-helpers-number.c index 7db97280d..0e998f2b7 100644 --- a/jerry-core/ecma/base/ecma-helpers-number.c +++ b/jerry-core/ecma/base/ecma-helpers-number.c @@ -39,7 +39,7 @@ JERRY_STATIC_ASSERT (((1 << (ECMA_DIRECT_SHIFT - 1)) | ECMA_TYPE_DIRECT) == ECMA #define ECMA_NUMBER_SIGN_POS (ECMA_NUMBER_FRACTION_WIDTH + \ ECMA_NUMBER_BIASED_EXP_WIDTH) -#if !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if !JERRY_NUMBER_TYPE_FLOAT64 JERRY_STATIC_ASSERT (sizeof (ecma_number_t) == sizeof (uint32_t), size_of_ecma_number_t_must_be_equal_to_4_bytes); @@ -102,7 +102,7 @@ ecma_number_unpack (ecma_number_t num, /**< ecma-number */ */ const int32_t ecma_number_exponent_bias = 127; -#elif ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#elif JERRY_NUMBER_TYPE_FLOAT64 JERRY_STATIC_ASSERT (sizeof (ecma_number_t) == sizeof (uint64_t), size_of_ecma_number_t_must_be_equal_to_8_bytes); @@ -165,7 +165,7 @@ ecma_number_unpack (ecma_number_t num, /**< ecma-number */ */ const int32_t ecma_number_exponent_bias = 1023; -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ /** * Get fraction of number @@ -248,11 +248,11 @@ ecma_number_make_nan (void) { /* IEEE754 QNaN = sign bit: 0, exponent: all 1 bits, fraction: 1....0 */ ecma_number_accessor_t f; -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 f.as_uint64_t = 0x7ff8000000000000ull; /* double QNaN, same as the C99 nan("") returns. */ -#else /* !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#else /* !JERRY_NUMBER_TYPE_FLOAT64 */ f.as_uint32_t = 0x7fc00000u; /* float QNaN, same as the C99 nanf("") returns. */ -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ return f.as_ecma_number_t; } /* ecma_number_make_nan */ @@ -268,11 +268,11 @@ ecma_number_make_infinity (bool sign) /**< true - for negative Infinity, { /* IEEE754 INF = sign bit: sign, exponent: all 1 bits, fraction: 0....0 */ ecma_number_accessor_t f; -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 f.as_uint64_t = sign ? 0xfff0000000000000ull : 0x7ff0000000000000ull; -#else /* !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#else /* !JERRY_NUMBER_TYPE_FLOAT64 */ f.as_uint32_t = sign ? 0xff800000u : 0x7f800000u; -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ return f.as_ecma_number_t; } /* ecma_number_make_infinity */ diff --git a/jerry-core/ecma/base/ecma-helpers-string.c b/jerry-core/ecma/base/ecma-helpers-string.c index 8e3240ee0..4d9f91346 100644 --- a/jerry-core/ecma/base/ecma-helpers-string.c +++ b/jerry-core/ecma/base/ecma-helpers-string.c @@ -206,7 +206,7 @@ ecma_new_ecma_string_from_magic_string_ex_id (lit_magic_string_ex_id_t id) /**< return string_desc_p; } /* ecma_new_ecma_string_from_magic_string_ex_id */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Allocate new ecma-string and fill it with reference to the symbol descriptor * @@ -243,7 +243,7 @@ ecma_prop_name_is_symbol (ecma_string_t *string_p) /**< ecma-string */ return (!ECMA_IS_DIRECT_STRING (string_p) && ECMA_STRING_GET_CONTAINER (string_p) == ECMA_STRING_CONTAINER_SYMBOL); } /* ecma_prop_name_is_symbol */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Allocate new UTF8 ecma-string and fill it with characters from the given utf8 buffer @@ -510,7 +510,7 @@ ecma_new_ecma_string_from_code_unit (ecma_char_t code_unit) /**< code unit */ return ecma_new_ecma_string_from_utf8 (lit_utf8_bytes, bytes_size); } /* ecma_new_ecma_string_from_code_unit */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Allocate new ecma-string and fill it with cesu-8 character which represents specified code units @@ -528,7 +528,7 @@ ecma_new_ecma_string_from_code_units (ecma_char_t first_code_unit, /**< code uni return ecma_new_ecma_string_from_utf8 (lit_utf8_bytes, bytes_size); } /* ecma_new_ecma_string_from_code_units */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Allocate new ecma-string and fill it with ecma-number @@ -563,14 +563,14 @@ ecma_new_ecma_string_from_length (ecma_length_t number) /**< property length */ return (ecma_string_t *) ECMA_CREATE_DIRECT_STRING (ECMA_DIRECT_STRING_UINT, (uintptr_t) number); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_ASSERT ((ecma_number_t) number <= ECMA_NUMBER_MAX_SAFE_INTEGER); if (JERRY_UNLIKELY (number > UINT32_MAX)) { return ecma_new_ecma_string_from_number ((ecma_number_t) number); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return ecma_new_non_direct_string_from_uint32 ((uint32_t) number); } /* ecma_new_ecma_string_from_length */ @@ -951,7 +951,7 @@ ecma_destroy_ecma_string (ecma_string_t *string_p) /**< ecma-string */ ecma_dealloc_string_buffer (string_p, ECMA_ASCII_STRING_GET_SIZE (string_p) + ECMA_ASCII_STRING_HEADER_SIZE); return; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case ECMA_STRING_CONTAINER_SYMBOL: { ecma_extended_string_t *symbol_p = (ecma_extended_string_t *) string_p; @@ -959,7 +959,7 @@ ecma_destroy_ecma_string (ecma_string_t *string_p) /**< ecma-string */ ecma_dealloc_extended_string (symbol_p); return; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { JERRY_ASSERT (ECMA_STRING_GET_CONTAINER (string_p) == ECMA_STRING_CONTAINER_UINT32_IN_DESC @@ -2553,7 +2553,7 @@ ecma_string_trim (const ecma_string_t *string_p) /**< pointer to an ecma string return ret_string_p; } /* ecma_string_trim */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Pad the beginning or the end of string with parameter given in fill_string to the length of max_length. @@ -2624,16 +2624,14 @@ ecma_string_pad (ecma_value_t original_string_p, /**< Input ecma string */ ecma_stringbuilder_append (&builder, filler_p); } - lit_utf8_size_t read_size; - ecma_char_t ch; - uint32_t remaining = fill_len - (prepend_count * filler_length); ECMA_STRING_TO_UTF8_STRING (filler_p, start_p, utf8_str_size); const lit_utf8_byte_t *temp_start_p = start_p; while (remaining > 0) { - read_size = lit_read_code_unit_from_utf8 (temp_start_p, &ch); + ecma_char_t ch; + lit_utf8_size_t read_size = lit_read_code_unit_from_utf8 (temp_start_p, &ch); ecma_stringbuilder_append_char (&builder, ch); temp_start_p += read_size; remaining--; @@ -2649,7 +2647,7 @@ ecma_string_pad (ecma_value_t original_string_p, /**< Input ecma string */ return ecma_make_string_value (ecma_stringbuilder_finalize (&builder)); } /* ecma_string_pad */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Create an empty string builder @@ -2662,9 +2660,9 @@ ecma_stringbuilder_create (void) const lit_utf8_size_t initial_size = ECMA_ASCII_STRING_HEADER_SIZE; ecma_stringbuilder_header_t *header_p = (ecma_stringbuilder_header_t *) jmem_heap_alloc_block (initial_size); header_p->current_size = initial_size; -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_allocate_string_bytes (initial_size); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ ecma_stringbuilder_t ret = {.header_p = header_p}; return ret; @@ -2683,9 +2681,9 @@ ecma_stringbuilder_create_from (ecma_string_t *string_p) /**< ecma string */ ecma_stringbuilder_header_t *header_p = (ecma_stringbuilder_header_t *) jmem_heap_alloc_block (initial_size); header_p->current_size = initial_size; -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_allocate_string_bytes (initial_size); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ size_t copied_size = ecma_string_copy_to_cesu8_buffer (string_p, ECMA_STRINGBUILDER_STRING_PTR (header_p), @@ -2709,9 +2707,9 @@ ecma_stringbuilder_create_raw (const lit_utf8_byte_t *data_p, /**< pointer to da ecma_stringbuilder_header_t *header_p = (ecma_stringbuilder_header_t *) jmem_heap_alloc_block (initial_size); header_p->current_size = initial_size; -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_allocate_string_bytes (initial_size); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ memcpy (ECMA_STRINGBUILDER_STRING_PTR (header_p), data_p, data_size); @@ -2736,9 +2734,9 @@ ecma_stringbuilder_grow (ecma_stringbuilder_t *builder_p, /**< string builder */ header_p->current_size = new_size; builder_p->header_p = header_p; -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_allocate_string_bytes (required_size); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ return ((lit_utf8_byte_t *) header_p) + header_p->current_size - required_size; } /* ecma_stringbuilder_grow */ @@ -2784,9 +2782,9 @@ ecma_stringbuilder_revert (ecma_stringbuilder_t *builder_p, /**< string builder const lit_utf8_size_t new_size = size + ECMA_ASCII_STRING_HEADER_SIZE; JERRY_ASSERT (new_size <= header_p->current_size); -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_free_string_bytes (header_p->current_size - new_size); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ header_p = jmem_heap_realloc_block (header_p, header_p->current_size, new_size); header_p->current_size = new_size; @@ -2925,9 +2923,9 @@ ecma_stringbuilder_finalize (ecma_stringbuilder_t *builder_p) /**< string builde ECMA_STRINGBUILDER_STRING_PTR (header_p), string_size); -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_allocate_string_bytes (container_size - ECMA_ASCII_STRING_HEADER_SIZE); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ if (JERRY_LIKELY (string_size <= UINT16_MAX)) { @@ -2966,12 +2964,12 @@ ecma_stringbuilder_destroy (ecma_stringbuilder_t *builder_p) /**< string builder builder_p->header_p = NULL; #endif -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_free_string_bytes (size); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ } /* ecma_stringbuilder_destroy */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * AdvanceStringIndex operation * @@ -3018,7 +3016,7 @@ ecma_op_advance_string_index (ecma_string_t *str_p, /**< input string */ return next_index + 1; } /* ecma_op_advance_string_index */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} diff --git a/jerry-core/ecma/base/ecma-helpers-value.c b/jerry-core/ecma/base/ecma-helpers-value.c index 8107b742f..be8b440ce 100644 --- a/jerry-core/ecma/base/ecma-helpers-value.c +++ b/jerry-core/ecma/base/ecma-helpers-value.c @@ -56,12 +56,12 @@ JERRY_STATIC_ASSERT ((ECMA_VALUE_FALSE | (1 << ECMA_DIRECT_SHIFT)) == ECMA_VALUE && ECMA_VALUE_FALSE != ECMA_VALUE_TRUE, only_the_lowest_bit_must_be_different_for_simple_value_true_and_false); -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT JERRY_STATIC_ASSERT (ECMA_NULL_POINTER == (ECMA_BIGINT_ZERO & ~(ecma_value_t) ECMA_VALUE_TYPE_MASK), ecma_bigint_zero_must_be_encoded_as_null_pointer); -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ /** \addtogroup ecma ECMA * @{ @@ -332,12 +332,12 @@ ecma_is_value_string (ecma_value_t value) /**< ecma value */ extern inline bool JERRY_ATTR_CONST JERRY_ATTR_ALWAYS_INLINE ecma_is_value_symbol (ecma_value_t value) /**< ecma value */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT return (ecma_get_value_type_field (value) == ECMA_TYPE_SYMBOL); -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ JERRY_UNUSED (value); return false; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* ecma_is_value_symbol */ /** @@ -362,12 +362,12 @@ ecma_is_value_magic_string (ecma_value_t value, /**< ecma value */ extern inline bool JERRY_ATTR_CONST JERRY_ATTR_ALWAYS_INLINE ecma_is_value_bigint (ecma_value_t value) /**< ecma value */ { - #if ENABLED (JERRY_BUILTIN_BIGINT) + #if JERRY_BUILTIN_BIGINT return (ecma_get_value_type_field (value) == ECMA_TYPE_BIGINT); - #else /* !ENABLED (JERRY_BUILTIN_BIGINT) */ + #else /* !JERRY_BUILTIN_BIGINT */ JERRY_UNUSED (value); return false; - #endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ + #endif /* JERRY_BUILTIN_BIGINT */ } /* ecma_is_value_bigint */ /** @@ -379,11 +379,11 @@ ecma_is_value_bigint (ecma_value_t value) /**< ecma value */ extern inline bool JERRY_ATTR_CONST JERRY_ATTR_ALWAYS_INLINE ecma_is_value_prop_name (ecma_value_t value) /**< ecma value */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT return ecma_is_value_string (value) || ecma_is_value_symbol (value); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ return ecma_is_value_string (value); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* ecma_is_value_prop_name */ /** @@ -472,7 +472,7 @@ ecma_is_value_array (ecma_value_t arg) /**< argument */ return ECMA_VALUE_TRUE; } -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (arg_obj_p)) { ecma_proxy_object_t *proxy_obj_p = (ecma_proxy_object_t *) arg_obj_p; @@ -484,7 +484,7 @@ ecma_is_value_array (ecma_value_t arg) /**< argument */ return ecma_is_value_array (proxy_obj_p->target); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ return ECMA_VALUE_FALSE; } /* ecma_is_value_array */ @@ -563,11 +563,11 @@ ecma_is_number_equal_to_positive_zero (ecma_number_t ecma_number) /**< number */ { ecma_number_accessor_t u; u.as_ecma_number_t = ecma_number; -#if !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if !JERRY_NUMBER_TYPE_FLOAT64 return u.as_uint32_t == 0; -#else /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#else /* JERRY_NUMBER_TYPE_FLOAT64 */ return u.as_uint64_t == 0; -#endif /* !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* !JERRY_NUMBER_TYPE_FLOAT64 */ } /* ecma_is_number_equal_to_positive_zero */ /** @@ -647,9 +647,9 @@ extern inline ecma_value_t JERRY_ATTR_PURE JERRY_ATTR_ALWAYS_INLINE ecma_make_string_value (const ecma_string_t *ecma_string_p) /**< string to reference in value */ { JERRY_ASSERT (ecma_string_p != NULL); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_ASSERT (!ecma_prop_name_is_symbol ((ecma_string_t *) ecma_string_p)); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if ((((uintptr_t) ecma_string_p) & ECMA_VALUE_TYPE_MASK) != 0) { @@ -659,7 +659,7 @@ ecma_make_string_value (const ecma_string_t *ecma_string_p) /**< string to refer return ecma_pointer_to_ecma_value (ecma_string_p) | ECMA_TYPE_STRING; } /* ecma_make_string_value */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Symbol value constructor * @@ -673,7 +673,7 @@ ecma_make_symbol_value (const ecma_string_t *ecma_symbol_p) /**< symbol to refer return ecma_pointer_to_ecma_value (ecma_symbol_p) | ECMA_TYPE_SYMBOL; } /* ecma_make_symbol_value */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Property-name value constructor @@ -685,12 +685,12 @@ ecma_make_prop_name_value (const ecma_string_t *ecma_prop_name_p) /**< property { JERRY_ASSERT (ecma_prop_name_p != NULL); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ecma_prop_name_is_symbol ((ecma_string_t *) ecma_prop_name_p)) { return ecma_make_symbol_value (ecma_prop_name_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return ecma_make_string_value (ecma_prop_name_p); } /* ecma_make_prop_name_value */ @@ -729,9 +729,9 @@ ecma_make_extended_primitive_value (const ecma_extended_primitive_t *primitve_p, uint32_t type) /**< ecma type of extended primitve value */ { JERRY_ASSERT (primitve_p != NULL); -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT JERRY_ASSERT (primitve_p != ECMA_BIGINT_POINTER_TO_ZERO); -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ JERRY_ASSERT (type == ECMA_TYPE_BIGINT || type == ECMA_TYPE_ERROR); return ecma_pointer_to_ecma_value (primitve_p) | type; @@ -810,7 +810,7 @@ ecma_get_string_from_value (ecma_value_t value) /**< ecma value */ return (ecma_string_t *) ecma_get_pointer_from_ecma_value (value); } /* ecma_get_string_from_value */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Get pointer to ecma-string from ecma value * @@ -823,7 +823,7 @@ ecma_get_symbol_from_value (ecma_value_t value) /**< ecma value */ return (ecma_string_t *) ecma_get_pointer_from_ecma_value (value); } /* ecma_get_symbol_from_value */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Get pointer to a property name from ecma value @@ -864,9 +864,9 @@ ecma_get_object_from_value (ecma_value_t value) /**< ecma value */ extern inline ecma_extended_primitive_t * JERRY_ATTR_PURE JERRY_ATTR_ALWAYS_INLINE ecma_get_extended_primitive_from_value (ecma_value_t value) /**< ecma value */ { -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT JERRY_ASSERT (value != ECMA_BIGINT_ZERO); -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ JERRY_ASSERT (ecma_get_value_type_field (value) == ECMA_TYPE_BIGINT || ecma_get_value_type_field (value) == ECMA_TYPE_ERROR); @@ -907,14 +907,14 @@ ecma_copy_value (ecma_value_t value) /**< value description */ ecma_ref_ecma_string (ecma_get_string_from_value (value)); return value; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case ECMA_TYPE_SYMBOL: { ecma_ref_ecma_string (ecma_get_symbol_from_value (value)); return value; } -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#endif /* JERRY_ESNEXT */ +#if JERRY_BUILTIN_BIGINT case ECMA_TYPE_BIGINT: { if (value != ECMA_BIGINT_ZERO) @@ -923,7 +923,7 @@ ecma_copy_value (ecma_value_t value) /**< value description */ } return value; } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ case ECMA_TYPE_OBJECT: { ecma_ref_object (ecma_get_object_from_value (value)); @@ -1138,20 +1138,20 @@ ecma_free_value (ecma_value_t value) /**< value description */ ecma_deref_ecma_string (string_p); break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case ECMA_TYPE_SYMBOL: { ecma_deref_ecma_string (ecma_get_symbol_from_value (value)); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case ECMA_TYPE_OBJECT: { ecma_deref_object (ecma_get_object_from_value (value)); break; } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT case ECMA_TYPE_BIGINT: { if (value != ECMA_BIGINT_ZERO) @@ -1160,7 +1160,7 @@ ecma_free_value (ecma_value_t value) /**< value description */ } break; } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ default: { @@ -1264,18 +1264,18 @@ ecma_get_typeof_lit_id (ecma_value_t value) /**< input ecma value */ { ret_value = LIT_MAGIC_STRING_STRING; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (ecma_is_value_symbol (value)) { ret_value = LIT_MAGIC_STRING_SYMBOL; } -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#endif /* JERRY_ESNEXT */ +#if JERRY_BUILTIN_BIGINT else if (ecma_is_value_bigint (value)) { ret_value = LIT_MAGIC_STRING_BIGINT; } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ else { JERRY_ASSERT (ecma_is_value_object (value)); diff --git a/jerry-core/ecma/base/ecma-helpers.c b/jerry-core/ecma/base/ecma-helpers.c index ab6ae4f8e..f520aa0b0 100644 --- a/jerry-core/ecma/base/ecma-helpers.c +++ b/jerry-core/ecma/base/ecma-helpers.c @@ -26,9 +26,9 @@ #include "re-compiler.h" #include "ecma-builtins.h" -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER #include "debugger.h" -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ /** \addtogroup ecma ECMA * @{ @@ -136,12 +136,12 @@ ecma_create_object_lex_env (ecma_object_t *outer_lexical_environment_p, /**< out ecma_object_t *binding_obj_p, /**< binding object */ ecma_lexical_environment_type_t type) /**< type of the new lexical environment */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_ASSERT (type == ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND || type == ECMA_LEXICAL_ENVIRONMENT_HOME_OBJECT_BOUND); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_ASSERT (type == ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ JERRY_ASSERT (binding_obj_p != NULL && !ecma_is_lexical_environment (binding_obj_p)); @@ -284,12 +284,12 @@ ecma_get_lex_env_binding_object (const ecma_object_t *object_p) /**< object-boun { JERRY_ASSERT (object_p != NULL); JERRY_ASSERT (ecma_is_lexical_environment (object_p)); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_ASSERT (ecma_get_lex_env_type (object_p) == ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND || ecma_get_lex_env_type (object_p) == ECMA_LEXICAL_ENVIRONMENT_HOME_OBJECT_BOUND); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_ASSERT (ecma_get_lex_env_type (object_p) == ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return ECMA_GET_NON_NULL_POINTER (ecma_object_t, object_p->u1.bound_object_cp); } /* ecma_get_lex_env_binding_object */ @@ -390,7 +390,7 @@ ecma_create_property (ecma_object_t *object_p, /**< the object */ ecma_property_header_t *first_property_p = ECMA_GET_NON_NULL_POINTER (ecma_property_header_t, *property_list_head_p); -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP bool has_hashmap = false; if (first_property_p->types[0] == ECMA_PROPERTY_TYPE_HASHMAP) @@ -400,7 +400,7 @@ ecma_create_property (ecma_object_t *object_p, /**< the object */ *property_list_head_p); has_hashmap = true; } -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ JERRY_ASSERT (ECMA_PROPERTY_IS_PROPERTY_PAIR (first_property_p)); @@ -424,7 +424,7 @@ ecma_create_property (ecma_object_t *object_p, /**< the object */ first_property_pair_p->values[0] = value; -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP /* The property must be fully initialized before ecma_property_hashmap_insert * is called, because the insert operation may reallocate the hashmap, and * that triggers garbage collection which scans all properties of all objects. @@ -437,7 +437,7 @@ ecma_create_property (ecma_object_t *object_p, /**< the object */ first_property_pair_p, 0); } -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ return first_property_pair_p->values + 0; } @@ -449,7 +449,7 @@ ecma_create_property (ecma_object_t *object_p, /**< the object */ /* Need to query property_list_head_p again and recheck the existennce * of property hasmap, because ecma_alloc_property_pair may delete them. */ property_list_head_p = &object_p->u1.property_list_cp; -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP bool has_hashmap = false; if (*property_list_head_p != ECMA_NULL_POINTER) @@ -463,7 +463,7 @@ ecma_create_property (ecma_object_t *object_p, /**< the object */ has_hashmap = true; } } -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ /* Just copy the previous value (no need to decompress, compress). */ first_property_pair_p->header.next_property_cp = *property_list_head_p; @@ -489,7 +489,7 @@ ecma_create_property (ecma_object_t *object_p, /**< the object */ first_property_pair_p->values[1] = value; -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP /* See the comment before the other ecma_property_hashmap_insert above. */ if (has_hashmap) @@ -499,7 +499,7 @@ ecma_create_property (ecma_object_t *object_p, /**< the object */ first_property_pair_p, 1); } -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ return first_property_pair_p->values + 1; } /* ecma_create_property */ @@ -554,16 +554,16 @@ ecma_create_named_accessor_property (ecma_object_t *object_p, /**< object */ uint8_t type_and_flags = prop_attributes; ecma_property_value_t value; -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT ecma_getter_setter_pointers_t *getter_setter_pair_p; getter_setter_pair_p = jmem_pools_alloc (sizeof (ecma_getter_setter_pointers_t)); ECMA_SET_POINTER (getter_setter_pair_p->getter_cp, get_p); ECMA_SET_POINTER (getter_setter_pair_p->setter_cp, set_p); ECMA_SET_NON_NULL_POINTER (value.getter_setter_pair_cp, getter_setter_pair_p); -#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* !JERRY_CPOINTER_32_BIT */ ECMA_SET_POINTER (value.getter_setter_pair.getter_cp, get_p); ECMA_SET_POINTER (value.getter_setter_pair.setter_cp, set_p); -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ return ecma_create_property (object_p, name_p, type_and_flags, value, out_prop_p); } /* ecma_create_named_accessor_property */ @@ -583,19 +583,19 @@ ecma_find_named_property (ecma_object_t *obj_p, /**< object to find property in JERRY_ASSERT (ecma_is_lexical_environment (obj_p) || !ecma_op_object_is_fast_array (obj_p)); - ecma_property_t *property_p = NULL; - -#if ENABLED (JERRY_LCACHE) - property_p = ecma_lcache_lookup (obj_p, name_p); +#if JERRY_LCACHE + ecma_property_t *property_p = ecma_lcache_lookup (obj_p, name_p); if (property_p != NULL) { return property_p; } -#endif /* ENABLED (JERRY_LCACHE) */ +#else /* !JERRY_LCACHE */ + ecma_property_t *property_p = NULL; +#endif /* JERRY_LCACHE */ jmem_cpointer_t prop_iter_cp = obj_p->u1.property_list_cp; -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP if (prop_iter_cp != JMEM_CP_NULL) { ecma_property_header_t *prop_iter_p = ECMA_GET_NON_NULL_POINTER (ecma_property_header_t, @@ -606,21 +606,21 @@ ecma_find_named_property (ecma_object_t *obj_p, /**< object to find property in property_p = ecma_property_hashmap_find ((ecma_property_hashmap_t *) prop_iter_p, name_p, &property_real_name_cp); -#if ENABLED (JERRY_LCACHE) +#if JERRY_LCACHE if (property_p != NULL && !ecma_is_property_lcached (property_p)) { ecma_lcache_insert (obj_p, property_real_name_cp, property_p); } -#endif /* ENABLED (JERRY_LCACHE) */ +#endif /* JERRY_LCACHE */ return property_p; } } -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP uint32_t steps = 0; -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ jmem_cpointer_t property_name_cp = ECMA_NULL_POINTER; if (ECMA_IS_DIRECT_STRING (name_p)) @@ -657,9 +657,9 @@ ecma_find_named_property (ecma_object_t *obj_p, /**< object to find property in break; } -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP steps++; -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ prop_iter_cp = prop_iter_p->next_property_cp; } } @@ -698,27 +698,27 @@ ecma_find_named_property (ecma_object_t *obj_p, /**< object to find property in } } -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP steps++; -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ prop_iter_cp = prop_iter_p->next_property_cp; } } -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP if (steps >= (ECMA_PROPERTY_HASMAP_MINIMUM_SIZE / 2)) { ecma_property_hashmap_create (obj_p); } -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ -#if ENABLED (JERRY_LCACHE) +#if JERRY_LCACHE if (property_p != NULL && !ecma_is_property_lcached (property_p)) { ecma_lcache_insert (obj_p, property_name_cp, property_p); } -#endif /* ENABLED (JERRY_LCACHE) */ +#endif /* JERRY_LCACHE */ return property_p; } /* ecma_find_named_property */ @@ -768,20 +768,20 @@ ecma_free_property (ecma_object_t *object_p, /**< object the property belongs to } else { -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT ecma_getter_setter_pointers_t *getter_setter_pair_p; getter_setter_pair_p = ECMA_GET_NON_NULL_POINTER (ecma_getter_setter_pointers_t, ECMA_PROPERTY_VALUE_PTR (property_p)->getter_setter_pair_cp); jmem_pools_free (getter_setter_pair_p, sizeof (ecma_getter_setter_pointers_t)); -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ } -#if ENABLED (JERRY_LCACHE) +#if JERRY_LCACHE if (ecma_is_property_lcached (property_p)) { ecma_lcache_invalidate (object_p, name_cp, property_p); } -#endif /* ENABLED (JERRY_LCACHE) */ +#endif /* JERRY_LCACHE */ if (ECMA_PROPERTY_GET_NAME_TYPE (*property_p) == ECMA_DIRECT_STRING_PTR) { @@ -803,7 +803,7 @@ ecma_delete_property (ecma_object_t *object_p, /**< object */ ecma_property_header_t *prev_prop_p = NULL; -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP ecma_property_hashmap_delete_status hashmap_status = ECMA_PROPERTY_HASHMAP_DELETE_NO_HASHMAP; if (cur_prop_cp != JMEM_CP_NULL) @@ -818,7 +818,7 @@ ecma_delete_property (ecma_object_t *object_p, /**< object */ hashmap_status = ECMA_PROPERTY_HASHMAP_DELETE_HAS_HASHMAP; } } -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ while (cur_prop_cp != JMEM_CP_NULL) { @@ -835,14 +835,14 @@ ecma_delete_property (ecma_object_t *object_p, /**< object */ { JERRY_ASSERT (ECMA_PROPERTY_IS_NAMED_PROPERTY (cur_prop_p->types[i])); -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP if (hashmap_status == ECMA_PROPERTY_HASHMAP_DELETE_HAS_HASHMAP) { hashmap_status = ecma_property_hashmap_delete (object_p, prop_pair_p->names_cp[i], cur_prop_p->types + i); } -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ ecma_free_property (object_p, prop_pair_p->names_cp[i], cur_prop_p->types + i); cur_prop_p->types[i] = ECMA_PROPERTY_TYPE_DELETED; @@ -852,14 +852,14 @@ ecma_delete_property (ecma_object_t *object_p, /**< object */ if (cur_prop_p->types[1 - i] != ECMA_PROPERTY_TYPE_DELETED) { -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP /* The other property is still valid. */ if (hashmap_status == ECMA_PROPERTY_HASHMAP_DELETE_RECREATE_HASHMAP) { ecma_property_hashmap_free (object_p); ecma_property_hashmap_create (object_p); } -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ return; } @@ -876,13 +876,13 @@ ecma_delete_property (ecma_object_t *object_p, /**< object */ ecma_dealloc_property_pair ((ecma_property_pair_t *) cur_prop_p); -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP if (hashmap_status == ECMA_PROPERTY_HASHMAP_DELETE_RECREATE_HASHMAP) { ecma_property_hashmap_free (object_p); ecma_property_hashmap_create (object_p); } -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ return; } } @@ -961,11 +961,11 @@ ecma_named_data_property_assign_value (ecma_object_t *obj_p, /**< object */ ecma_getter_setter_pointers_t * ecma_get_named_accessor_property (const ecma_property_value_t *prop_value_p) /**< property value reference */ { -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT return ECMA_GET_NON_NULL_POINTER (ecma_getter_setter_pointers_t, prop_value_p->getter_setter_pair_cp); -#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* !JERRY_CPOINTER_32_BIT */ return (ecma_getter_setter_pointers_t *) &prop_value_p->getter_setter_pair; -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ } /* ecma_get_named_accessor_property */ /** @@ -978,14 +978,14 @@ ecma_set_named_accessor_property_getter (ecma_object_t *object_p, /**< the prope { ecma_assert_object_contains_the_property (object_p, prop_value_p, false); -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT ecma_getter_setter_pointers_t *getter_setter_pair_p; getter_setter_pair_p = ECMA_GET_NON_NULL_POINTER (ecma_getter_setter_pointers_t, prop_value_p->getter_setter_pair_cp); ECMA_SET_POINTER (getter_setter_pair_p->getter_cp, getter_p); -#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* !JERRY_CPOINTER_32_BIT */ ECMA_SET_POINTER (prop_value_p->getter_setter_pair.getter_cp, getter_p); -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ } /* ecma_set_named_accessor_property_getter */ /** @@ -998,14 +998,14 @@ ecma_set_named_accessor_property_setter (ecma_object_t *object_p, /**< the prope { ecma_assert_object_contains_the_property (object_p, prop_value_p, false); -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT ecma_getter_setter_pointers_t *getter_setter_pair_p; getter_setter_pair_p = ECMA_GET_NON_NULL_POINTER (ecma_getter_setter_pointers_t, prop_value_p->getter_setter_pair_cp); ECMA_SET_POINTER (getter_setter_pair_p->setter_cp, setter_p); -#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* !JERRY_CPOINTER_32_BIT */ ECMA_SET_POINTER (prop_value_p->getter_setter_pair.setter_cp, setter_p); -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ } /* ecma_set_named_accessor_property_setter */ /** @@ -1107,7 +1107,7 @@ ecma_set_property_configurable_attr (ecma_property_t *property_p, /**< [in,out] } } /* ecma_set_property_configurable_attr */ -#if ENABLED (JERRY_LCACHE) +#if JERRY_LCACHE /** * Check whether the property is registered in LCache @@ -1141,7 +1141,7 @@ ecma_set_property_lcached (ecma_property_t *property_p, /**< property */ } } /* ecma_set_property_lcached */ -#endif /* ENABLED (JERRY_LCACHE) */ +#endif /* JERRY_LCACHE */ /** * Construct empty property descriptor, i.e.: @@ -1228,7 +1228,7 @@ ecma_deref_error_reference (ecma_extended_primitive_t *error_ref_p) /**< error r } } /* ecma_deref_error_reference */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT /** * Decrease ref count of a bigint value. @@ -1253,7 +1253,7 @@ ecma_deref_bigint (ecma_extended_primitive_t *bigint_p) /**< bigint value */ jmem_heap_free_block (bigint_p, mem_size); } /* ecma_deref_bigint */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ /** * Create an error reference from a given value. @@ -1410,7 +1410,7 @@ ecma_bytecode_deref (ecma_compiled_code_t *bytecode_p) /**< byte code pointer */ } } -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if ((JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) && !(bytecode_p->status_flags & CBC_CODE_FLAGS_DEBUGGER_IGNORE) && jerry_debugger_send_function_cp (JERRY_DEBUGGER_RELEASE_BYTE_CODE_CP, bytecode_p)) @@ -1442,9 +1442,9 @@ ecma_bytecode_deref (ecma_compiled_code_t *bytecode_p) /**< byte code pointer */ JERRY_CONTEXT (debugger_byte_code_free_head) = byte_code_free_cp; return; } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (bytecode_p->status_flags & CBC_CODE_FLAGS_HAS_TAGGED_LITERALS) { ecma_collection_t *collection_p = ecma_compiled_code_get_tagged_template_collection (bytecode_p); @@ -1454,19 +1454,19 @@ ecma_bytecode_deref (ecma_compiled_code_t *bytecode_p) /**< byte code pointer */ JERRY_CONTEXT (ecma_gc_new_objects) += collection_p->item_count * 2; ecma_collection_free_template_literal (collection_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_free_byte_code_bytes (((size_t) bytecode_p->size) << JMEM_ALIGNMENT_LOG); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ } else { -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP re_compiled_code_t *re_bytecode_p = (re_compiled_code_t *) bytecode_p; ecma_deref_ecma_string (ecma_get_string_from_value (re_bytecode_p->source)); -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ } jmem_heap_free_block (bytecode_p, @@ -1499,7 +1499,7 @@ ecma_compiled_code_resolve_arguments_start (const ecma_compiled_code_t *bytecode return ((ecma_value_t *) byte_p) - ((cbc_uint16_arguments_t *) bytecode_header_p)->argument_end; } /* ecma_compiled_code_resolve_arguments_start */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Resolve the position of the function name of the compiled code @@ -1552,7 +1552,7 @@ ecma_compiled_code_get_tagged_template_collection (const ecma_compiled_code_t *b return ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, base_p[offset]); } /* ecma_compiled_code_get_tagged_template_collection */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Get the resource name of a compiled code. @@ -1562,7 +1562,7 @@ ecma_compiled_code_get_tagged_template_collection (const ecma_compiled_code_t *b ecma_value_t ecma_get_resource_name (const ecma_compiled_code_t *bytecode_p) /**< compiled code */ { -#if ENABLED (JERRY_RESOURCE_NAME) +#if JERRY_RESOURCE_NAME if (bytecode_p->status_flags & CBC_CODE_FLAGS_UINT16_ARGUMENTS) { cbc_uint16_arguments_t *args_p = (cbc_uint16_arguments_t *) bytecode_p; @@ -1573,10 +1573,10 @@ ecma_get_resource_name (const ecma_compiled_code_t *bytecode_p) /**< compiled co cbc_uint8_arguments_t *args_p = (cbc_uint8_arguments_t *) bytecode_p; ecma_value_t *lit_pool_p = (ecma_value_t *) ((uint8_t *) bytecode_p + sizeof (cbc_uint8_arguments_t)); return lit_pool_p[args_p->const_literal_end - args_p->register_end - 1]; -#else /* !ENABLED (JERRY_RESOURCE_NAME) */ +#else /* !JERRY_RESOURCE_NAME */ JERRY_UNUSED (bytecode_p); return ecma_make_magic_string_value (LIT_MAGIC_STRING_RESOURCE_ANON); -#endif /* !ENABLED (JERRY_RESOURCE_NAME) */ +#endif /* !JERRY_RESOURCE_NAME */ } /* ecma_get_resource_name */ #if (JERRY_STACK_LIMIT != 0) diff --git a/jerry-core/ecma/base/ecma-helpers.h b/jerry-core/ecma/base/ecma-helpers.h index 3340c79f6..6aa97e445 100644 --- a/jerry-core/ecma/base/ecma-helpers.h +++ b/jerry-core/ecma/base/ecma-helpers.h @@ -209,11 +209,11 @@ typedef enum * * @param obj_p ecma-object */ -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY #define ECMA_OBJECT_IS_PROXY(obj_p) (ECMA_OBJECT_TYPE_IS_PROXY (ecma_get_object_type ((obj_p)))) -#else /* !ENABLED (JERRY_BUILTIN_PROXY) */ +#else /* !JERRY_BUILTIN_PROXY */ #define ECMA_OBJECT_IS_PROXY(obj_p) (false) -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ /* ecma-helpers-value.c */ ecma_type_t JERRY_ATTR_CONST ecma_get_value_type_field (ecma_value_t value); @@ -254,9 +254,9 @@ ecma_value_t ecma_make_number_value (ecma_number_t ecma_number); ecma_value_t ecma_make_int32_value (int32_t int32_number); ecma_value_t ecma_make_uint32_value (uint32_t uint32_number); ecma_value_t JERRY_ATTR_PURE ecma_make_string_value (const ecma_string_t *ecma_string_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t JERRY_ATTR_PURE ecma_make_symbol_value (const ecma_string_t *ecma_symbol_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t JERRY_ATTR_PURE ecma_make_prop_name_value (const ecma_string_t *ecma_prop_name_p); ecma_value_t JERRY_ATTR_PURE ecma_make_magic_string_value (lit_magic_string_id_t id); ecma_value_t JERRY_ATTR_PURE ecma_make_object_value (const ecma_object_t *object_p); @@ -267,9 +267,9 @@ ecma_number_t JERRY_ATTR_PURE ecma_get_float_from_value (ecma_value_t value); ecma_number_t * ecma_get_pointer_from_float_value (ecma_value_t value); ecma_number_t JERRY_ATTR_PURE ecma_get_number_from_value (ecma_value_t value); ecma_string_t JERRY_ATTR_PURE *ecma_get_string_from_value (ecma_value_t value); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_string_t JERRY_ATTR_PURE *ecma_get_symbol_from_value (ecma_value_t value); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_string_t JERRY_ATTR_PURE *ecma_get_prop_name_from_value (ecma_value_t value); ecma_object_t JERRY_ATTR_PURE *ecma_get_object_from_value (ecma_value_t value); ecma_extended_primitive_t JERRY_ATTR_PURE *ecma_get_extended_primitive_from_value (ecma_value_t value); @@ -290,24 +290,24 @@ void ecma_free_number (ecma_value_t value); lit_magic_string_id_t ecma_get_typeof_lit_id (ecma_value_t value); /* ecma-helpers-string.c */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_string_t *ecma_new_symbol_from_descriptor_string (ecma_value_t string_desc); bool ecma_prop_name_is_symbol (ecma_string_t *string_p); ecma_length_t ecma_op_advance_string_index (ecma_string_t *str_p, ecma_length_t index_num, bool is_unicode); -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_BUILTIN_MAP) || ENABLED (JERRY_BUILTIN_SET) +#endif /* JERRY_ESNEXT */ +#if JERRY_BUILTIN_MAP || JERRY_BUILTIN_SET ecma_string_t *ecma_new_map_key_string (ecma_value_t value); bool ecma_prop_name_is_map_key (ecma_string_t *string_p); -#endif /* ENABLED (JERRY_BUILTIN_MAP) || ENABLED (JERRY_BUILTIN_SET) */ +#endif /* JERRY_BUILTIN_MAP || JERRY_BUILTIN_SET */ ecma_string_t *ecma_new_ecma_string_from_utf8 (const lit_utf8_byte_t *string_p, lit_utf8_size_t string_size); ecma_string_t *ecma_new_ecma_string_from_utf8_converted_to_cesu8 (const lit_utf8_byte_t *string_p, lit_utf8_size_t string_size); ecma_string_t *ecma_new_ecma_external_string_from_cesu8 (const lit_utf8_byte_t *string_p, lit_utf8_size_t string_size, ecma_object_native_free_callback_t free_cb); ecma_string_t *ecma_new_ecma_string_from_code_unit (ecma_char_t code_unit); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_string_t *ecma_new_ecma_string_from_code_units (ecma_char_t first_code_unit, ecma_char_t second_code_unit); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_string_t *ecma_new_ecma_string_from_length (ecma_length_t index); ecma_string_t *ecma_new_ecma_string_from_uint32 (uint32_t uint32_number); ecma_string_t *ecma_new_non_direct_string_from_uint32 (uint32_t uint32_number); @@ -382,12 +382,12 @@ const lit_utf8_byte_t *ecma_string_trim_back (const lit_utf8_byte_t *start_p, co void ecma_string_trim_helper (const lit_utf8_byte_t **utf8_str_p, lit_utf8_size_t *utf8_str_size); ecma_string_t *ecma_string_trim (const ecma_string_t *string_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t ecma_string_pad (ecma_value_t original_string_p, ecma_value_t max_length, ecma_value_t fill_string, bool pad_on_start); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_stringbuilder_t ecma_stringbuilder_create (void); ecma_stringbuilder_t ecma_stringbuilder_create_from (ecma_string_t *string_p); @@ -441,9 +441,9 @@ void ecma_collection_destroy (ecma_collection_t *collection_p); void ecma_collection_free (ecma_collection_t *collection_p); void ecma_collection_free_if_not_object (ecma_collection_t *collection_p); void ecma_collection_free_objects (ecma_collection_t *collection_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT void ecma_collection_free_template_literal (ecma_collection_t *collection_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ bool ecma_collection_check_duplicated_entries (ecma_collection_t *collection_p); bool ecma_collection_has_string_value (ecma_collection_t *collection_p, ecma_string_t *string_p); @@ -498,19 +498,19 @@ void ecma_set_property_enumerable_attr (ecma_property_t *property_p, bool is_enu bool ecma_is_property_configurable (ecma_property_t property); void ecma_set_property_configurable_attr (ecma_property_t *property_p, bool is_configurable); -#if ENABLED (JERRY_LCACHE) +#if JERRY_LCACHE bool ecma_is_property_lcached (ecma_property_t *property_p); void ecma_set_property_lcached (ecma_property_t *property_p, bool is_lcached); -#endif /* ENABLED (JERRY_LCACHE) */ +#endif /* JERRY_LCACHE */ ecma_property_descriptor_t ecma_make_empty_property_descriptor (void); void ecma_free_property_descriptor (ecma_property_descriptor_t *prop_desc_p); void ecma_ref_extended_primitive (ecma_extended_primitive_t *primitve_p); void ecma_deref_error_reference (ecma_extended_primitive_t *error_ref_p); -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT void ecma_deref_bigint (ecma_extended_primitive_t *bigint_p); -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ ecma_value_t ecma_create_error_reference (ecma_value_t value, bool is_exception); ecma_value_t ecma_create_error_reference_from_context (void); @@ -520,11 +520,11 @@ void ecma_raise_error_from_error_reference (ecma_value_t value); void ecma_bytecode_ref (ecma_compiled_code_t *bytecode_p); void ecma_bytecode_deref (ecma_compiled_code_t *bytecode_p); ecma_value_t *ecma_compiled_code_resolve_arguments_start (const ecma_compiled_code_t *bytecode_header_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t *ecma_compiled_code_resolve_function_name (const ecma_compiled_code_t *bytecode_header_p); uint32_t ecma_compiled_code_resolve_extended_info (const ecma_compiled_code_t *bytecode_header_p); ecma_collection_t *ecma_compiled_code_get_tagged_template_collection (const ecma_compiled_code_t *bytecode_header_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t ecma_get_resource_name (const ecma_compiled_code_t *bytecode_p); #if (JERRY_STACK_LIMIT != 0) uintptr_t ecma_get_current_stack_usage (void); diff --git a/jerry-core/ecma/base/ecma-init-finalize.c b/jerry-core/ecma/base/ecma-init-finalize.c index a39fe655e..54175b8b7 100644 --- a/jerry-core/ecma/base/ecma-init-finalize.c +++ b/jerry-core/ecma/base/ecma-init-finalize.c @@ -46,23 +46,23 @@ ecma_init (void) ecma_init_global_environment (); -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP JERRY_CONTEXT (ecma_prop_hashmap_alloc_state) = ECMA_PROP_HASHMAP_ALLOC_ON; JERRY_CONTEXT (status_flags) &= (uint32_t) ~ECMA_STATUS_HIGH_PRESSURE_GC; -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ #if (JERRY_STACK_LIMIT != 0) volatile int sp; JERRY_CONTEXT (stack_base) = (uintptr_t) &sp; #endif /* (JERRY_STACK_LIMIT != 0) */ -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE ecma_job_queue_init (); -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_CONTEXT (current_new_target_p) = NULL; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* ecma_init */ /** @@ -71,9 +71,9 @@ ecma_init (void) void ecma_finalize (void) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_ASSERT (JERRY_CONTEXT (current_new_target_p) == NULL); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_finalize_global_environment (); uint8_t runs = 0; @@ -88,7 +88,7 @@ ecma_finalize (void) } while (JERRY_CONTEXT (ecma_gc_new_objects) != 0); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT jmem_cpointer_t *global_symbols_cp = JERRY_CONTEXT (global_symbols_cp); for (uint32_t i = 0; i < ECMA_BUILTIN_GLOBAL_SYMBOL_COUNT; i++) @@ -98,7 +98,7 @@ ecma_finalize (void) ecma_deref_ecma_string (ECMA_GET_NON_NULL_POINTER (ecma_string_t, global_symbols_cp[i])); } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_finalize_lit_storage (); } /* ecma_finalize */ diff --git a/jerry-core/ecma/base/ecma-lcache.c b/jerry-core/ecma/base/ecma-lcache.c index 75fa80633..e4e69eded 100644 --- a/jerry-core/ecma/base/ecma-lcache.c +++ b/jerry-core/ecma/base/ecma-lcache.c @@ -26,16 +26,16 @@ * @{ */ -#if ENABLED (JERRY_LCACHE) +#if JERRY_LCACHE /** * Bitshift index for calculating hash. */ -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT #define ECMA_LCACHE_HASH_BITSHIFT_INDEX (2 * JMEM_ALIGNMENT_LOG) -#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* !JERRY_CPOINTER_32_BIT */ #define ECMA_LCACHE_HASH_BITSHIFT_INDEX 0 -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ /** * Mask for hash bits @@ -213,7 +213,7 @@ ecma_lcache_invalidate (const ecma_object_t *object_p, /**< object */ } } /* ecma_lcache_invalidate */ -#endif /* ENABLED (JERRY_LCACHE) */ +#endif /* JERRY_LCACHE */ /** * @} diff --git a/jerry-core/ecma/base/ecma-lcache.h b/jerry-core/ecma/base/ecma-lcache.h index e4add397b..dbea603d8 100644 --- a/jerry-core/ecma/base/ecma-lcache.h +++ b/jerry-core/ecma/base/ecma-lcache.h @@ -23,12 +23,12 @@ * @{ */ -#if ENABLED (JERRY_LCACHE) +#if JERRY_LCACHE void ecma_lcache_insert (const ecma_object_t *object_p, const jmem_cpointer_t name_cp, ecma_property_t *prop_p); ecma_property_t *ecma_lcache_lookup (const ecma_object_t *object_p, const ecma_string_t *prop_name_p); void ecma_lcache_invalidate (const ecma_object_t *object_p, const jmem_cpointer_t name_cp, ecma_property_t *prop_p); -#endif /* ENABLED (JERRY_LCACHE) */ +#endif /* JERRY_LCACHE */ /** * @} diff --git a/jerry-core/ecma/base/ecma-literal-storage.c b/jerry-core/ecma/base/ecma-literal-storage.c index c47be6756..9ef723e0a 100644 --- a/jerry-core/ecma/base/ecma-literal-storage.c +++ b/jerry-core/ecma/base/ecma-literal-storage.c @@ -27,7 +27,7 @@ * @{ */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Free symbol list */ @@ -55,7 +55,7 @@ ecma_free_symbol_list (jmem_cpointer_t symbol_list_cp) /**< symbol list */ symbol_list_cp = next_item_cp; } } /* ecma_free_symbol_list */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Free string list @@ -110,7 +110,7 @@ ecma_free_number_list (jmem_cpointer_t number_list_cp) /**< number list */ } } /* ecma_free_number_list */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT /** * Free bigint list @@ -140,7 +140,7 @@ ecma_free_bigint_list (jmem_cpointer_t bigint_list_cp) /**< bigint list */ } } /* ecma_free_bigint_list */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ /** * Finalize literal storage @@ -148,14 +148,14 @@ ecma_free_bigint_list (jmem_cpointer_t bigint_list_cp) /**< bigint list */ void ecma_finalize_lit_storage (void) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_free_symbol_list (JERRY_CONTEXT (symbol_list_first_cp)); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_free_string_list (JERRY_CONTEXT (string_list_first_cp)); ecma_free_number_list (JERRY_CONTEXT (number_list_first_cp)); -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT ecma_free_bigint_list (JERRY_CONTEXT (bigint_list_first_cp)); -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ } /* ecma_finalize_lit_storage */ /** @@ -306,7 +306,7 @@ ecma_find_or_create_literal_number (ecma_number_t number_arg) /**< number to be return num; } /* ecma_find_or_create_literal_number */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT /** * Find or create a literal BigInt. @@ -381,7 +381,7 @@ ecma_find_or_create_literal_bigint (ecma_value_t bigint) /**< bigint to be searc return bigint; } /* ecma_find_or_create_literal_bigint */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ /** * Log2 of snapshot literal alignment. @@ -403,14 +403,14 @@ ecma_find_or_create_literal_bigint (ecma_value_t bigint) /**< bigint to be searc */ #define JERRY_SNAPSHOT_LITERAL_IS_NUMBER (1u << ECMA_VALUE_SHIFT) -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT /** * Literal value is BigInt. */ #define JERRY_SNAPSHOT_LITERAL_IS_BIGINT (2u << ECMA_VALUE_SHIFT) -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ -#if ENABLED (JERRY_SNAPSHOT_SAVE) +#if JERRY_SNAPSHOT_SAVE /** * Append the value at the end of the appropriate list if it is not present there. @@ -420,9 +420,9 @@ void ecma_save_literals_append_value (ecma_value_t value, /**< value to be appen { /* Unlike direct numbers, direct strings are converted to character literals. */ if (!ecma_is_value_string (value) -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT && (!ecma_is_value_bigint (value) || value == ECMA_BIGINT_ZERO) -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ && !ecma_is_value_float_number (value)) { return; @@ -558,7 +558,7 @@ ecma_save_literals_for_snapshot (ecma_collection_t *lit_pool_p, /**< list of kno { lit_table_size += (uint32_t) sizeof (ecma_number_t); } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT else if (ecma_is_value_bigint (lit_buffer_p[i])) { ecma_extended_primitive_t *bigint_p = ecma_get_extended_primitive_from_value (lit_buffer_p[i]); @@ -566,7 +566,7 @@ ecma_save_literals_for_snapshot (ecma_collection_t *lit_pool_p, /**< list of kno lit_table_size += (uint32_t) JERRY_ALIGNUP (sizeof (uint32_t) + ECMA_BIGINT_GET_SIZE (bigint_p), JERRY_SNAPSHOT_LITERAL_ALIGNMENT); } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ else { ecma_string_t *string_p = ecma_get_string_from_value (lit_buffer_p[i]); @@ -617,7 +617,7 @@ ecma_save_literals_for_snapshot (ecma_collection_t *lit_pool_p, /**< list of kno length = JERRY_ALIGNUP (sizeof (ecma_number_t), JERRY_SNAPSHOT_LITERAL_ALIGNMENT); } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT else if (ecma_is_value_bigint (lit_buffer_p[i])) { map_p->literal_offset |= JERRY_SNAPSHOT_LITERAL_IS_BIGINT; @@ -630,7 +630,7 @@ ecma_save_literals_for_snapshot (ecma_collection_t *lit_pool_p, /**< list of kno length = JERRY_ALIGNUP (sizeof (uint32_t) + size, JERRY_SNAPSHOT_LITERAL_ALIGNMENT); } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ else { ecma_string_t *string_p = ecma_get_string_from_value (lit_buffer_p[i]); @@ -654,9 +654,9 @@ ecma_save_literals_for_snapshot (ecma_collection_t *lit_pool_p, /**< list of kno return true; } /* ecma_save_literals_for_snapshot */ -#endif /* ENABLED (JERRY_SNAPSHOT_SAVE) */ +#endif /* JERRY_SNAPSHOT_SAVE */ -#if ENABLED (JERRY_SNAPSHOT_EXEC) || ENABLED (JERRY_SNAPSHOT_SAVE) +#if JERRY_SNAPSHOT_EXEC || JERRY_SNAPSHOT_SAVE /** * Get the compressed pointer of a given literal. @@ -678,7 +678,7 @@ ecma_snapshot_get_literal (const uint8_t *literal_base_p, /**< literal start */ return ecma_find_or_create_literal_number (num); } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (literal_value & JERRY_SNAPSHOT_LITERAL_IS_BIGINT) { uint32_t bigint_sign_and_size = *(uint32_t *) literal_p; @@ -698,7 +698,7 @@ ecma_snapshot_get_literal (const uint8_t *literal_base_p, /**< literal start */ memcpy (ECMA_BIGINT_GET_DIGITS (bigint_p, 0), literal_p + sizeof (uint32_t), size); return ecma_find_or_create_literal_bigint (ecma_make_extended_primitive_value (bigint_p, ECMA_TYPE_BIGINT)); } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ uint16_t length = *(const uint16_t *) literal_p; @@ -734,17 +734,17 @@ ecma_snapshot_resolve_serializable_values (ecma_compiled_code_t *compiled_code_p base_p -= argument_end; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* function name */ if (CBC_FUNCTION_GET_TYPE (compiled_code_p->status_flags) != CBC_FUNCTION_CONSTRUCTOR) { base_p--; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return base_p; } /* ecma_snapshot_resolve_serializable_values */ -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) || ENABLED (JERRY_SNAPSHOT_SAVE) */ +#endif /* JERRY_SNAPSHOT_EXEC || JERRY_SNAPSHOT_SAVE */ /** * @} diff --git a/jerry-core/ecma/base/ecma-literal-storage.h b/jerry-core/ecma/base/ecma-literal-storage.h index 2ecdcd57d..118231ea8 100644 --- a/jerry-core/ecma/base/ecma-literal-storage.h +++ b/jerry-core/ecma/base/ecma-literal-storage.h @@ -27,7 +27,7 @@ * @{ */ -#if ENABLED (JERRY_SNAPSHOT_SAVE) +#if JERRY_SNAPSHOT_SAVE /** * Snapshot literal - offset map */ @@ -36,31 +36,31 @@ typedef struct ecma_value_t literal_id; /**< literal id */ ecma_value_t literal_offset; /**< literal offset */ } lit_mem_to_snapshot_id_map_entry_t; -#endif /* ENABLED (JERRY_SNAPSHOT_SAVE) */ +#endif /* JERRY_SNAPSHOT_SAVE */ void ecma_finalize_lit_storage (void); ecma_value_t ecma_find_or_create_literal_string (const lit_utf8_byte_t *chars_p, lit_utf8_size_t size); ecma_value_t ecma_find_or_create_literal_number (ecma_number_t number_arg); -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT ecma_value_t ecma_find_or_create_literal_bigint (ecma_value_t bigint); -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ -#if ENABLED (JERRY_SNAPSHOT_SAVE) +#if JERRY_SNAPSHOT_SAVE void ecma_save_literals_append_value (ecma_value_t value, ecma_collection_t *lit_pool_p); void ecma_save_literals_add_compiled_code (const ecma_compiled_code_t *compiled_code_p, ecma_collection_t *lit_pool_p); bool ecma_save_literals_for_snapshot (ecma_collection_t *lit_pool_p, uint32_t *buffer_p, size_t buffer_size, size_t *in_out_buffer_offset_p, lit_mem_to_snapshot_id_map_entry_t **out_map_p, uint32_t *out_map_len_p); -#endif /* ENABLED (JERRY_SNAPSHOT_SAVE) */ +#endif /* JERRY_SNAPSHOT_SAVE */ -#if ENABLED (JERRY_SNAPSHOT_EXEC) || ENABLED (JERRY_SNAPSHOT_SAVE) +#if JERRY_SNAPSHOT_EXEC || JERRY_SNAPSHOT_SAVE ecma_value_t ecma_snapshot_get_literal (const uint8_t *literal_base_p, ecma_value_t literal_value); ecma_value_t * ecma_snapshot_resolve_serializable_values (ecma_compiled_code_t *compiled_code_p, uint8_t *byte_code_end_p); -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) || ENABLED (JERRY_SNAPSHOT_SAVE) */ +#endif /* JERRY_SNAPSHOT_EXEC || JERRY_SNAPSHOT_SAVE */ /** * @} diff --git a/jerry-core/ecma/base/ecma-module.c b/jerry-core/ecma/base/ecma-module.c index a1ce11455..31aaf50ae 100644 --- a/jerry-core/ecma/base/ecma-module.c +++ b/jerry-core/ecma/base/ecma-module.c @@ -27,7 +27,7 @@ #include "lit-char-helpers.h" #include "vm.h" -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM /** * Takes a ModuleSpecifier and applies path normalization to it. @@ -551,11 +551,11 @@ ecma_module_evaluate (ecma_module_t *module_p) /**< module */ return ECMA_VALUE_EMPTY; } -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_object_t *global_object_p = (ecma_object_t *) ecma_op_function_get_realm (module_p->compiled_code_p); -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ ecma_object_t *global_object_p = ecma_builtin_get_global (); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ module_p->state = ECMA_MODULE_STATE_EVALUATING; module_p->scope_p = ecma_create_decl_lex_env (ecma_get_global_environment (global_object_p)); @@ -771,12 +771,12 @@ ecma_module_connect_imports (ecma_module_t *module_p) ecma_value_t status = ecma_op_has_binding (lex_env_p, import_names_p->local_name_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (status)) { return status; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ if (ecma_is_value_true (status)) { @@ -1010,7 +1010,7 @@ ecma_module_parse (ecma_module_t *module_p) /**< module */ ecma_module_t *prev_module_p = JERRY_CONTEXT (module_current_p); JERRY_CONTEXT (module_current_p) = module_p; -#if ENABLED (JERRY_DEBUGGER) && ENABLED (JERRY_PARSER) +#if JERRY_DEBUGGER && JERRY_PARSER if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) { jerry_debugger_send_string (JERRY_DEBUGGER_SOURCE_CODE_NAME, @@ -1018,7 +1018,7 @@ ecma_module_parse (ecma_module_t *module_p) /**< module */ module_path_p, module_path_size - 1); } -#endif /* ENABLED (JERRY_DEBUGGER) && ENABLED (JERRY_PARSER) */ +#endif /* JERRY_DEBUGGER && JERRY_PARSER */ ecma_compiled_code_t *bytecode_p = parser_parse_script (NULL, 0, @@ -1156,4 +1156,4 @@ ecma_module_cleanup (ecma_module_t *head_p) /**< module */ head_p = next_p; } } /* ecma_module_cleanup */ -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ diff --git a/jerry-core/ecma/base/ecma-module.h b/jerry-core/ecma/base/ecma-module.h index 49df29a95..217997fda 100644 --- a/jerry-core/ecma/base/ecma-module.h +++ b/jerry-core/ecma/base/ecma-module.h @@ -19,7 +19,7 @@ #include "common.h" #include "ecma-globals.h" -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM #define ECMA_MODULE_MAX_PATH 255u @@ -131,6 +131,6 @@ void ecma_module_cleanup_context (void); void ecma_module_release_module_nodes (ecma_module_node_t *module_node_p); void ecma_module_cleanup (ecma_module_t *head_p); -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ #endif /* !ECMA_MODULE_H */ diff --git a/jerry-core/ecma/base/ecma-property-hashmap.c b/jerry-core/ecma/base/ecma-property-hashmap.c index 64c9b6d91..1e2e8eddb 100644 --- a/jerry-core/ecma/base/ecma-property-hashmap.c +++ b/jerry-core/ecma/base/ecma-property-hashmap.c @@ -26,7 +26,7 @@ * @{ */ -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP /** * Compute the total size of the property hashmap. @@ -528,7 +528,7 @@ ecma_property_hashmap_find (ecma_property_hashmap_t *hashmap_p, /**< hashmap */ #endif /* !JERRY_NDEBUG */ } } /* ecma_property_hashmap_find */ -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ /** * @} diff --git a/jerry-core/ecma/base/ecma-property-hashmap.h b/jerry-core/ecma/base/ecma-property-hashmap.h index 62b69445f..c6a8e4a56 100644 --- a/jerry-core/ecma/base/ecma-property-hashmap.h +++ b/jerry-core/ecma/base/ecma-property-hashmap.h @@ -53,7 +53,7 @@ typedef struct */ } ecma_property_hashmap_t; -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP /** * Simple ecma values @@ -74,7 +74,7 @@ ecma_property_hashmap_delete_status ecma_property_hashmap_delete (ecma_object_t ecma_property_t *ecma_property_hashmap_find (ecma_property_hashmap_t *hashmap_p, ecma_string_t *name_p, jmem_cpointer_t *property_real_name_cp); -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ /** * @} diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.c index 81b3643e6..30cbab597 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.c @@ -19,7 +19,7 @@ #include "ecma-typedarray-object.h" #include "ecma-arraybuffer-object.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -188,4 +188,4 @@ ecma_builtin_array_iterator_prototype_object_next (ecma_value_t this_val) /**< t * @} */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.inc.h index 09f47daac..b71ccb2d3 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-iterator-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_ARRAY_ITERATOR_UL, @@ -29,6 +29,6 @@ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_MAGIC_STRING_NEXT, ecma_builtin_array_iterator_prototype_object_next, 0, 0) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.c b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.c index ba2045257..ff99558ff 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.c @@ -16,7 +16,7 @@ #include "ecma-builtin-helpers.h" #include "ecma-builtins.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -25,4 +25,4 @@ #define BUILTIN_UNDERSCORED_ID array_prototype_unscopables #include "ecma-builtin-internal-routines-template.inc.h" -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.inc.h index 3765689b3..55594f784 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT SIMPLE_VALUE (LIT_MAGIC_STRING_COPY_WITHIN, ECMA_VALUE_TRUE, @@ -61,6 +61,6 @@ SIMPLE_VALUE (LIT_MAGIC_STRING_VALUES, ECMA_VALUE_TRUE, ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c index 22e3b7087..227f8cbf1 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c @@ -29,7 +29,7 @@ #include "lit-char-helpers.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_ARRAY) +#if JERRY_BUILTIN_ARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -46,9 +46,9 @@ enum { ECMA_ARRAY_PROTOTYPE_ROUTINE_START = 0, /* Note: these 2 routine ids must be in this order */ -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT ECMA_ARRAY_PROTOTYPE_TO_STRING, -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ ECMA_ARRAY_PROTOTYPE_SORT, ECMA_ARRAY_PROTOTYPE_CONCAT, ECMA_ARRAY_PROTOTYPE_TO_LOCALE_STRING, @@ -187,16 +187,16 @@ ecma_builtin_array_prototype_object_concat (const ecma_value_t args[], /**< argu ecma_object_t *obj_p) /**< array object */ { /* 2. */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_object_t *new_array_p = ecma_op_array_species_create (obj_p, 0); if (JERRY_UNLIKELY (new_array_p == NULL)) { return ECMA_VALUE_ERROR; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ ecma_object_t *new_array_p = ecma_op_new_array_object (0); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_length_t new_length = 0; @@ -459,7 +459,7 @@ ecma_builtin_array_prototype_object_push (const ecma_value_t *argument_list_p, / return ecma_make_uint32_value (new_length); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* 5. */ if ((ecma_number_t) (length + arguments_number) > ECMA_NUMBER_MAX_SAFE_INTEGER) { @@ -479,7 +479,7 @@ ecma_builtin_array_prototype_object_push (const ecma_value_t *argument_list_p, / } ecma_number_t n = (ecma_number_t) length; -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ ecma_number_t n = (ecma_number_t) length; /* 5. */ @@ -496,7 +496,7 @@ ecma_builtin_array_prototype_object_push (const ecma_value_t *argument_list_p, / } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* 6 - 7. */ ecma_value_t set_length_value = ecma_builtin_array_prototype_helper_set_length (obj_p, n); @@ -553,18 +553,18 @@ ecma_builtin_array_prototype_object_reverse (ecma_value_t this_arg, /**< this ar ecma_string_t *lower_str_p = ecma_new_ecma_string_from_length (lower); ecma_string_t *upper_str_p = ecma_new_ecma_string_from_length (upper); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t lower_value = ECMA_VALUE_EMPTY; ecma_value_t upper_value = ECMA_VALUE_EMPTY; ecma_value_t has_lower = ecma_op_object_has_property (obj_p, lower_str_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (has_lower)) { goto clean_up; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ bool lower_exist = ecma_is_value_true (has_lower); @@ -580,12 +580,12 @@ ecma_builtin_array_prototype_object_reverse (ecma_value_t this_arg, /**< this ar ecma_value_t has_upper = ecma_op_object_has_property (obj_p, upper_str_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (has_upper)) { goto clean_up; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ bool upper_exist = ecma_is_value_true (has_upper); @@ -598,7 +598,7 @@ ecma_builtin_array_prototype_object_reverse (ecma_value_t this_arg, /**< this ar goto clean_up; } } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ ecma_value_t lower_value = ecma_op_object_get (obj_p, lower_str_p); if (ECMA_IS_VALUE_ERROR (lower_value)) @@ -620,7 +620,7 @@ ecma_builtin_array_prototype_object_reverse (ecma_value_t this_arg, /**< this ar bool lower_exist = ecma_is_value_true (has_lower); bool upper_exist = ecma_is_value_true (has_upper); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (lower_exist && upper_exist) { @@ -843,7 +843,7 @@ ecma_builtin_array_prototype_object_slice (ecma_value_t arg1, /**< start */ bool use_fast_path = ecma_op_object_is_fast_array (obj_p); ecma_length_t copied_length = (end > start) ? end - start : 0; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_object_t *new_array_p = ecma_op_array_species_create (obj_p, copied_length); if (JERRY_UNLIKELY (new_array_p == NULL)) @@ -852,9 +852,9 @@ ecma_builtin_array_prototype_object_slice (ecma_value_t arg1, /**< start */ } use_fast_path &= ecma_op_object_is_fast_array (new_array_p); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ ecma_object_t *new_array_p = ecma_op_new_array_object (0); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (use_fast_path && copied_length > 0) { @@ -873,7 +873,7 @@ ecma_builtin_array_prototype_object_slice (ecma_value_t arg1, /**< start */ ecma_extended_object_t *ext_to_obj_p = (ecma_extended_object_t *) new_array_p; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint32_t target_length = ext_to_obj_p->u.array.length; ecma_value_t *to_buffer_p; JERRY_ASSERT (copied_length <= UINT32_MAX); @@ -891,9 +891,9 @@ ecma_builtin_array_prototype_object_slice (ecma_value_t arg1, /**< start */ ecma_delete_fast_array_properties (new_array_p, (uint32_t) copied_length); to_buffer_p = ECMA_GET_NON_NULL_POINTER (ecma_value_t, new_array_p->u1.property_list_cp); } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ ecma_value_t *to_buffer_p = ecma_fast_array_extend (new_array_p, copied_length); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t *from_buffer_p = ECMA_GET_NON_NULL_POINTER (ecma_value_t, obj_p->u1.property_list_cp); @@ -902,9 +902,9 @@ ecma_builtin_array_prototype_object_slice (ecma_value_t arg1, /**< start */ for (uint32_t k = (uint32_t) start; k < (uint32_t) end; k++, n++) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_free_value_if_not_object (to_buffer_p[n]); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ to_buffer_p[n] = ecma_copy_value_if_not_object (from_buffer_p[k]); } @@ -933,30 +933,30 @@ ecma_builtin_array_prototype_object_slice (ecma_value_t arg1, /**< start */ { /* 10.c.ii */ ecma_value_t put_comp; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const uint32_t prop_flags = ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE | ECMA_IS_THROW; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ const uint32_t prop_flags = ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ put_comp = ecma_builtin_helper_def_prop_by_index (new_array_p, n, get_value, prop_flags); ecma_free_value (get_value); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ECMA_IS_VALUE_ERROR (put_comp)) { ecma_deref_object (new_array_p); return put_comp; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_ASSERT (ecma_is_value_true (put_comp)); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t set_length_value = ecma_builtin_array_prototype_helper_set_length (new_array_p, ((ecma_number_t) n)); if (ECMA_IS_VALUE_ERROR (set_length_value)) @@ -964,7 +964,7 @@ ecma_builtin_array_prototype_object_slice (ecma_value_t arg1, /**< start */ ecma_deref_object (new_array_p); return set_length_value; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return ecma_make_object_value (new_array_p); } /* ecma_builtin_array_prototype_object_slice */ @@ -1291,7 +1291,7 @@ ecma_builtin_array_prototype_object_splice (const ecma_value_t args[], /**< argu ecma_length_t new_length = len + insert_count - actual_delete_count; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* ES11: 8. */ if ((ecma_number_t) new_length > ECMA_NUMBER_MAX_SAFE_INTEGER) { @@ -1305,10 +1305,10 @@ ecma_builtin_array_prototype_object_splice (const ecma_value_t args[], /**< argu { return ECMA_VALUE_ERROR; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ /* ES5.1: 2. */ ecma_object_t *new_array_p = ecma_op_new_array_object (actual_delete_count); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* ES5.1: 8, ES11: 10. */ ecma_length_t k = 0; @@ -1327,11 +1327,11 @@ ecma_builtin_array_prototype_object_splice (const ecma_value_t args[], /**< argu if (ecma_is_value_found (from_present)) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const uint32_t prop_flags = ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE | ECMA_IS_THROW; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ const uint32_t prop_flags = ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t put_comp = ecma_builtin_helper_def_prop_by_index (new_array_p, k, @@ -1339,19 +1339,19 @@ ecma_builtin_array_prototype_object_splice (const ecma_value_t args[], /**< argu prop_flags); ecma_free_value (from_present); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ECMA_IS_VALUE_ERROR (put_comp)) { ecma_deref_object (new_array_p); return put_comp; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_ASSERT (ecma_is_value_true (put_comp)); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* ES11: 12. */ ecma_value_t set_length = ecma_builtin_array_prototype_helper_set_length (new_array_p, ((ecma_number_t) actual_delete_count)); @@ -1361,7 +1361,7 @@ ecma_builtin_array_prototype_object_splice (const ecma_value_t args[], /**< argu ecma_deref_object (new_array_p); return set_length; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* ES5.1: 12, ES11: 15. */ if (insert_count < actual_delete_count) @@ -1531,20 +1531,20 @@ ecma_builtin_array_prototype_object_unshift (const ecma_value_t args[], /**< arg } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const bool should_iterate = args_number > 0; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ const bool should_iterate = true; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (should_iterate) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* ES11:4.a. */ if ((ecma_number_t) (len + args_number) > ECMA_NUMBER_MAX_SAFE_INTEGER) { return ecma_raise_type_error (ECMA_ERR_MSG ("Unshift elements over 2**53-1 length is disallowed")); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* ES5.1:5.,6. ES11: 4.b, 4.c */ for (ecma_length_t k = len; k > 0; k--) @@ -1936,16 +1936,16 @@ ecma_builtin_array_prototype_object_map (ecma_value_t arg1, /**< callbackfn */ } /* 6. */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_object_t *new_array_p = ecma_op_array_species_create (obj_p, len); if (JERRY_UNLIKELY (new_array_p == NULL)) { return ECMA_VALUE_ERROR; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ ecma_object_t *new_array_p = ecma_op_new_array_object (len); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ JERRY_ASSERT (ecma_is_value_object (arg1)); ecma_object_t *func_object_p = ecma_get_object_from_value (arg1); @@ -1981,11 +1981,11 @@ ecma_builtin_array_prototype_object_map (ecma_value_t arg1, /**< callbackfn */ /* 8.c.iii */ ecma_value_t put_comp; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const uint32_t prop_flags = ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE | ECMA_IS_THROW; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ const uint32_t prop_flags = ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ put_comp = ecma_builtin_helper_def_prop_by_index (new_array_p, index, mapped_value, @@ -1993,15 +1993,15 @@ ecma_builtin_array_prototype_object_map (ecma_value_t arg1, /**< callbackfn */ ecma_free_value (mapped_value); ecma_free_value (current_value); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ECMA_IS_VALUE_ERROR (put_comp)) { ecma_deref_object (new_array_p); return put_comp; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_ASSERT (ecma_is_value_true (put_comp)); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } } @@ -2030,7 +2030,7 @@ ecma_builtin_array_prototype_object_filter (ecma_value_t arg1, /**< callbackfn * } /* 6. */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_object_t *new_array_p = ecma_op_array_species_create (obj_p, 0); if (JERRY_UNLIKELY (new_array_p == NULL)) @@ -2040,12 +2040,12 @@ ecma_builtin_array_prototype_object_filter (ecma_value_t arg1, /**< callbackfn * /* ES11: 22.1.3.7. 7.c.iii.1 */ const uint32_t prop_flags = ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE | ECMA_IS_THROW; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ ecma_object_t *new_array_p = ecma_op_new_array_object (0); /* ES5.1: 15.4.4.20. 9.c.iii.1 */ const uint32_t prop_flags = ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* We already checked that arg1 is callable, so it will always be an object. */ JERRY_ASSERT (ecma_is_value_object (arg1)); @@ -2091,7 +2091,7 @@ ecma_builtin_array_prototype_object_filter (ecma_value_t arg1, /**< callbackfn * new_array_index, get_value, prop_flags); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ECMA_IS_VALUE_ERROR (put_comp)) { ecma_free_value (call_value); @@ -2100,9 +2100,9 @@ ecma_builtin_array_prototype_object_filter (ecma_value_t arg1, /**< callbackfn * return put_comp; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_ASSERT (ecma_is_value_true (put_comp)); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ new_array_index++; } @@ -2238,7 +2238,7 @@ ecma_builtin_array_reduce_from (const ecma_value_t args_p[], /**< routine's argu return accumulator; } /* ecma_builtin_array_reduce_from */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * The Array.prototype object's 'fill' routine @@ -2864,7 +2864,7 @@ ecma_builtin_array_prototype_object_flat_map (ecma_value_t callback, /**< callba /* 6. */ return ecma_make_object_value (new_array_p); } /* ecma_builtin_array_prototype_object_flat_map */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Dispatcher of the built-in's routines @@ -2892,12 +2892,12 @@ ecma_builtin_array_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< { ecma_value_t ret_value = ECMA_VALUE_EMPTY; -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT if (builtin_routine_id == ECMA_ARRAY_PROTOTYPE_TO_STRING) { ret_value = ecma_array_object_to_string (obj_this); } -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ if (builtin_routine_id == ECMA_ARRAY_PROTOTYPE_SORT) { ret_value = ecma_builtin_array_prototype_object_sort (this_arg, @@ -2916,7 +2916,7 @@ ecma_builtin_array_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< return ret_value; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (builtin_routine_id >= ECMA_ARRAY_PROTOTYPE_ENTRIES && builtin_routine_id <= ECMA_ARRAY_PROTOTYPE_KEYS)) { @@ -2935,7 +2935,7 @@ ecma_builtin_array_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< ecma_deref_object (obj_p); return ret_value; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_length_t length; ecma_value_t len_value = ecma_op_object_get_length (obj_p, &length); @@ -3054,7 +3054,7 @@ ecma_builtin_array_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< length); break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case ECMA_ARRAY_PROTOTYPE_COPY_WITHIN: { ret_value = ecma_builtin_array_prototype_object_copy_within (arguments_list_p, @@ -3106,7 +3106,7 @@ ecma_builtin_array_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< length); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { JERRY_ASSERT (builtin_routine_id == ECMA_ARRAY_PROTOTYPE_FILTER); @@ -3131,4 +3131,4 @@ ecma_builtin_array_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< * @} */ -#endif /* ENABLED (JERRY_BUILTIN_ARRAY) */ +#endif /* JERRY_BUILTIN_ARRAY */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.inc.h index 416697cbc..82b6a74b4 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_ARRAY) +#if JERRY_BUILTIN_ARRAY /* Object properties: * (property name, object pointer getter) */ @@ -29,12 +29,12 @@ OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_ARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* ECMA-262 v6, 22.1.3.31 */ OBJECT_VALUE (LIT_GLOBAL_SYMBOL_UNSCOPABLES, ECMA_BUILTIN_ID_ARRAY_PROTOTYPE_UNSCOPABLES, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* Number properties: * (property name, object pointer getter) */ @@ -47,9 +47,9 @@ NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_MAGIC_STRING_TO_LOCALE_STRING_UL, ECMA_ARRAY_PROTOTYPE_TO_LOCALE_STRING, 0, 0) -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT ROUTINE (LIT_MAGIC_STRING_TO_STRING_UL, ECMA_ARRAY_PROTOTYPE_TO_STRING, 0, 0) -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ ROUTINE (LIT_MAGIC_STRING_CONCAT, ECMA_ARRAY_PROTOTYPE_CONCAT, NON_FIXED, 1) ROUTINE (LIT_MAGIC_STRING_JOIN, ECMA_ARRAY_PROTOTYPE_JOIN, 1, 1) ROUTINE (LIT_MAGIC_STRING_POP, ECMA_ARRAY_PROTOTYPE_POP, 0, 0) @@ -71,7 +71,7 @@ ROUTINE (LIT_MAGIC_STRING_FILTER, ECMA_ARRAY_PROTOTYPE_FILTER, 2, 1) /* Note these 2 routines must be in this order */ ROUTINE (LIT_MAGIC_STRING_REDUCE, ECMA_ARRAY_PROTOTYPE_REDUCE, 2, 1) ROUTINE (LIT_MAGIC_STRING_REDUCE_RIGHT_UL, ECMA_ARRAY_PROTOTYPE_REDUCE_RIGHT, 2, 1) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ROUTINE (LIT_MAGIC_STRING_FIND, ECMA_ARRAY_PROTOTYPE_FIND, 2, 1) ROUTINE (LIT_MAGIC_STRING_FIND_INDEX, ECMA_ARRAY_PROTOTYPE_FIND_INDEX, 2, 1) ROUTINE (LIT_MAGIC_STRING_FILL, ECMA_ARRAY_PROTOTYPE_FILL, 3, 1) @@ -87,8 +87,8 @@ INTRINSIC_PROPERTY (LIT_MAGIC_STRING_VALUES, LIT_INTERNAL_MAGIC_STRING_ARRAY_PRO ECMA_PROPERTY_CONFIGURABLE_WRITABLE) INTRINSIC_PROPERTY (LIT_GLOBAL_SYMBOL_ITERATOR, LIT_INTERNAL_MAGIC_STRING_ARRAY_PROTOTYPE_VALUES, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#endif /* ENABLED (JERRY_BUILTIN_ARRAY) */ +#endif /* JERRY_BUILTIN_ARRAY */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array.c b/jerry-core/ecma/builtin-objects/ecma-builtin-array.c index e9deae663..31079befb 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array.c @@ -28,7 +28,7 @@ #include "jcontext.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_ARRAY) +#if JERRY_BUILTIN_ARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -45,11 +45,11 @@ enum { ECMA_ARRAY_ROUTINE_START = 0, ECMA_ARRAY_ROUTINE_IS_ARRAY, -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ECMA_ARRAY_ROUTINE_FROM, ECMA_ARRAY_ROUTINE_OF, ECMA_ARRAY_ROUTINE_SPECIES_GET -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-array.inc.h" @@ -66,7 +66,7 @@ enum * @{ */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * The Array object's 'from' routine * @@ -468,7 +468,7 @@ ecma_builtin_array_object_of (ecma_value_t this_arg, /**< 'this' argument */ return ecma_make_object_value (obj_p); } /* ecma_builtin_array_object_of */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Handle calling [[Call]] of built-in Array object @@ -511,9 +511,9 @@ ecma_builtin_array_dispatch_construct (const ecma_value_t *arguments_list_p, /** { JERRY_ASSERT (arguments_list_len == 0 || arguments_list_p != NULL); -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT return ecma_builtin_array_dispatch_call (arguments_list_p, arguments_list_len); -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), ECMA_BUILTIN_ID_ARRAY_PROTOTYPE); @@ -534,7 +534,7 @@ ecma_builtin_array_dispatch_construct (const ecma_value_t *arguments_list_p, /** ECMA_SET_NON_NULL_POINTER (object_p->u2.prototype_cp, proto_p); ecma_deref_object (proto_p); return result; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* ecma_builtin_array_dispatch_construct */ /** @@ -558,7 +558,7 @@ ecma_builtin_array_dispatch_routine (uint8_t builtin_routine_id, /**< built-in w return arguments_number > 0 ? ecma_is_value_array (arguments_list_p[0]) : ECMA_VALUE_FALSE; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case ECMA_ARRAY_ROUTINE_FROM: { return ecma_builtin_array_object_from (this_arg, arguments_list_p, arguments_number); @@ -571,7 +571,7 @@ ecma_builtin_array_dispatch_routine (uint8_t builtin_routine_id, /**< built-in w { return ecma_copy_value (this_arg); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { JERRY_UNREACHABLE (); @@ -585,4 +585,4 @@ ecma_builtin_array_dispatch_routine (uint8_t builtin_routine_id, /**< built-in w * @} */ -#endif /* ENABLED (JERRY_BUILTIN_ARRAY) */ +#endif /* JERRY_BUILTIN_ARRAY */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-array.inc.h index 1ddcd6632..5a031fab1 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_ARRAY) +#if JERRY_BUILTIN_ARRAY /* Object properties: * (property name, object pointer getter) */ @@ -36,16 +36,16 @@ NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_ARRAY_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_MAGIC_STRING_IS_ARRAY_UL, ECMA_ARRAY_ROUTINE_IS_ARRAY, 1, 1) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ROUTINE (LIT_MAGIC_STRING_FROM, ECMA_ARRAY_ROUTINE_FROM, NON_FIXED, 1) ROUTINE (LIT_MAGIC_STRING_OF, ECMA_ARRAY_ROUTINE_OF, NON_FIXED, 0) @@ -53,8 +53,8 @@ ROUTINE (LIT_MAGIC_STRING_OF, ECMA_ARRAY_ROUTINE_OF, NON_FIXED, 0) ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ECMA_ARRAY_ROUTINE_SPECIES_GET, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#endif /* !(ENABLED (JERRY_BUILTIN_ARRAY)) */ +#endif /* !(JERRY_BUILTIN_ARRAY) */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c index 760fdcea7..3b58de732 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c @@ -26,7 +26,7 @@ #include "jrt.h" #include "jrt-libc-includes.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -233,4 +233,4 @@ free_new_arraybuffer: * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.inc.h index 0cd59f17e..6d77ed25b 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY /* Object properties: * (property name, object pointer getter) */ @@ -42,6 +42,6 @@ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_MAGIC_STRING_SLICE, ecma_builtin_arraybuffer_prototype_object_slice, NON_FIXED, 2) -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c index 9dc0a8e9e..0cc315f51 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c @@ -23,7 +23,7 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -110,4 +110,4 @@ ecma_builtin_arraybuffer_species_get (ecma_value_t this_value) /**< This Value * * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.inc.h index 3cfaba7b6..0c05b869f 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -50,6 +50,6 @@ ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ecma_builtin_arraybuffer_species_get, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-function-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-async-function-prototype.c index 6076eb28b..68f2a0129 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-function-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-function-prototype.c @@ -15,7 +15,7 @@ #include "ecma-globals.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -40,4 +40,4 @@ * @} */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-function-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-async-function-prototype.inc.h index 6dfde9efa..5ff638c76 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-function-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-function-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* ECMA-262 v11, 25.7.3.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, @@ -31,6 +31,6 @@ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_ASYNC_FUNCTION_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-function.c b/jerry-core/ecma/builtin-objects/ecma-builtin-async-function.c index 3ca718218..bb26e4e32 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-function.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-function.c @@ -15,7 +15,7 @@ #include "ecma-globals.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -71,4 +71,4 @@ ecma_builtin_async_function_dispatch_construct (const ecma_value_t *arguments_li * @} */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-function.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-async-function.inc.h index 12f3c5e87..e304ff17c 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-function.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-function.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* ECMA-262 v11, 25.7.2 */ STRING_VALUE (LIT_MAGIC_STRING_NAME, @@ -41,6 +41,6 @@ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_ASYNC_FUNCTION_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-function.c b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-function.c index 7476bf345..26091097e 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-function.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-function.c @@ -15,7 +15,7 @@ #include "ecma-globals.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -71,4 +71,4 @@ ecma_builtin_async_generator_function_dispatch_construct (const ecma_value_t *ar * @} */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-function.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-function.inc.h index 339a9dc10..acafd42b6 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-function.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-function.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* ECMA-262 v10, 25.3.2 */ STRING_VALUE (LIT_MAGIC_STRING_NAME, @@ -36,6 +36,6 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_ASYNC_GENERATOR, ECMA_PROPERTY_FIXED) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-prototype.c index c866f6f42..ac5d1a98c 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-prototype.c @@ -25,7 +25,7 @@ #include "opcodes.h" #include "vm-defines.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -144,4 +144,4 @@ ecma_builtin_async_generator_prototype_dispatch_routine (uint8_t builtin_routine * @} */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-prototype.inc.h index b28c40283..f96a2e26f 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* Object properties: * (property name, object pointer getter) */ @@ -40,6 +40,6 @@ ROUTINE (LIT_MAGIC_STRING_NEXT, ECMA_ASYNC_GENERATOR_PROTOTYPE_ROUTINE_NEXT, 1, ROUTINE (LIT_MAGIC_STRING_RETURN, ECMA_ASYNC_GENERATOR_PROTOTYPE_ROUTINE_RETURN, 1, 1) ROUTINE (LIT_MAGIC_STRING_THROW, ECMA_ASYNC_GENERATOR_PROTOTYPE_ROUTINE_THROW, 1, 1) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator.c b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator.c index 2778e2dfc..51e095d59 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator.c @@ -15,7 +15,7 @@ #include "ecma-globals.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -40,4 +40,4 @@ * @} */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator.inc.h index 911e61940..0b6162d56 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-generator.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* ECMA-262 v6, 25.3.2.3.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, @@ -36,6 +36,6 @@ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_ASYNC_GENERATOR_FUNCTION_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-async-iterator-prototype.c index 8d64b81d1..88205bd51 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-iterator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-iterator-prototype.c @@ -17,7 +17,7 @@ #include "ecma-builtins.h" #include "ecma-iterator-object.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -60,4 +60,4 @@ ecma_builtin_async_iterator_prototype_object_async_iterator (ecma_value_t this_v * @} */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-async-iterator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-async-iterator-prototype.inc.h index 5a49127c7..8aae8579b 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-async-iterator-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-async-iterator-prototype.inc.h @@ -19,12 +19,12 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_GLOBAL_SYMBOL_ASYNC_ITERATOR, ecma_builtin_async_iterator_prototype_object_async_iterator, 0, 0) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-bigint-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-bigint-prototype.c index 020454917..788f257f5 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-bigint-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-bigint-prototype.c @@ -16,7 +16,7 @@ #include "ecma-bigint.h" #include "ecma-exceptions.h" -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -131,4 +131,4 @@ ecma_builtin_bigint_prototype_object_to_string (ecma_value_t this_arg, /**< this * @} */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-bigint-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-bigint-prototype.inc.h index dd253bb3b..bd04dd704 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-bigint-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-bigint-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT /* Object properties: * (property name, object pointer getter) */ @@ -39,6 +39,6 @@ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, ROUTINE (LIT_MAGIC_STRING_VALUE_OF_UL, ecma_builtin_bigint_prototype_object_value_of, 0, 0) ROUTINE (LIT_MAGIC_STRING_TO_STRING_UL, ecma_builtin_bigint_prototype_object_to_string, NON_FIXED, 0) -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-bigint.c b/jerry-core/ecma/builtin-objects/ecma-builtin-bigint.c index fd622e444..08f0dacbe 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-bigint.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-bigint.c @@ -17,7 +17,7 @@ #include "ecma-builtins.h" #include "ecma-exceptions.h" -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -77,4 +77,4 @@ ecma_builtin_bigint_dispatch_construct (const ecma_value_t *arguments_list_p, /* * @} */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-bigint.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-bigint.inc.h index c851c5cc0..a19f9acd7 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-bigint.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-bigint.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -42,6 +42,6 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_BIGINT_PROTOTYPE, ECMA_PROPERTY_FIXED) -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.c index e220f1d24..eef7c5847 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.c @@ -24,7 +24,7 @@ #include "ecma-string-object.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_BOOLEAN) +#if JERRY_BUILTIN_BOOLEAN #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -137,4 +137,4 @@ ecma_builtin_boolean_prototype_dispatch_routine (uint8_t builtin_routine_id, /** * @} */ -#endif /* ENABLED (JERRY_BUILTIN_BOOLEAN) */ +#endif /* JERRY_BUILTIN_BOOLEAN */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.inc.h index c02b63e09..d9dba92b9 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_BOOLEAN) +#if JERRY_BUILTIN_BOOLEAN /* Object properties: * (property name, object pointer getter) */ @@ -34,6 +34,6 @@ OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ROUTINE (LIT_MAGIC_STRING_TO_STRING_UL, ECMA_BOOLEAN_PROTOTYPE_ROUTINE_TO_STRING, 0, 0) ROUTINE (LIT_MAGIC_STRING_VALUE_OF_UL, ECMA_BOOLEAN_PROTOTYPE_ROUTINE_VALUE_OF, 0, 0) -#endif /* ENABLED (JERRY_BUILTIN_BOOLEAN) */ +#endif /* JERRY_BUILTIN_BOOLEAN */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.c b/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.c index 388f145f7..3883317a0 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.c @@ -24,7 +24,7 @@ #include "ecma-objects.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_BOOLEAN) +#if JERRY_BUILTIN_BOOLEAN #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -95,4 +95,4 @@ ecma_builtin_boolean_dispatch_construct (const ecma_value_t *arguments_list_p, / * @} */ -#endif /* ENABLED (JERRY_BUILTIN_BOOLEAN) */ +#endif /* JERRY_BUILTIN_BOOLEAN */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.inc.h index b94956a13..b52478aaa 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_BOOLEAN) +#if JERRY_BUILTIN_BOOLEAN /* Object properties: * (property name, object pointer getter) */ @@ -36,12 +36,12 @@ NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_BOOLEAN_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#endif /* ENABLED (JERRY_BUILTIN_BOOLEAN) */ +#endif /* JERRY_BUILTIN_BOOLEAN */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.c index cafbc3fb1..a56901981 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.c @@ -18,11 +18,11 @@ #include "ecma-dataview-object.h" #include "ecma-gc.h" -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW -#if !ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if !JERRY_BUILTIN_TYPEDARRAY #error "DataView builtin requires ES2015 TypedArray builtin" -#endif /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* !JERRY_BUILTIN_TYPEDARRAY */ #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -49,13 +49,13 @@ enum ECMA_DATAVIEW_PROTOTYPE_GET_INT32, ECMA_DATAVIEW_PROTOTYPE_GET_UINT32, ECMA_DATAVIEW_PROTOTYPE_GET_FLOAT32, -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 ECMA_DATAVIEW_PROTOTYPE_GET_FLOAT64, -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ +#if JERRY_BUILTIN_BIGINT ECMA_DATAVIEW_PROTOTYPE_GET_BIGINT64, ECMA_DATAVIEW_PROTOTYPE_GET_BIGUINT64, -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ ECMA_DATAVIEW_PROTOTYPE_SET_INT8, ECMA_DATAVIEW_PROTOTYPE_SET_UINT8, ECMA_DATAVIEW_PROTOTYPE_SET_UINT8_CLAMPED, /* unused value */ @@ -64,13 +64,13 @@ enum ECMA_DATAVIEW_PROTOTYPE_SET_INT32, ECMA_DATAVIEW_PROTOTYPE_SET_UINT32, ECMA_DATAVIEW_PROTOTYPE_SET_FLOAT32, -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 ECMA_DATAVIEW_PROTOTYPE_SET_FLOAT64, -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ +#if JERRY_BUILTIN_BIGINT ECMA_DATAVIEW_PROTOTYPE_SET_BIGINT64, ECMA_DATAVIEW_PROTOTYPE_SET_BIGUINT64, -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-dataview-prototype.inc.h" @@ -163,17 +163,17 @@ ecma_builtin_dataview_prototype_dispatch_routine (uint8_t builtin_routine_id, /* return ecma_builtin_dataview_prototype_object_getters (this_arg, builtin_routine_id); } case ECMA_DATAVIEW_PROTOTYPE_GET_FLOAT32: -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 case ECMA_DATAVIEW_PROTOTYPE_GET_FLOAT64: -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ case ECMA_DATAVIEW_PROTOTYPE_GET_INT16: case ECMA_DATAVIEW_PROTOTYPE_GET_INT32: case ECMA_DATAVIEW_PROTOTYPE_GET_UINT16: case ECMA_DATAVIEW_PROTOTYPE_GET_UINT32: -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT case ECMA_DATAVIEW_PROTOTYPE_GET_BIGINT64: case ECMA_DATAVIEW_PROTOTYPE_GET_BIGUINT64: -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ { ecma_value_t little_endian = arguments_number > 1 ? arguments_list_p[1] : ECMA_VALUE_FALSE; ecma_typedarray_type_t id = (ecma_typedarray_type_t) (builtin_routine_id - ECMA_DATAVIEW_PROTOTYPE_GET_INT8); @@ -181,17 +181,17 @@ ecma_builtin_dataview_prototype_dispatch_routine (uint8_t builtin_routine_id, /* return ecma_op_dataview_get_set_view_value (this_arg, byte_offset, little_endian, ECMA_VALUE_EMPTY, id); } case ECMA_DATAVIEW_PROTOTYPE_SET_FLOAT32: -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 case ECMA_DATAVIEW_PROTOTYPE_SET_FLOAT64: -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ case ECMA_DATAVIEW_PROTOTYPE_SET_INT16: case ECMA_DATAVIEW_PROTOTYPE_SET_INT32: case ECMA_DATAVIEW_PROTOTYPE_SET_UINT16: case ECMA_DATAVIEW_PROTOTYPE_SET_UINT32: -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT case ECMA_DATAVIEW_PROTOTYPE_SET_BIGINT64: case ECMA_DATAVIEW_PROTOTYPE_SET_BIGUINT64: -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ { ecma_value_t value_to_set = arguments_number > 1 ? arguments_list_p[1] : ECMA_VALUE_UNDEFINED; ecma_value_t little_endian = arguments_number > 2 ? arguments_list_p[2] : ECMA_VALUE_FALSE; @@ -224,4 +224,4 @@ ecma_builtin_dataview_prototype_dispatch_routine (uint8_t builtin_routine_id, /* * @} */ -#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW */ +#endif /* JERRY_BUILTIN_DATAVIEW */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.inc.h index 4facc4744..2f2e245fb 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW /* Object properties: * (property name, object pointer getter) */ @@ -37,9 +37,9 @@ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_MAGIC_STRING_GET_FLOAT_32_UL, ECMA_DATAVIEW_PROTOTYPE_GET_FLOAT32, 2, 1) -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 ROUTINE (LIT_MAGIC_STRING_GET_FLOAT_64_UL, ECMA_DATAVIEW_PROTOTYPE_GET_FLOAT64, 2, 1) -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ ROUTINE (LIT_MAGIC_STRING_GET_INT8_UL, ECMA_DATAVIEW_PROTOTYPE_GET_INT8, 1, 1) ROUTINE (LIT_MAGIC_STRING_GET_INT16_UL, ECMA_DATAVIEW_PROTOTYPE_GET_INT16, 2, 1) ROUTINE (LIT_MAGIC_STRING_GET_INT32_UL, ECMA_DATAVIEW_PROTOTYPE_GET_INT32, 2, 1) @@ -47,21 +47,21 @@ ROUTINE (LIT_MAGIC_STRING_GET_UINT8_UL, ECMA_DATAVIEW_PROTOTYPE_GET_UINT8, 2, 1) ROUTINE (LIT_MAGIC_STRING_GET_UINT16_UL, ECMA_DATAVIEW_PROTOTYPE_GET_UINT16, 2, 1) ROUTINE (LIT_MAGIC_STRING_GET_UINT32_UL, ECMA_DATAVIEW_PROTOTYPE_GET_UINT32, 2, 1) ROUTINE (LIT_MAGIC_STRING_SET_FLOAT_32_UL, ECMA_DATAVIEW_PROTOTYPE_SET_FLOAT32, 2, 2) -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 ROUTINE (LIT_MAGIC_STRING_SET_FLOAT_64_UL, ECMA_DATAVIEW_PROTOTYPE_SET_FLOAT64, 2, 2) -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ ROUTINE (LIT_MAGIC_STRING_SET_INT8_UL, ECMA_DATAVIEW_PROTOTYPE_SET_INT8, 1, 2) ROUTINE (LIT_MAGIC_STRING_SET_INT16_UL, ECMA_DATAVIEW_PROTOTYPE_SET_INT16, 2, 2) ROUTINE (LIT_MAGIC_STRING_SET_INT32_UL, ECMA_DATAVIEW_PROTOTYPE_SET_INT32, 2, 2) ROUTINE (LIT_MAGIC_STRING_SET_UINT8_UL, ECMA_DATAVIEW_PROTOTYPE_SET_UINT8, 2, 2) ROUTINE (LIT_MAGIC_STRING_SET_UINT16_UL, ECMA_DATAVIEW_PROTOTYPE_SET_UINT16, 2, 2) ROUTINE (LIT_MAGIC_STRING_SET_UINT32_UL, ECMA_DATAVIEW_PROTOTYPE_SET_UINT32, 2, 2) -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT ROUTINE (LIT_MAGIC_STRING_GET_BIGINT64, ECMA_DATAVIEW_PROTOTYPE_GET_BIGINT64, 2, 1) ROUTINE (LIT_MAGIC_STRING_GET_BIGUINT64, ECMA_DATAVIEW_PROTOTYPE_GET_BIGUINT64, 2, 1) ROUTINE (LIT_MAGIC_STRING_SET_BIGINT64, ECMA_DATAVIEW_PROTOTYPE_SET_BIGINT64, 2, 2) ROUTINE (LIT_MAGIC_STRING_SET_BIGUINT64, ECMA_DATAVIEW_PROTOTYPE_SET_BIGUINT64, 2, 2) -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ /* ECMA-262 v6, 24.2.4.1 */ ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_BUFFER, @@ -78,6 +78,6 @@ ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_BYTE_OFFSET_UL, ECMA_DATAVIEW_PROTOTYPE_BYTE_OFFSET_GETTER, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW */ +#endif /* JERRY_BUILTIN_DATAVIEW */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.c b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.c index cd4b518f1..94d737840 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.c @@ -17,7 +17,7 @@ #include "ecma-exceptions.h" #include "ecma-dataview-object.h" -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -68,4 +68,4 @@ ecma_builtin_dataview_dispatch_construct (const ecma_value_t *arguments_list_p, * @} */ -#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW */ +#endif /* JERRY_BUILTIN_DATAVIEW */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.inc.h index 0958a4e01..009cca18f 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-dataview.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -42,6 +42,6 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_DATAVIEW_PROTOTYPE, ECMA_PROPERTY_FIXED) -#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW */ +#endif /* JERRY_BUILTIN_DATAVIEW */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.c index 1a41ad83e..ff99e52ed 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.c @@ -25,7 +25,7 @@ #include "ecma-objects.h" #include "ecma-objects-general.h" -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -50,10 +50,10 @@ enum ECMA_DATE_PROTOTYPE_GET_FULL_YEAR, /* ECMA-262 v5 15.9.5.10 */ ECMA_DATE_PROTOTYPE_GET_UTC_FULL_YEAR, /* ECMA-262 v5 15.9.5.11 */ -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB ECMA_DATE_PROTOTYPE_GET_YEAR, /* ECMA-262 v5, AnnexB.B.2.4 */ ECMA_DATE_PROTOTYPE_GET_UTC_YEAR, /* has no UTC variant */ -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ +#endif /* JERRY_BUILTIN_ANNEXB */ ECMA_DATE_PROTOTYPE_GET_MONTH, /* ECMA-262 v5 15.9.5.12 */ ECMA_DATE_PROTOTYPE_GET_UTC_MONTH, /* ECMA-262 v5 15.9.5.13 */ ECMA_DATE_PROTOTYPE_GET_DATE, /* ECMA-262 v5 15.9.5.14 */ @@ -73,10 +73,10 @@ enum ECMA_DATE_PROTOTYPE_SET_FULL_YEAR, /* ECMA-262 v5, 15.9.5.40 */ ECMA_DATE_PROTOTYPE_SET_UTC_FULL_YEAR, /* ECMA-262 v5, 15.9.5.41 */ -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB ECMA_DATE_PROTOTYPE_SET_YEAR, /* ECMA-262 v5, ECMA-262 v5, AnnexB.B.2.5 */ ECMA_DATE_PROTOTYPE_SET_UTC_YEAR, /* has no UTC variant */ -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ +#endif /* JERRY_BUILTIN_ANNEXB */ ECMA_DATE_PROTOTYPE_SET_MONTH, /* ECMA-262 v5, 15.9.5.38 */ ECMA_DATE_PROTOTYPE_SET_UTC_MONTH, /* ECMA-262 v5, 15.9.5.39 */ ECMA_DATE_PROTOTYPE_SET_DATE, /* ECMA-262 v5, 15.9.5.36 */ @@ -92,9 +92,9 @@ enum ECMA_DATE_PROTOTYPE_TO_STRING, /* ECMA-262 v5, 15.9.5.2 */ ECMA_DATE_PROTOTYPE_TO_DATE_STRING, /* ECMA-262 v5, 15.9.5.3 */ -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT ECMA_DATE_PROTOTYPE_TO_UTC_STRING, /* ECMA-262 v5, 15.9.5.42 */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ECMA_DATE_PROTOTYPE_TO_TIME_STRING, /* ECMA-262 v5, 15.9.5.4 */ ECMA_DATE_PROTOTYPE_TO_ISO_STRING, /* ECMA-262 v5, 15.9.5.43 */ @@ -102,9 +102,9 @@ enum ECMA_DATE_PROTOTYPE_SET_TIME, /* ECMA-262 v5, 15.9.5.27 */ ECMA_DATE_PROTOTYPE_TO_JSON, /* ECMA-262 v5, 15.9.5.44 */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ECMA_DATE_PROTOTYPE_TO_PRIMITIVE, /* ECMA-262 v6 20.3.4.45 */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-date-prototype.inc.h" @@ -178,7 +178,7 @@ ecma_builtin_date_prototype_to_json (ecma_value_t this_arg) /**< this argument * return ret_value; } /* ecma_builtin_date_prototype_to_json */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * The Date.prototype object's toPrimitive routine * @@ -216,7 +216,7 @@ ecma_builtin_date_prototype_to_primitive (ecma_value_t this_arg, /**< this argum return ecma_raise_type_error (ECMA_ERR_MSG ("Invalid argument type in toPrimitive")); } /* ecma_builtin_date_prototype_to_primitive */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Dispatch get date functions @@ -238,18 +238,18 @@ ecma_builtin_date_prototype_dispatch_get (uint16_t builtin_routine_id, /**< buil { case ECMA_DATE_PROTOTYPE_GET_FULL_YEAR: case ECMA_DATE_PROTOTYPE_GET_UTC_FULL_YEAR: -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB case ECMA_DATE_PROTOTYPE_GET_YEAR: -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ +#endif /* JERRY_BUILTIN_ANNEXB */ { date_num = ecma_date_year_from_time (date_num); -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB if (builtin_routine_id == ECMA_DATE_PROTOTYPE_GET_YEAR) { date_num -= 1900; } -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ +#endif /* JERRY_BUILTIN_ANNEXB */ break; } @@ -307,7 +307,7 @@ ecma_builtin_date_prototype_dispatch_get (uint16_t builtin_routine_id, /**< buil return ecma_make_number_value (date_num); } /* ecma_builtin_date_prototype_dispatch_get */ -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB /** * Returns true, if the built-in id sets a year. @@ -317,7 +317,7 @@ ecma_builtin_date_prototype_dispatch_get (uint16_t builtin_routine_id, /**< buil || (builtin_routine_id) == ECMA_DATE_PROTOTYPE_SET_UTC_FULL_YEAR \ || (builtin_routine_id) == ECMA_DATE_PROTOTYPE_SET_YEAR) -#else /* !ENABLED (JERRY_BUILTIN_ANNEXB) */ +#else /* !JERRY_BUILTIN_ANNEXB */ /** * Returns true, if the built-in id sets a year. @@ -326,7 +326,7 @@ ecma_builtin_date_prototype_dispatch_get (uint16_t builtin_routine_id, /**< buil ((builtin_routine_id) == ECMA_DATE_PROTOTYPE_SET_FULL_YEAR \ || (builtin_routine_id) == ECMA_DATE_PROTOTYPE_SET_UTC_FULL_YEAR) -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ +#endif /* JERRY_BUILTIN_ANNEXB */ /** * Dispatch set date functions @@ -351,9 +351,9 @@ ecma_builtin_date_prototype_dispatch_set (uint16_t builtin_routine_id, /**< buil switch (builtin_routine_id) { -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB case ECMA_DATE_PROTOTYPE_SET_YEAR: -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ +#endif /* JERRY_BUILTIN_ANNEXB */ case ECMA_DATE_PROTOTYPE_SET_DATE: case ECMA_DATE_PROTOTYPE_SET_UTC_DATE: case ECMA_DATE_PROTOTYPE_SET_UTC_MILLISECONDS: @@ -442,7 +442,7 @@ ecma_builtin_date_prototype_dispatch_set (uint16_t builtin_routine_id, /**< buil } break; } -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB case ECMA_DATE_PROTOTYPE_SET_YEAR: { year = converted_number[0]; @@ -452,7 +452,7 @@ ecma_builtin_date_prototype_dispatch_set (uint16_t builtin_routine_id, /**< buil } break; } -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ +#endif /* JERRY_BUILTIN_ANNEXB */ case ECMA_DATE_PROTOTYPE_SET_MONTH: case ECMA_DATE_PROTOTYPE_SET_UTC_MONTH: { @@ -475,7 +475,7 @@ ecma_builtin_date_prototype_dispatch_set (uint16_t builtin_routine_id, /**< buil day_part = ecma_date_make_day (year, month, day); -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB if (builtin_routine_id == ECMA_DATE_PROTOTYPE_SET_YEAR) { builtin_routine_id = ECMA_DATE_PROTOTYPE_SET_UTC_YEAR; @@ -486,7 +486,7 @@ ecma_builtin_date_prototype_dispatch_set (uint16_t builtin_routine_id, /**< buil time_part = converted_number[0]; } } -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ +#endif /* JERRY_BUILTIN_ANNEXB */ } else { @@ -596,13 +596,13 @@ ecma_builtin_date_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< b return ecma_builtin_date_prototype_to_json (this_arg); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (builtin_routine_id == ECMA_DATE_PROTOTYPE_TO_PRIMITIVE)) { ecma_value_t argument = arguments_number > 0 ? arguments_list[0] : ECMA_VALUE_UNDEFINED; return ecma_builtin_date_prototype_to_primitive (this_arg, argument); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (!ecma_is_value_object (this_arg) || !ecma_object_class_is (ecma_get_object_from_value (this_arg), LIT_MAGIC_STRING_DATE_UL)) @@ -679,12 +679,12 @@ ecma_builtin_date_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< b { return ecma_date_value_to_date_string (*prim_value_p); } -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT case ECMA_DATE_PROTOTYPE_TO_UTC_STRING: { return ecma_date_value_to_utc_string (*prim_value_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { JERRY_ASSERT (builtin_routine_id == ECMA_DATE_PROTOTYPE_TO_TIME_STRING); @@ -700,4 +700,4 @@ ecma_builtin_date_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< b * @} */ -#endif /* ENABLED (JERRY_BUILTIN_DATE) */ +#endif /* JERRY_BUILTIN_DATE */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.inc.h index 920f9f37f..1c80040a0 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_DATE, @@ -67,28 +67,28 @@ ROUTINE (LIT_MAGIC_STRING_SET_FULL_YEAR_UL, ECMA_DATE_PROTOTYPE_SET_FULL_YEAR, N ROUTINE (LIT_MAGIC_STRING_SET_UTC_FULL_YEAR_UL, ECMA_DATE_PROTOTYPE_SET_UTC_FULL_YEAR, NON_FIXED, 3) ROUTINE (LIT_MAGIC_STRING_TO_ISO_STRING_UL, ECMA_DATE_PROTOTYPE_TO_ISO_STRING, 0, 0) ROUTINE (LIT_MAGIC_STRING_TO_JSON_UL, ECMA_DATE_PROTOTYPE_TO_JSON, 1, 1) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ROUTINE_CONFIGURABLE_ONLY (LIT_GLOBAL_SYMBOL_TO_PRIMITIVE, ECMA_DATE_PROTOTYPE_TO_PRIMITIVE, 1, 1) INTRINSIC_PROPERTY (LIT_MAGIC_STRING_TO_UTC_STRING_UL, LIT_MAGIC_STRING_TO_UTC_STRING_UL, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB INTRINSIC_PROPERTY (LIT_MAGIC_STRING_TO_GMT_STRING_UL, LIT_MAGIC_STRING_TO_UTC_STRING_UL, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ -#else /* !ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_BUILTIN_ANNEXB */ +#else /* !JERRY_ESNEXT */ ROUTINE (LIT_MAGIC_STRING_TO_UTC_STRING_UL, ECMA_DATE_PROTOTYPE_TO_UTC_STRING, 0, 0) -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB ROUTINE (LIT_MAGIC_STRING_TO_GMT_STRING_UL, ECMA_DATE_PROTOTYPE_TO_UTC_STRING, 0, 0) -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_BUILTIN_ANNEXB */ +#endif /* !JERRY_ESNEXT */ -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB ROUTINE (LIT_MAGIC_STRING_GET_YEAR_UL, ECMA_DATE_PROTOTYPE_GET_YEAR, 0, 0) ROUTINE (LIT_MAGIC_STRING_SET_YEAR_UL, ECMA_DATE_PROTOTYPE_SET_YEAR, 1, 1) -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ +#endif /* JERRY_BUILTIN_ANNEXB */ -#endif /* ENABLED (JERRY_BUILTIN_DATE) */ +#endif /* JERRY_BUILTIN_DATE */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-date.c b/jerry-core/ecma/builtin-objects/ecma-builtin-date.c index ed28b3664..bed6930e1 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-date.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-date.c @@ -26,7 +26,7 @@ #include "ecma-helpers.h" #include "lit-char-helpers.h" -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -629,11 +629,11 @@ ecma_builtin_date_utc (ecma_value_t this_arg, /**< this argument */ { JERRY_UNUSED (this_arg); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const uint32_t required_args_number = 1; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ const uint32_t required_args_number = 2; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (args_number < required_args_number) { @@ -718,7 +718,7 @@ ecma_value_t ecma_builtin_date_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */ uint32_t arguments_list_len) /**< number of arguments */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_ASSERT (JERRY_CONTEXT (current_new_target_p)); ecma_object_t *prototype_obj_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), @@ -727,17 +727,17 @@ ecma_builtin_date_dispatch_construct (const ecma_value_t *arguments_list_p, /**< { return ECMA_VALUE_ERROR; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ ecma_object_t *prototype_obj_p = ecma_builtin_get (ECMA_BUILTIN_ID_DATE_PROTOTYPE); -#endif /* (ENABLED (JERRY_ESNEXT) */ +#endif /* (JERRY_ESNEXT */ ecma_object_t *obj_p = ecma_create_object (prototype_obj_p, sizeof (ecma_extended_object_t), ECMA_OBJECT_TYPE_CLASS); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_deref_object (prototype_obj_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) obj_p; ext_object_p->u.class_prop.class_id = LIT_MAGIC_STRING_UNDEFINED; @@ -851,4 +851,4 @@ ecma_builtin_date_dispatch_construct (const ecma_value_t *arguments_list_p, /**< #undef BREAK_IF_FALSE #undef BREAK_IF_NAN -#endif /* ENABLED (JERRY_BUILTIN_DATE) */ +#endif /* JERRY_BUILTIN_DATE */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-date.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-date.inc.h index f22f6893c..53b1c3e9c 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-date.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-date.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE /* ECMA-262 v5, 15.9.4.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, @@ -34,12 +34,12 @@ ROUTINE (LIT_MAGIC_STRING_PARSE, ecma_builtin_date_parse, 1, 1) ROUTINE (LIT_MAGIC_STRING_UTC_U, ecma_builtin_date_utc, NON_FIXED, 7) ROUTINE (LIT_MAGIC_STRING_NOW, ecma_builtin_date_now, 0, 0) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_DATE_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#endif /* ENABLED (JERRY_BUILTIN_DATE) */ +#endif /* JERRY_BUILTIN_DATE */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-error.c b/jerry-core/ecma/builtin-objects/ecma-builtin-error.c index 3f7368939..96af45d4b 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-error.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-error.c @@ -64,9 +64,9 @@ ecma_value_t ecma_builtin_error_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */ uint32_t arguments_list_len) /**< number of arguments */ { -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT return ecma_builtin_error_dispatch_call (arguments_list_p, arguments_list_len); -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), ECMA_BUILTIN_ID_ERROR_PROTOTYPE); @@ -86,7 +86,7 @@ ecma_builtin_error_dispatch_construct (const ecma_value_t *arguments_list_p, /** ecma_deref_object (proto_p); return result; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* ecma_builtin_error_dispatch_construct */ /** diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-error.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-error.inc.h index a7f01cba4..c3df1a7c8 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-error.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-error.inc.h @@ -34,10 +34,10 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror-prototype.c index 3b2880486..a755b1669 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror-prototype.c @@ -24,7 +24,7 @@ #include "ecma-string-object.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -33,4 +33,4 @@ #define BUILTIN_UNDERSCORED_ID eval_error_prototype #include "ecma-builtin-internal-routines-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror-prototype.inc.h index a6e1f6400..f131641fc 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS /* Object properties: * (property name, object pointer getter) */ @@ -39,6 +39,6 @@ STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, LIT_MAGIC_STRING__EMPTY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.c b/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.c index fd1c2eaaf..5f74c1774 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.c @@ -26,7 +26,7 @@ #include "jrt.h" #include "jcontext.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -66,9 +66,9 @@ ecma_value_t ecma_builtin_eval_error_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */ uint32_t arguments_list_len) /**< number of arguments */ { -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT return ecma_builtin_eval_error_dispatch_call (arguments_list_p, arguments_list_len); -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), ECMA_BUILTIN_ID_EVAL_ERROR_PROTOTYPE); @@ -88,7 +88,7 @@ ecma_builtin_eval_error_dispatch_construct (const ecma_value_t *arguments_list_p ecma_deref_object (proto_p); return result; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* ecma_builtin_eval_error_dispatch_construct */ /** @@ -97,4 +97,4 @@ ecma_builtin_eval_error_dispatch_construct (const ecma_value_t *arguments_list_p * @} */ -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.inc.h index 4a61d5ce1..64887c8d9 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -36,12 +36,12 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_EVAL_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_EVAL_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.c index 19eb42d08..497cd1be5 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.c @@ -45,9 +45,9 @@ enum ECMA_FUNCTION_PROTOTYPE_CALL, ECMA_FUNCTION_PROTOTYPE_APPLY, ECMA_FUNCTION_PROTOTYPE_BIND, -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ECMA_FUNCTION_PROTOTYPE_SYMBOL_HAS_INSTANCE, -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-function-prototype.inc.h" @@ -210,10 +210,10 @@ ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p , /** /* 4. 11. 18. */ ecma_object_t *prototype_obj_p; -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT prototype_obj_p = ecma_builtin_get (ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE); -#else /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_BUILTIN_PROXY) +#else /* JERRY_ESNEXT */ +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (this_arg_obj_p)) { ecma_value_t proto = ecma_proxy_object_get_prototype_of (this_arg_obj_p); @@ -226,7 +226,7 @@ ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p , /** } else { -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ jmem_cpointer_t proto_cp = ecma_op_ordinary_object_get_prototype_of (this_arg_obj_p); if (proto_cp != JMEM_CP_NULL) { @@ -237,10 +237,10 @@ ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p , /** { prototype_obj_p = NULL; } -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_BUILTIN_PROXY */ +#endif /* !JERRY_ESNEXT */ ecma_object_t *function_p; ecma_bound_function_t *bound_func_p; @@ -295,7 +295,7 @@ ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p , /** bound_func_p->header.u.bound_function.args_len_or_this = args_len_or_this; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (prototype_obj_p != NULL) { ecma_deref_object (prototype_obj_p); @@ -309,13 +309,13 @@ ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p , /** len_string, &prop_desc); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (status)) { ecma_deref_object (function_p); return status; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ if (ecma_is_value_true (status)) { @@ -369,7 +369,7 @@ ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p , /** NULL); name_prop_value_p->value = bound_function_name; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* * [[Class]] property is not stored explicitly for objects of ECMA_OBJECT_TYPE_FUNCTION type. @@ -424,12 +424,12 @@ ecma_builtin_function_prototype_dispatch_routine (uint8_t builtin_routine_id, /* { if (!ecma_op_is_callable (this_arg)) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (builtin_routine_id == ECMA_FUNCTION_PROTOTYPE_SYMBOL_HAS_INSTANCE)) { return ECMA_VALUE_FALSE; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return ecma_raise_type_error (ECMA_ERR_MSG ("Argument 'this' is not a function")); } @@ -456,12 +456,12 @@ ecma_builtin_function_prototype_dispatch_routine (uint8_t builtin_routine_id, /* { return ecma_builtin_function_prototype_object_bind (func_obj_p, arguments_list_p, arguments_number); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case ECMA_FUNCTION_PROTOTYPE_SYMBOL_HAS_INSTANCE: { return ecma_op_object_has_instance (func_obj_p, arguments_list_p[0]); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { JERRY_UNREACHABLE (); diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.inc.h index 0f855780f..1c61dfabd 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.inc.h @@ -34,11 +34,11 @@ NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 0, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING__EMPTY, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ @@ -47,7 +47,7 @@ ROUTINE (LIT_MAGIC_STRING_APPLY, ECMA_FUNCTION_PROTOTYPE_APPLY, 2, 2) ROUTINE (LIT_MAGIC_STRING_CALL, ECMA_FUNCTION_PROTOTYPE_CALL, NON_FIXED, 1) ROUTINE (LIT_MAGIC_STRING_BIND, ECMA_FUNCTION_PROTOTYPE_BIND, NON_FIXED, 1) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * ECMA-262 v6.0 19.2.3.6 @@hasInstance * the property attributes are: { [[Writable]]: false, [[Enumerable]]: false, [[Configurable]]: false }. @@ -61,6 +61,6 @@ ACCESSOR_BUILTIN_FUNCTION (LIT_MAGIC_STRING_CALLER, ECMA_BUILTIN_ID_TYPE_ERROR_THROWER, ECMA_BUILTIN_ID_TYPE_ERROR_THROWER, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-function.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-function.inc.h index 844d3ade7..68f9edbda 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-function.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-function.inc.h @@ -34,10 +34,10 @@ NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 1, ECMA_PROPERTY_FLAG_DEFAULT_LENGTH) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_FUNCTION_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.c b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.c index 2555a4898..05ee6cc87 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.c @@ -15,7 +15,7 @@ #include "ecma-globals.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -69,4 +69,4 @@ ecma_builtin_generator_function_dispatch_construct (const ecma_value_t *argument * @} */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.inc.h index de3b7e35d..842f70a92 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-function.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* ECMA-262 v6, 25.2.2 */ STRING_VALUE (LIT_MAGIC_STRING_NAME, @@ -36,6 +36,6 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_GENERATOR, ECMA_PROPERTY_FIXED) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.c index b518e3e36..592056439 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.c @@ -23,7 +23,7 @@ #include "opcodes.h" #include "vm-defines.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -258,4 +258,4 @@ ecma_builtin_generator_prototype_dispatch_routine (uint8_t builtin_routine_id, / * @} */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.inc.h index a6313d306..e774f0fbf 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-generator-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* Object properties: * (property name, object pointer getter) */ @@ -40,6 +40,6 @@ ROUTINE (LIT_MAGIC_STRING_NEXT, ECMA_GENERATOR_PROTOTYPE_ROUTINE_NEXT, 1, 1) ROUTINE (LIT_MAGIC_STRING_RETURN, ECMA_GENERATOR_PROTOTYPE_ROUTINE_RETURN, 1, 1) ROUTINE (LIT_MAGIC_STRING_THROW, ECMA_GENERATOR_PROTOTYPE_ROUTINE_THROW, 1, 1) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-generator.c b/jerry-core/ecma/builtin-objects/ecma-builtin-generator.c index e0ed3be00..7cb11537b 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-generator.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-generator.c @@ -15,7 +15,7 @@ #include "ecma-globals.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -40,4 +40,4 @@ * @} */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-generator.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-generator.inc.h index 0b24e411d..235593ba6 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-generator.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-generator.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* ECMA-262 v6, 25.3.2.3.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, @@ -36,6 +36,6 @@ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_GENERATOR_FUNCTION_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-global.c b/jerry-core/ecma/builtin-objects/ecma-builtin-global.c index 2ad06f28a..d38b934fb 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-global.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-global.c @@ -99,12 +99,12 @@ ecma_builtin_global_object_eval (ecma_value_t x) /**< routine's first argument * parse_opts |= ECMA_PARSE_STRICT_MODE; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (vm_is_direct_eval_form_call ()) { parse_opts |= ECMA_GET_LOCAL_PARSE_OPTS (); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* steps 2 to 8 */ return ecma_op_eval (ecma_get_string_from_value (x), parse_opts); @@ -413,7 +413,7 @@ ecma_builtin_global_object_encode_uri_helper (lit_utf8_byte_t *input_start_p, /* return ecma_make_string_value (ecma_stringbuilder_finalize (&builder)); } /* ecma_builtin_global_object_encode_uri_helper */ -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB /** * Maximum value of a byte. @@ -583,7 +583,7 @@ ecma_builtin_global_object_unescape (lit_utf8_byte_t *input_start_p, /**< routin return ecma_make_string_value (ecma_stringbuilder_finalize (&builder)); } /* ecma_builtin_global_object_unescape */ -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ +#endif /* JERRY_BUILTIN_ANNEXB */ /** * Dispatcher of the built-in's routines @@ -673,7 +673,7 @@ ecma_builtin_global_dispatch_routine (uint8_t builtin_routine_id, /**< built-in switch (builtin_routine_id) { -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB case ECMA_GLOBAL_ESCAPE: { ret_value = ecma_builtin_global_object_escape (input_start_p, input_size); @@ -684,7 +684,7 @@ ecma_builtin_global_dispatch_routine (uint8_t builtin_routine_id, /**< built-in ret_value = ecma_builtin_global_object_unescape (input_start_p, input_size); break; } -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ +#endif /* JERRY_BUILTIN_ANNEXB */ case ECMA_GLOBAL_DECODE_URI: case ECMA_GLOBAL_DECODE_URI_COMPONENT: { diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h index f5fc51ef4..722528f84 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h @@ -54,53 +54,53 @@ OBJECT_VALUE (LIT_MAGIC_STRING_FUNCTION_UL, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) /* ECMA-262 v5, 15.1.4.3 */ -#if ENABLED (JERRY_BUILTIN_ARRAY) +#if JERRY_BUILTIN_ARRAY OBJECT_VALUE (LIT_MAGIC_STRING_ARRAY_UL, ECMA_BUILTIN_ID_ARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_ARRAY) */ +#endif /* JERRY_BUILTIN_ARRAY */ -#if ENABLED (JERRY_BUILTIN_STRING) +#if JERRY_BUILTIN_STRING /* ECMA-262 v5, 15.1.4.4 */ OBJECT_VALUE (LIT_MAGIC_STRING_STRING_UL, ECMA_BUILTIN_ID_STRING, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_STRING) */ +#endif /* JERRY_BUILTIN_STRING */ -#if ENABLED (JERRY_BUILTIN_BOOLEAN) +#if JERRY_BUILTIN_BOOLEAN /* ECMA-262 v5, 15.1.4.5 */ OBJECT_VALUE (LIT_MAGIC_STRING_BOOLEAN_UL, ECMA_BUILTIN_ID_BOOLEAN, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_BOOLEAN) */ +#endif /* JERRY_BUILTIN_BOOLEAN */ -#if ENABLED (JERRY_BUILTIN_NUMBER) +#if JERRY_BUILTIN_NUMBER /* ECMA-262 v5, 15.1.4.6 */ OBJECT_VALUE (LIT_MAGIC_STRING_NUMBER_UL, ECMA_BUILTIN_ID_NUMBER, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_NUMBER) */ +#endif /* JERRY_BUILTIN_NUMBER */ -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE /* ECMA-262 v5, 15.1.4.7 */ OBJECT_VALUE (LIT_MAGIC_STRING_DATE_UL, ECMA_BUILTIN_ID_DATE, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_DATE) */ +#endif /* JERRY_BUILTIN_DATE */ -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP /* ECMA-262 v5, 15.1.4.8 */ OBJECT_VALUE (LIT_MAGIC_STRING_REGEXP_UL, ECMA_BUILTIN_ID_REGEXP, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ /* ECMA-262 v5, 15.1.4.9 */ OBJECT_VALUE (LIT_MAGIC_STRING_ERROR_UL, ECMA_BUILTIN_ID_ERROR, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS /* ECMA-262 v5, 15.1.4.10 */ OBJECT_VALUE (LIT_MAGIC_STRING_EVAL_ERROR_UL, @@ -131,29 +131,29 @@ OBJECT_VALUE (LIT_MAGIC_STRING_TYPE_ERROR_UL, OBJECT_VALUE (LIT_MAGIC_STRING_URI_ERROR_UL, ECMA_BUILTIN_ID_URI_ERROR, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH /* ECMA-262 v5, 15.1.5.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_MATH_UL, ECMA_BUILTIN_ID_MATH, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_MATH) */ -#if ENABLED (JERRY_BUILTIN_REFLECT) +#endif /* JERRY_BUILTIN_MATH */ +#if JERRY_BUILTIN_REFLECT /* ECMA-262 v6, 26.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_REFLECT_UL, ECMA_BUILTIN_ID_REFLECT, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_REFLECT) */ +#endif /* JERRY_BUILTIN_REFLECT */ -#if ENABLED (JERRY_BUILTIN_JSON) +#if JERRY_BUILTIN_JSON /* ECMA-262 v5, 15.1.5.2 */ OBJECT_VALUE (LIT_MAGIC_STRING_JSON_U, ECMA_BUILTIN_ID_JSON, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_JSON) */ +#endif /* JERRY_BUILTIN_JSON */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY OBJECT_VALUE (LIT_MAGIC_STRING_ARRAY_BUFFER_UL, ECMA_BUILTIN_ID_ARRAYBUFFER, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) @@ -186,13 +186,13 @@ OBJECT_VALUE (LIT_MAGIC_STRING_FLOAT32_ARRAY_UL, ECMA_BUILTIN_ID_FLOAT32ARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 OBJECT_VALUE (LIT_MAGIC_STRING_FLOAT64_ARRAY_UL, ECMA_BUILTIN_ID_FLOAT64ARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT OBJECT_VALUE (LIT_MAGIC_STRING_BIGINT64_ARRAY_UL, ECMA_BUILTIN_ID_BIGINT64ARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) @@ -200,49 +200,49 @@ OBJECT_VALUE (LIT_MAGIC_STRING_BIGINT64_ARRAY_UL, OBJECT_VALUE (LIT_MAGIC_STRING_BIGUINT64_ARRAY_UL, ECMA_BUILTIN_ID_BIGUINT64ARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ OBJECT_VALUE (LIT_MAGIC_STRING_UINT8_CLAMPED_ARRAY_UL, ECMA_BUILTIN_ID_UINT8CLAMPEDARRAY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE OBJECT_VALUE (LIT_MAGIC_STRING_PROMISE_UL, ECMA_BUILTIN_ID_PROMISE, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ -#if ENABLED (JERRY_BUILTIN_MAP) +#if JERRY_BUILTIN_MAP /* ECMA-262 v6, 23.1.1.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_MAP_UL, ECMA_BUILTIN_ID_MAP, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ +#endif /* JERRY_BUILTIN_MAP */ -#if ENABLED (JERRY_BUILTIN_SET) +#if JERRY_BUILTIN_SET /* ECMA-262 v6, 23.1.1.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_SET_UL, ECMA_BUILTIN_ID_SET, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#endif /* JERRY_BUILTIN_SET */ -#if ENABLED (JERRY_BUILTIN_WEAKMAP) +#if JERRY_BUILTIN_WEAKMAP /* ECMA-262 v6, 23.1.1.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_WEAKMAP_UL, ECMA_BUILTIN_ID_WEAKMAP, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#endif /* JERRY_BUILTIN_SET */ -#if ENABLED (JERRY_BUILTIN_WEAKSET) +#if JERRY_BUILTIN_WEAKSET /* ECMA-262 v6, 23.1.1.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_WEAKSET_UL, ECMA_BUILTIN_ID_WEAKSET, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#endif /* JERRY_BUILTIN_SET */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* ECMA-262 v6, 19.4.1.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_SYMBOL_UL, ECMA_BUILTIN_ID_SYMBOL, @@ -252,28 +252,28 @@ OBJECT_VALUE (LIT_MAGIC_STRING_SYMBOL_UL, SIMPLE_VALUE (LIT_MAGIC_STRING_GLOBAL_THIS_UL, ECMA_VALUE_GLOBAL_THIS, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW /* ECMA-262 v6, 23.1.1.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_DATAVIEW_UL, ECMA_BUILTIN_ID_DATAVIEW, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW */ +#endif /* JERRY_BUILTIN_DATAVIEW */ -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY /* ECMA-262 v6, 26.2.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_PROXY_UL, ECMA_BUILTIN_ID_PROXY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT /* ECMA-262 v11, 20.2.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_BIGINT_UL, ECMA_BUILTIN_ID_BIGINT, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ @@ -285,17 +285,17 @@ ROUTINE (LIT_MAGIC_STRING_DECODE_URI, ECMA_GLOBAL_DECODE_URI, 1, 1) ROUTINE (LIT_MAGIC_STRING_DECODE_URI_COMPONENT, ECMA_GLOBAL_DECODE_URI_COMPONENT, 1, 1) ROUTINE (LIT_MAGIC_STRING_ENCODE_URI, ECMA_GLOBAL_ENCODE_URI, 1, 1) ROUTINE (LIT_MAGIC_STRING_ENCODE_URI_COMPONENT, ECMA_GLOBAL_ENCODE_URI_COMPONENT, 1, 1) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT INTRINSIC_PROPERTY (LIT_MAGIC_STRING_PARSE_FLOAT, LIT_MAGIC_STRING_PARSE_FLOAT, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) INTRINSIC_PROPERTY (LIT_MAGIC_STRING_PARSE_INT, LIT_MAGIC_STRING_PARSE_INT, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ ROUTINE (LIT_MAGIC_STRING_PARSE_FLOAT, ECMA_GLOBAL_PARSE_FLOAT, 1, 1) ROUTINE (LIT_MAGIC_STRING_PARSE_INT, ECMA_GLOBAL_PARSE_INT, 2, 2) -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#endif /* JERRY_ESNEXT */ +#if JERRY_BUILTIN_ANNEXB ROUTINE (LIT_MAGIC_STRING_ESCAPE, ECMA_GLOBAL_ESCAPE, 1, 1) ROUTINE (LIT_MAGIC_STRING_UNESCAPE, ECMA_GLOBAL_UNESCAPE, 1, 1) -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ +#endif /* JERRY_BUILTIN_ANNEXB */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-handlers.c b/jerry-core/ecma/builtin-objects/ecma-builtin-handlers.c index a08baff09..653eb7779 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-handlers.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-handlers.c @@ -15,7 +15,7 @@ #include "ecma-globals.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #include "ecma-builtin-handlers.h" #include "ecma-promise-object.h" @@ -58,4 +58,4 @@ ecma_builtin_handler_get_length (ecma_native_handler_id_t id) /**< handler id */ return ecma_native_handler_lengths[id - 1]; } /* ecma_builtin_handler_get_length */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-handlers.h b/jerry-core/ecma/builtin-objects/ecma-builtin-handlers.h index d4ccc9f10..e08414ba3 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-handlers.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-handlers.h @@ -18,7 +18,7 @@ #include "ecma-globals.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #include "ecma-helpers.h" #include "ecma-builtins.h" @@ -47,6 +47,6 @@ ecma_builtin_handler_get (ecma_native_handler_id_t id); uint8_t ecma_builtin_handler_get_length (ecma_native_handler_id_t id); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #endif /* !ECMA_BUILTIN_HANDLERS_H */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-handlers.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-handlers.inc.h index ce7db6434..3c047ffca 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-handlers.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-handlers.inc.h @@ -19,8 +19,8 @@ ECMA_NATIVE_HANDLER (ECMA_NATIVE_HANDLER_PROMISE_THEN_FINALLY, ecma_promise_then ECMA_NATIVE_HANDLER (ECMA_NATIVE_HANDLER_PROMISE_CATCH_FINALLY, ecma_promise_catch_finally_cb, 1) ECMA_NATIVE_HANDLER (ECMA_NATIVE_HANDLER_PROMISE_ALL_HELPER, ecma_promise_all_handler_cb, 1) ECMA_NATIVE_HANDLER (ECMA_NATIVE_HANDLER_PROMISE_CAPABILITY_EXECUTOR, ecma_op_get_capabilities_executor_cb, 2) -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY ECMA_NATIVE_HANDLER (ECMA_NATIVE_HANDLER_PROXY_REVOKE, ecma_proxy_revoke_cb, 0) -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ ECMA_NATIVE_HANDLER (ECMA_NATIVE_HANDLER_VALUE_THUNK, ecma_value_thunk_helper_cb, 0) ECMA_NATIVE_HANDLER (ECMA_NATIVE_HANDLER_VALUE_THROWER, ecma_value_thunk_thrower_cb, 0) diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c index 6154e0bc2..3e8e10d12 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c @@ -23,7 +23,7 @@ #include "ecma-objects.h" #include "lit-char-helpers.h" -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE /** \addtogroup ecma ECMA * @{ @@ -860,4 +860,4 @@ ecma_date_value_to_time_string (ecma_number_t datetime_number) /**= ECMA_STRING_STARTS_WITH) { @@ -600,7 +600,7 @@ ecma_builtin_helper_string_prototype_object_index_of (ecma_string_t *original_st return ecma_raise_type_error (ECMA_ERR_MSG ("Search string can't be of type: RegExp")); } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* 7, 8 */ ecma_string_t *search_str_p = ecma_op_to_string (arg1); @@ -614,18 +614,18 @@ ecma_builtin_helper_string_prototype_object_index_of (ecma_string_t *original_st /* 4 (indexOf, lastIndexOf), 9 (startsWith, includes), 10 (endsWith) */ ecma_number_t pos_num; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (mode > ECMA_STRING_LAST_INDEX_OF) { ret_value = ecma_op_to_integer (arg2, &pos_num); } else { -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ret_value = ecma_op_to_number (arg2, &pos_num); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* 10 (startsWith, includes), 11 (endsWith) */ if (ECMA_IS_VALUE_ERROR (ret_value)) @@ -645,7 +645,7 @@ ecma_builtin_helper_string_prototype_object_index_of (ecma_string_t *original_st switch (mode) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case ECMA_STRING_STARTS_WITH: { if (start > original_len) @@ -692,7 +692,7 @@ ecma_builtin_helper_string_prototype_object_index_of (ecma_string_t *original_st ret_value = ecma_make_boolean_value (index == (uint32_t) start_ends_with); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case ECMA_STRING_INDEX_OF: { @@ -895,7 +895,7 @@ ecma_builtin_replace_substitute (ecma_replace_context_t *ctx_p) /**< replace con } case LIT_CHAR_AMPERSAND: { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (ctx_p->matched_p == NULL)) { JERRY_ASSERT (ctx_p->capture_count == 0); @@ -907,7 +907,7 @@ ecma_builtin_replace_substitute (ecma_replace_context_t *ctx_p) /**< replace con ecma_stringbuilder_append (&(ctx_p->builder), ecma_get_string_from_value (match_value)); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ JERRY_ASSERT (ctx_p->matched_p != NULL); ecma_stringbuilder_append_raw (&(ctx_p->builder), ctx_p->matched_p, ctx_p->matched_size); @@ -920,7 +920,7 @@ ecma_builtin_replace_substitute (ecma_replace_context_t *ctx_p) /**< replace con } case LIT_CHAR_SINGLE_QUOTE: { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (ctx_p->matched_p == NULL)) { JERRY_ASSERT (ctx_p->capture_count == 0); @@ -938,7 +938,7 @@ ecma_builtin_replace_substitute (ecma_replace_context_t *ctx_p) /**< replace con (lit_utf8_size_t) (ctx_p->string_p + ctx_p->string_size - begin_p)); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ JERRY_ASSERT (ctx_p->matched_p != NULL); ecma_stringbuilder_append_raw (&(ctx_p->builder), @@ -953,12 +953,12 @@ ecma_builtin_replace_substitute (ecma_replace_context_t *ctx_p) /**< replace con if (lit_char_is_decimal_digit (c)) { uint32_t capture_count = ctx_p->capture_count; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (capture_count == 0 && ctx_p->u.collection_p != NULL) { capture_count = ctx_p->u.collection_p->item_count; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ uint8_t idx = (uint8_t) (c - LIT_CHAR_0); if (curr_p < replace_end_p && lit_char_is_decimal_digit (*(curr_p))) @@ -975,7 +975,7 @@ ecma_builtin_replace_substitute (ecma_replace_context_t *ctx_p) /**< replace con { if (ctx_p->capture_count > 0) { -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP JERRY_ASSERT (ctx_p->u.captures_p != NULL); const ecma_regexp_capture_t *const capture_p = ctx_p->u.captures_p + idx; @@ -987,9 +987,9 @@ ecma_builtin_replace_substitute (ecma_replace_context_t *ctx_p) /**< replace con } break; -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (ctx_p->u.collection_p != NULL) { const ecma_value_t capture_value = ctx_p->u.collection_p->buffer_p[idx]; @@ -1000,7 +1000,7 @@ ecma_builtin_replace_substitute (ecma_replace_context_t *ctx_p) /**< replace con break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } } diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.h b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.h index 4bd394c61..bb9f6e4b6 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.h @@ -83,9 +83,9 @@ typedef struct */ union { -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP const ecma_regexp_capture_t *captures_p; /**< array of regexp capturing groups */ -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ const ecma_collection_t *collection_p; /**< collection of captured substrings */ } u; @@ -96,12 +96,12 @@ typedef struct void ecma_builtin_replace_substitute (ecma_replace_context_t *ctx_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT bool ecma_builtin_is_regexp_exec (ecma_extended_object_t *obj_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE /** * Time range defines for helper functions. @@ -174,9 +174,9 @@ ecma_value_t ecma_date_value_to_iso_string (ecma_number_t datetime_number); ecma_value_t ecma_date_value_to_date_string (ecma_number_t datetime_number); ecma_value_t ecma_date_value_to_time_string (ecma_number_t datetime_number); -#endif /* ENABLED (JERRY_BUILTIN_DATE) */ +#endif /* JERRY_BUILTIN_DATE */ -#if ENABLED (JERRY_BUILTIN_JSON) +#if JERRY_BUILTIN_JSON /* ecma-builtin-helper-json.c */ /** @@ -220,7 +220,7 @@ bool ecma_json_has_object_in_stack (ecma_json_occurence_stack_item_t *stack_p, e ecma_value_t ecma_builtin_helper_json_create_non_formatted_json (lit_utf8_byte_t left_bracket, lit_utf8_byte_t right_bracket, ecma_collection_t *partial_p); -#endif /* ENABLED (JERRY_BUILTIN_JSON) */ +#endif /* JERRY_BUILTIN_JSON */ /* ecma-builtin-helper-error.c */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-internal-routines-template.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-internal-routines-template.inc.h index 9302fd939..f49ff62ec 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-internal-routines-template.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-internal-routines-template.inc.h @@ -189,7 +189,7 @@ const ecma_builtin_property_descriptor_t PROPERTY_DESCRIPTOR_LIST_NAME[] = prop_attributes, \ magic_string_id \ }, -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define SYMBOL_VALUE(name, symbol) \ { \ name, \ @@ -211,7 +211,7 @@ const ecma_builtin_property_descriptor_t PROPERTY_DESCRIPTOR_LIST_NAME[] = prop_attributes, \ ECMA_ACCESSOR_READ_WRITE (getter_builtin_id, setter_builtin_id) \ }, -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include BUILTIN_INC_HEADER_NAME { LIT_MAGIC_STRING__COUNT, diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-intrinsic.c b/jerry-core/ecma/builtin-objects/ecma-builtin-intrinsic.c index d20479d6d..4573bbf28 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-intrinsic.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-intrinsic.c @@ -24,7 +24,7 @@ #include "ecma-helpers.h" #include "lit-char-helpers.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -302,4 +302,4 @@ ecma_builtin_intrinsic_dispatch_routine (uint8_t builtin_routine_id, /**< built- * @} */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-intrinsic.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-intrinsic.inc.h index 9803fcabc..d3d0e5825 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-intrinsic.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-intrinsic.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ @@ -33,5 +33,5 @@ ROUTINE (LIT_MAGIC_STRING_TO_STRING_UL, ECMA_INTRINSIC_ARRAY_TO_STRING, 0, 0) ROUTINE (LIT_MAGIC_STRING_TO_UTC_STRING_UL, ECMA_INTRINSIC_DATE_TO_UTC_STRING, 0, 0) ROUTINE (LIT_MAGIC_STRING_PARSE_FLOAT, ECMA_INTRINSIC_PARSE_FLOAT, 1, 1) ROUTINE (LIT_MAGIC_STRING_PARSE_INT, ECMA_INTRINSIC_PARSE_INT, 2, 2) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-iterator-prototype.c index 143b366ef..59294883e 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-iterator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-iterator-prototype.c @@ -17,7 +17,7 @@ #include "ecma-builtins.h" #include "ecma-iterator-object.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -60,4 +60,4 @@ ecma_builtin_iterator_prototype_object_iterator (ecma_value_t this_val) /**< thi * @} */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-iterator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-iterator-prototype.inc.h index 7dba9fb71..99bb0c31a 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-iterator-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-iterator-prototype.inc.h @@ -19,12 +19,12 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_GLOBAL_SYMBOL_ITERATOR, ecma_builtin_iterator_prototype_object_iterator, 0, 0) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-json.c b/jerry-core/ecma/builtin-objects/ecma-builtin-json.c index 99999548d..e91b9b9db 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-json.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-json.c @@ -30,7 +30,7 @@ #include "lit-char-helpers.h" #include "lit-globals.h" -#if ENABLED (JERRY_BUILTIN_JSON) +#if JERRY_BUILTIN_JSON #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -636,13 +636,13 @@ ecma_builtin_json_internalize_property (ecma_object_t *reviver_p, /**< reviver f /* 3.a */ ecma_value_t is_array = ecma_is_value_array (value); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ECMA_IS_VALUE_ERROR (is_array)) { ecma_free_value (value); return is_array; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_object_t *object_p = ecma_get_object_from_value (value); @@ -654,13 +654,13 @@ ecma_builtin_json_internalize_property (ecma_object_t *reviver_p, /**< reviver f ecma_value_t to_len = ecma_op_object_get_length (object_p, &length); /* 3.c.iii */ -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (to_len)) { ecma_deref_object (object_p); return to_len; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ JERRY_ASSERT (ecma_is_value_empty (to_len)); /* 3.c.iv */ @@ -685,15 +685,15 @@ ecma_builtin_json_internalize_property (ecma_object_t *reviver_p, /**< reviver f { ecma_collection_t *props_p = ecma_op_object_get_enumerable_property_names (object_p, ECMA_ENUMERABLE_PROPERTY_KEYS); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (props_p == NULL)) { ecma_deref_object (object_p); return ECMA_VALUE_ERROR; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_ASSERT (props_p != NULL); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t *buffer_p = props_p->buffer_p; @@ -759,12 +759,12 @@ ecma_value_t ecma_builtin_json_internalize_process_property (ecma_object_t *revi /* ES11: 2.b.iii.2.a / 2.c.ii.2.a */ ecma_value_t delete_val = ecma_op_object_delete (object_p, prop_name, false); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ECMA_IS_VALUE_ERROR (delete_val)) { return delete_val; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ JERRY_ASSERT (ecma_is_value_boolean (delete_val)); } @@ -777,12 +777,12 @@ ecma_value_t ecma_builtin_json_internalize_process_property (ecma_object_t *revi ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE); ecma_free_value (new_element); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ECMA_IS_VALUE_ERROR (def_value)) { return def_value; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ JERRY_ASSERT (ecma_is_value_boolean (def_value)); } @@ -891,7 +891,7 @@ ecma_builtin_json_quote (ecma_stringbuilder_t *builder_p, /**< builder for the r bool should_escape = false; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (lit_is_code_point_utf16_high_surrogate (c)) { if (str_p < str_end_p) @@ -913,7 +913,7 @@ ecma_builtin_json_quote (ecma_stringbuilder_t *builder_p, /**< builder for the r { should_escape = true; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (c == LIT_CHAR_BACKSLASH || c == LIT_CHAR_DOUBLE_QUOTE) { @@ -1027,12 +1027,12 @@ ecma_builtin_json_serialize_object (ecma_json_stringify_context_t *context_p, /* { property_keys_p = ecma_op_object_get_enumerable_property_names (obj_p, ECMA_ENUMERABLE_PROPERTY_KEYS); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (property_keys_p == NULL) { return ECMA_VALUE_ERROR; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ } /* 8. */ @@ -1157,12 +1157,12 @@ ecma_builtin_json_serialize_array (ecma_json_stringify_context_t *context_p, /** ecma_length_t array_length; ecma_value_t length_value = ecma_op_object_get_length (obj_p, &array_length); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (length_value)) { return length_value; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ JERRY_ASSERT (ecma_is_value_empty (length_value)); ecma_stringbuilder_append_byte (&context_p->result_builder, LIT_CHAR_LEFT_SQUARE); @@ -1350,7 +1350,7 @@ ecma_builtin_json_serialize_property (ecma_json_stringify_context_t *context_p, value = ext_object_p->u.class_prop.u.value; ecma_deref_object (obj_p); } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT /* 5.d */ else if (class_name == LIT_MAGIC_STRING_BIGINT_UL) { @@ -1358,7 +1358,7 @@ ecma_builtin_json_serialize_property (ecma_json_stringify_context_t *context_p, value = ecma_copy_value (ext_object_p->u.class_prop.u.value); ecma_deref_object (obj_p); } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ } /* 6. - 8. */ @@ -1415,26 +1415,26 @@ ecma_builtin_json_serialize_property (ecma_json_stringify_context_t *context_p, return ECMA_VALUE_EMPTY; } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (ecma_is_value_bigint (value)) { ecma_free_value (value); return ecma_raise_type_error (ECMA_ERR_MSG ("BigInt cannot be serialized")); } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ /* 11. */ if (ecma_is_value_object (value) && !ecma_op_is_callable (value)) { ecma_value_t is_array = ecma_is_value_array (value); -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (ECMA_IS_VALUE_ERROR (is_array)) { ecma_free_value (value); return is_array; } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ ecma_object_t *obj_p = ecma_get_object_from_value (value); @@ -1561,24 +1561,24 @@ ecma_builtin_json_stringify (ecma_value_t this_arg, /**< 'this' argument */ { ecma_value_t is_array = ecma_is_value_array (arg2); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ECMA_IS_VALUE_ERROR (is_array)) { return is_array; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (ecma_is_value_true (is_array)) { ecma_length_t array_length; ecma_value_t to_len = ecma_op_object_get_length (obj_p, &array_length); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (to_len)) { return to_len; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ JERRY_ASSERT (ecma_is_value_empty (to_len)); context.property_list_p = ecma_new_collection (); @@ -1780,4 +1780,4 @@ ecma_builtin_json_stringify (ecma_value_t this_arg, /**< 'this' argument */ * @} */ -#endif /* ENABLED (JERRY_BUILTIN_JSON) */ +#endif /* JERRY_BUILTIN_JSON */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-json.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-json.inc.h index 5ef6b66d3..0172e7453 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-json.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-json.inc.h @@ -19,20 +19,20 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_JSON) +#if JERRY_BUILTIN_JSON -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* ECMA-262 v6, 24.3.3 */ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_JSON_U, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_MAGIC_STRING_PARSE, ecma_builtin_json_parse, 2, 2) ROUTINE (LIT_MAGIC_STRING_STRINGIFY, ecma_builtin_json_stringify, 3, 3) -#endif /* ENABLED (JERRY_BUILTIN_JSON) */ +#endif /* JERRY_BUILTIN_JSON */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.c index cc7126692..32acd6ca7 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.c @@ -17,7 +17,7 @@ #include "ecma-builtins.h" #include "ecma-container-object.h" -#if ENABLED (JERRY_BUILTIN_MAP) +#if JERRY_BUILTIN_MAP #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -60,4 +60,4 @@ ecma_builtin_map_iterator_prototype_object_next (ecma_value_t this_val) /**< thi * @} */ -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ +#endif /* JERRY_BUILTIN_MAP */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.inc.h index 65591abcf..955e01c78 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_MAP) +#if JERRY_BUILTIN_MAP STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_MAP_ITERATOR_UL, @@ -29,6 +29,6 @@ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_MAGIC_STRING_NEXT, ecma_builtin_map_iterator_prototype_object_next, 0, 0) -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ +#endif /* JERRY_BUILTIN_MAP */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.c index a9961e6ad..768dea1d2 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.c @@ -15,7 +15,7 @@ #include "ecma-container-object.h" -#if ENABLED (JERRY_BUILTIN_MAP) +#if JERRY_BUILTIN_MAP #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -63,4 +63,4 @@ ecma_builtin_map_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< bu * @} */ -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ +#endif /* JERRY_BUILTIN_MAP */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.inc.h index bbc0d7005..ad8f723f0 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_MAP) +#if JERRY_BUILTIN_MAP /* Object properties: * (property name, object pointer getter) */ @@ -54,6 +54,6 @@ ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_SIZE, ECMA_CONTAINER_ROUTINE_SIZE_GETTER, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ +#endif /* JERRY_BUILTIN_MAP */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map.c b/jerry-core/ecma/builtin-objects/ecma-builtin-map.c index 4c758c87b..bbba9a7cf 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-map.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map.c @@ -17,7 +17,7 @@ #include "ecma-exceptions.h" #include "ecma-container-object.h" -#if ENABLED (JERRY_BUILTIN_MAP) +#if JERRY_BUILTIN_MAP #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -83,4 +83,4 @@ ecma_builtin_map_species_get (ecma_value_t this_value) /**< This Value */ * @} */ -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ +#endif /* JERRY_BUILTIN_MAP */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-map.inc.h index cf8cfb2b8..df9bb8be9 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-map.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_MAP) +#if JERRY_BUILTIN_MAP /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -47,6 +47,6 @@ ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ecma_builtin_map_species_get, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ +#endif /* JERRY_BUILTIN_MAP */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-math.c b/jerry-core/ecma/builtin-objects/ecma-builtin-math.c index e4c7ba726..be8656c98 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-math.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-math.c @@ -32,7 +32,7 @@ #include #endif -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -62,7 +62,7 @@ enum ECMA_MATH_OBJECT_SIN, /* ECMA-262 v5, 15.8.2.16 */ ECMA_MATH_OBJECT_SQRT, /* ECMA-262 v5, 15.8.2.17 */ ECMA_MATH_OBJECT_TAN, /* ECMA-262 v5, 15.8.2.18 */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ECMA_MATH_OBJECT_ACOSH, /* ECMA-262 v6, 20.2.2.3 */ ECMA_MATH_OBJECT_ASINH, /* ECMA-262 v6, 20.2.2.5 */ ECMA_MATH_OBJECT_ATANH, /* ECMA-262 v6, 20.2.2.7 */ @@ -78,17 +78,17 @@ enum ECMA_MATH_OBJECT_SINH, /* ECMA-262 v6, 20.2.2.31 */ ECMA_MATH_OBJECT_TANH, /* ECMA-262 v6, 20.2.2.34 */ ECMA_MATH_OBJECT_TRUNC, /* ECMA-262 v6, 20.2.2.35 */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ECMA_MATH_OBJECT_ATAN2, /* ECMA-262 v5, 15.8.2.5 */ /* first routine with 2 arguments */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ECMA_MATH_OBJECT_IMUL, /* ECMA-262 v6, 20.2.2.19 */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ECMA_MATH_OBJECT_POW, /* ECMA-262 v5, 15.8.2.13 */ /* last routine with 1 or 2 arguments*/ ECMA_MATH_OBJECT_MAX, /* ECMA-262 v5, 15.8.2.11 */ ECMA_MATH_OBJECT_MIN, /* ECMA-262 v5, 15.8.2.12 */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ECMA_MATH_OBJECT_HYPOT, /* ECMA-262 v6, 20.2.2.18 */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ECMA_MATH_OBJECT_RANDOM, /* ECMA-262 v5, 15.8.2.14 */ }; @@ -178,7 +178,7 @@ ecma_builtin_math_object_max_min (bool is_max, /**< 'max' or 'min' operation */ return ecma_make_number_value (result_num); } /* ecma_builtin_math_object_max_min */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * The Math object's 'hypot' routine * @@ -301,7 +301,7 @@ ecma_builtin_math_object_sign (ecma_number_t arg) return (ecma_number_t) 1.0; } /* ecma_builtin_math_object_sign */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * The Math object's 'random' routine. @@ -423,7 +423,7 @@ ecma_builtin_math_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wi x = DOUBLE_TO_ECMA_NUMBER_T (log (x)); break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case ECMA_MATH_OBJECT_TRUNC: { x = ecma_builtin_math_object_trunc (x); @@ -434,7 +434,7 @@ ecma_builtin_math_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wi x = ecma_builtin_math_object_sign (x); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case ECMA_MATH_OBJECT_ROUND: { if (ecma_number_is_nan (x) @@ -492,7 +492,7 @@ ecma_builtin_math_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wi x = ecma_number_pow (x, y); break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case ECMA_MATH_OBJECT_ACOSH: { x = DOUBLE_TO_ECMA_NUMBER_T (acosh (x)); @@ -579,7 +579,7 @@ ecma_builtin_math_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wi x = (int32_t) (ecma_number_to_uint32 (x) * ecma_number_to_uint32 (y)); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } return ecma_make_number_value (x); } /* if (builtin_routine_id <= ECMA_MATH_OBJECT_POW) */ @@ -591,12 +591,12 @@ ecma_builtin_math_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wi arguments_number); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (builtin_routine_id == ECMA_MATH_OBJECT_HYPOT) { return ecma_builtin_math_object_hypot (arguments_list, arguments_number); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ JERRY_ASSERT (builtin_routine_id == ECMA_MATH_OBJECT_RANDOM); @@ -609,4 +609,4 @@ ecma_builtin_math_dispatch_routine (uint8_t builtin_routine_id, /**< built-in wi * @} */ -#endif /* ENABLED (JERRY_BUILTIN_MATH) */ +#endif /* JERRY_BUILTIN_MATH */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-math.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-math.inc.h index 0fc77462e..4c663356b 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-math.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-math.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -64,12 +64,12 @@ NUMBER_VALUE (LIT_MAGIC_STRING_SQRT2_U, ECMA_BUILTIN_NUMBER_SQRT2, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* ECMA-262 v6, 20.2.1.9 */ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_MATH_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ @@ -91,7 +91,7 @@ ROUTINE (LIT_MAGIC_STRING_ROUND, ECMA_MATH_OBJECT_ROUND, 1, 1) ROUTINE (LIT_MAGIC_STRING_SIN, ECMA_MATH_OBJECT_SIN, 1, 1) ROUTINE (LIT_MAGIC_STRING_SQRT, ECMA_MATH_OBJECT_SQRT, 1, 1) ROUTINE (LIT_MAGIC_STRING_TAN, ECMA_MATH_OBJECT_TAN, 1, 1) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ROUTINE (LIT_MAGIC_STRING_ACOSH, ECMA_MATH_OBJECT_ACOSH, 1, 1) ROUTINE (LIT_MAGIC_STRING_ASINH, ECMA_MATH_OBJECT_ASINH, 1, 1) ROUTINE (LIT_MAGIC_STRING_ATANH, ECMA_MATH_OBJECT_ATANH, 1, 1) @@ -109,8 +109,8 @@ ROUTINE (LIT_MAGIC_STRING_SIGN, ECMA_MATH_OBJECT_SIGN, 1, 1) ROUTINE (LIT_MAGIC_STRING_SINH, ECMA_MATH_OBJECT_SINH, 1, 1) ROUTINE (LIT_MAGIC_STRING_TANH, ECMA_MATH_OBJECT_TANH, 1, 1) ROUTINE (LIT_MAGIC_STRING_TRUNC, ECMA_MATH_OBJECT_TRUNC, 1, 1) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#endif /* ENABLED (JERRY_BUILTIN_MATH) */ +#endif /* JERRY_BUILTIN_MATH */ #include "ecma-builtin-helpers-macro-undefs.inc.h" 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 cd1873904..bedf8a939 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.c @@ -28,7 +28,7 @@ #include "jrt-libc-includes.h" #include "lit-char-helpers.h" -#if ENABLED (JERRY_BUILTIN_NUMBER) +#if JERRY_BUILTIN_NUMBER #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -802,4 +802,4 @@ ecma_builtin_number_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< * @} */ -#endif /* ENABLED (JERRY_BUILTIN_NUMBER) */ +#endif /* JERRY_BUILTIN_NUMBER */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.inc.h index 8b509255b..530616ebc 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_NUMBER) +#if JERRY_BUILTIN_NUMBER /* Object properties: * (property name, object pointer getter) */ @@ -38,6 +38,6 @@ ROUTINE (LIT_MAGIC_STRING_TO_FIXED_UL, ECMA_NUMBER_PROTOTYPE_TO_FIXED, 1, 1) ROUTINE (LIT_MAGIC_STRING_TO_EXPONENTIAL_UL, ECMA_NUMBER_PROTOTYPE_TO_EXPONENTIAL, 1, 1) ROUTINE (LIT_MAGIC_STRING_TO_PRECISION_UL, ECMA_NUMBER_PROTOTYPE_TO_PRECISION, 1, 1) -#endif /* ENABLED (JERRY_BUILTIN_NUMBER) */ +#endif /* JERRY_BUILTIN_NUMBER */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-number.c b/jerry-core/ecma/builtin-objects/ecma-builtin-number.c index b98f5556f..506fa1d11 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-number.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-number.c @@ -27,12 +27,12 @@ #include "ecma-objects.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_NUMBER) +#if JERRY_BUILTIN_NUMBER #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * This object has a custom dispatch function. */ @@ -49,7 +49,7 @@ enum ECMA_NUMBER_OBJECT_ROUTINE_IS_INTEGER, ECMA_NUMBER_OBJECT_ROUTINE_IS_SAFE_INTEGER }; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #define BUILTIN_INC_HEADER_NAME "ecma-builtin-number.inc.h" #define BUILTIN_UNDERSCORED_ID number @@ -92,7 +92,7 @@ ecma_builtin_number_dispatch_call (const ecma_value_t *arguments_list_p, /**< ar return ret_value; } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (ecma_is_value_bigint (ret_value)) { ecma_value_t bigint = ret_value; @@ -100,7 +100,7 @@ ecma_builtin_number_dispatch_call (const ecma_value_t *arguments_list_p, /**< ar ecma_free_value (bigint); } else -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ { ret_value = ecma_make_number_value (num); } @@ -125,7 +125,7 @@ ecma_builtin_number_dispatch_construct (const ecma_value_t *arguments_list_p, /* return ecma_op_create_number_object (ecma_make_integer_value (0)); } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT ecma_number_t num; ecma_value_t value = ecma_op_to_numeric (arguments_list_p[0], &num, ECMA_TO_NUMERIC_ALLOW_BIGINT); @@ -148,12 +148,12 @@ ecma_builtin_number_dispatch_construct (const ecma_value_t *arguments_list_p, /* ecma_value_t result = ecma_op_create_number_object (value); ecma_free_value (value); return result; -#else /* !ENABLED (JERRY_BUILTIN_BIGINT) */ +#else /* !JERRY_BUILTIN_BIGINT */ return ecma_op_create_number_object (arguments_list_p[0]); -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ } /* ecma_builtin_number_dispatch_construct */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * The Number object 'isInteger' and 'isSafeInteger' routine * @@ -239,7 +239,7 @@ ecma_builtin_number_dispatch_routine (uint8_t builtin_routine_id, /**< built-in } } /* ecma_builtin_number_dispatch_routine */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} @@ -247,4 +247,4 @@ ecma_builtin_number_dispatch_routine (uint8_t builtin_routine_id, /**< built-in * @} */ -#endif /* ENABLED (JERRY_BUILTIN_NUMBER) */ +#endif /* JERRY_BUILTIN_NUMBER */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-number.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-number.inc.h index f287e1e46..9f84069bf 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-number.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-number.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_NUMBER) +#if JERRY_BUILTIN_NUMBER /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -53,7 +53,7 @@ NUMBER_VALUE (LIT_MAGIC_STRING_NEGATIVE_INFINITY_U, ECMA_BUILTIN_NUMBER_NEGATIVE_INFINITY, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* ECMA-262 v6, 20.1.2.1 */ NUMBER_VALUE (LIT_MAGIC_STRING_EPSILON_U, @@ -73,7 +73,7 @@ NUMBER_VALUE (LIT_MAGIC_STRING_MIN_SAFE_INTEGER_U, STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_NUMBER_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* Object properties: * (property name, object pointer getter) */ @@ -83,16 +83,16 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_NUMBER_PROTOTYPE, ECMA_PROPERTY_FIXED) -#endif /* ENABLED (JERRY_BUILTIN_NUMBER) */ +#endif /* JERRY_BUILTIN_NUMBER */ /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ROUTINE (LIT_MAGIC_STRING_IS_FINITE, ECMA_NUMBER_OBJECT_ROUTINE_IS_FINITE, 1, 1) ROUTINE (LIT_MAGIC_STRING_IS_NAN, ECMA_NUMBER_OBJECT_ROUTINE_IS_NAN, 1, 1) ROUTINE (LIT_MAGIC_STRING_IS_INTEGER, ECMA_NUMBER_OBJECT_ROUTINE_IS_INTEGER, 1, 1) ROUTINE (LIT_MAGIC_STRING_IS_SAFE_INTEGER, ECMA_NUMBER_OBJECT_ROUTINE_IS_SAFE_INTEGER, 1, 1) INTRINSIC_PROPERTY (LIT_MAGIC_STRING_PARSE_FLOAT, LIT_MAGIC_STRING_PARSE_FLOAT, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) INTRINSIC_PROPERTY (LIT_MAGIC_STRING_PARSE_INT, LIT_MAGIC_STRING_PARSE_INT, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.c index 46fae4fdb..6eda74eff 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.c @@ -51,12 +51,12 @@ enum ECMA_OBJECT_PROTOTYPE_HAS_OWN_PROPERTY, ECMA_OBJECT_PROTOTYPE_PROPERTY_IS_ENUMERABLE, ECMA_OBJECT_PROTOTYPE_SET_PROTO, -#if ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_ESNEXT && JERRY_BUILTIN_ANNEXB ECMA_OBJECT_PROTOTYPE_DEFINE_GETTER, ECMA_OBJECT_PROTOTYPE_DEFINE_SETTER, ECMA_OBJECT_PROTOTYPE_LOOKUP_GETTER, ECMA_OBJECT_PROTOTYPE_LOOKUP_SETTER, -#endif /* ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_ANNEXB) */ +#endif /* JERRY_ESNEXT && JERRY_BUILTIN_ANNEXB */ }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-object-prototype.inc.h" @@ -131,7 +131,7 @@ static ecma_value_t ecma_builtin_object_prototype_object_has_own_property (ecma_object_t *obj_p, /**< this argument */ ecma_string_t *prop_name_p) /**< first argument */ { -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (obj_p)) { ecma_property_descriptor_t prop_desc; @@ -145,7 +145,7 @@ ecma_builtin_object_prototype_object_has_own_property (ecma_object_t *obj_p, /** return status; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ return ecma_make_boolean_value (ecma_op_ordinary_object_has_own_property (obj_p, prop_name_p)); } /* ecma_builtin_object_prototype_object_has_own_property */ @@ -208,7 +208,7 @@ ecma_builtin_object_prototype_object_property_is_enumerable (ecma_object_t *obj_ return ecma_make_boolean_value (is_enumerable); } /* ecma_builtin_object_prototype_object_property_is_enumerable */ -#if ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_ESNEXT && JERRY_BUILTIN_ANNEXB /** * The Object.prototype object's '__defineGetter__' and '__defineSetter__' routine * @@ -387,7 +387,7 @@ ecma_builtin_object_prototype_lookup_getter_setter (ecma_value_t this_arg, /**< return ret_value; } /* ecma_builtin_object_prototype_lookup_getter_setter */ -#endif /* ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_ANNEXB) */ +#endif /* JERRY_ESNEXT && JERRY_BUILTIN_ANNEXB */ /** * Dispatcher of the built-in's routines @@ -445,13 +445,13 @@ ecma_builtin_object_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< ecma_value_t ret_value; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (builtin_routine_id == ECMA_OBJECT_PROTOTYPE_GET_PROTO) { ret_value = ecma_builtin_object_object_get_prototype_of (obj_p); } else -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { ret_value = ecma_builtin_object_prototype_object_is_prototype_of (obj_p, arguments_list_p[0]); } @@ -463,12 +463,12 @@ ecma_builtin_object_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< JERRY_ASSERT (builtin_routine_id >= ECMA_OBJECT_PROTOTYPE_HAS_OWN_PROPERTY); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (builtin_routine_id == ECMA_OBJECT_PROTOTYPE_SET_PROTO) { return ecma_builtin_object_object_set_proto (this_arg, arguments_list_p[0]); } -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB else if (builtin_routine_id == ECMA_OBJECT_PROTOTYPE_LOOKUP_GETTER) { return ecma_builtin_object_prototype_lookup_getter_setter (this_arg, arguments_list_p[0], true); @@ -491,8 +491,8 @@ ecma_builtin_object_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< arguments_list_p[1], false); } -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ -#endif /* ENABLED (JERRY_ESNEXT)*/ +#endif /* JERRY_BUILTIN_ANNEXB */ +#endif /* JERRY_ESNEXT*/ ecma_string_t *prop_name_p = ecma_op_to_property_key (arguments_list_p[0]); diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.inc.h index 2517e0acf..a9c9d33b5 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.inc.h @@ -41,11 +41,11 @@ ROUTINE (LIT_MAGIC_STRING_HAS_OWN_PROPERTY_UL, ECMA_OBJECT_PROTOTYPE_HAS_OWN_PRO ROUTINE (LIT_MAGIC_STRING_IS_PROTOTYPE_OF_UL, ECMA_OBJECT_PROTOTYPE_IS_PROTOTYPE_OF, 1, 1) ROUTINE (LIT_MAGIC_STRING_PROPERTY_IS_ENUMERABLE_UL, ECMA_OBJECT_PROTOTYPE_PROPERTY_IS_ENUMERABLE, 1, 1) -#if ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_ESNEXT && JERRY_BUILTIN_ANNEXB ROUTINE (LIT_MAGIC_STRING_DEFINE_GETTER, ECMA_OBJECT_PROTOTYPE_DEFINE_GETTER, 2, 2) ROUTINE (LIT_MAGIC_STRING_DEFINE_SETTER, ECMA_OBJECT_PROTOTYPE_DEFINE_SETTER, 2, 2) ROUTINE (LIT_MAGIC_STRING_LOOKUP_GETTER, ECMA_OBJECT_PROTOTYPE_LOOKUP_GETTER, 1, 1) ROUTINE (LIT_MAGIC_STRING_LOOKUP_SETTER, ECMA_OBJECT_PROTOTYPE_LOOKUP_SETTER, 1, 1) -#endif /* ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_ANNEXB)*/ +#endif /* JERRY_ESNEXT && JERRY_BUILTIN_ANNEXB*/ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-object.c b/jerry-core/ecma/builtin-objects/ecma-builtin-object.c index 254d7bed9..81f9bdd39 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-object.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-object.c @@ -27,11 +27,11 @@ #include "ecma-objects-general.h" #include "jrt.h" #include "ecma-builtin-object.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #include "ecma-iterator-object.h" #include "ecma-function-object.h" #include "jcontext.h" -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -123,7 +123,7 @@ ecma_value_t ecma_builtin_object_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */ uint32_t arguments_list_len) /**< number of arguments */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_CONTEXT (current_new_target_p) != ecma_builtin_get (ECMA_BUILTIN_ID_OBJECT)) { ecma_object_t *prototype_obj_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), @@ -140,7 +140,7 @@ ecma_builtin_object_dispatch_construct (const ecma_value_t *arguments_list_p, /* return ecma_make_object_value (object_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return ecma_builtin_object_dispatch_call (arguments_list_p, arguments_list_len); } /* ecma_builtin_object_dispatch_construct */ @@ -156,12 +156,12 @@ ecma_builtin_object_dispatch_construct (const ecma_value_t *arguments_list_p, /* ecma_value_t ecma_builtin_object_object_get_prototype_of (ecma_object_t *obj_p) /**< routine's argument */ { -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (obj_p)) { return ecma_proxy_object_get_prototype_of (obj_p); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ jmem_cpointer_t proto_cp = ecma_op_ordinary_object_get_prototype_of (obj_p); @@ -175,7 +175,7 @@ ecma_builtin_object_object_get_prototype_of (ecma_object_t *obj_p) /**< routine' return ECMA_VALUE_NULL; } /* ecma_builtin_object_object_get_prototype_of */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * The Object object's 'setPrototypeOf' routine * @@ -211,7 +211,7 @@ ecma_builtin_object_object_set_prototype_of (ecma_value_t arg1, /**< routine's f ecma_value_t status; /* 5. */ -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (obj_p)) { status = ecma_proxy_object_set_prototype_of (obj_p, arg2); @@ -223,11 +223,11 @@ ecma_builtin_object_object_set_prototype_of (ecma_value_t arg1, /**< routine's f } else { -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ status = ecma_op_ordinary_object_set_prototype_of (obj_p, arg2); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ if (ecma_is_value_false (status)) { @@ -275,7 +275,7 @@ ecma_builtin_object_object_set_proto (ecma_value_t arg1, /**< routine's first ar ecma_value_t status; /* 5. */ -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (obj_p)) { status = ecma_proxy_object_set_prototype_of (obj_p, arg2); @@ -287,11 +287,11 @@ ecma_builtin_object_object_set_proto (ecma_value_t arg1, /**< routine's first ar } else { -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ status = ecma_op_ordinary_object_set_prototype_of (obj_p, arg2); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ if (ecma_is_value_false (status)) { @@ -302,7 +302,7 @@ ecma_builtin_object_object_set_proto (ecma_value_t arg1, /**< routine's first ar return ECMA_VALUE_UNDEFINED; } /* ecma_builtin_object_object_set_proto */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * SetIntegrityLevel operation @@ -319,7 +319,7 @@ ecma_builtin_object_set_integrity_level (ecma_object_t *obj_p, /**< object */ * false - set "frozen" */ { /* 3. */ -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (obj_p)) { ecma_value_t status = ecma_proxy_object_prevent_extensions (obj_p); @@ -330,7 +330,7 @@ ecma_builtin_object_set_integrity_level (ecma_object_t *obj_p, /**< object */ } } else -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ { ecma_op_ordinary_object_prevent_extensions (obj_p); } @@ -338,12 +338,12 @@ ecma_builtin_object_set_integrity_level (ecma_object_t *obj_p, /**< object */ /* 6. */ ecma_collection_t *props_p = ecma_op_object_own_property_keys (obj_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (props_p == NULL) { return ECMA_VALUE_ERROR; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ ecma_value_t *buffer_p = props_p->buffer_p; @@ -357,13 +357,13 @@ ecma_builtin_object_set_integrity_level (ecma_object_t *obj_p, /**< object */ ecma_property_descriptor_t prop_desc; ecma_value_t status = ecma_op_object_get_own_property_descriptor (obj_p, property_name_p, &prop_desc); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (status)) { ecma_collection_free (props_p); return ECMA_VALUE_ERROR; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ if (ecma_is_value_false (status)) { @@ -401,13 +401,13 @@ ecma_builtin_object_set_integrity_level (ecma_object_t *obj_p, /**< object */ ecma_property_descriptor_t prop_desc; ecma_value_t status = ecma_op_object_get_own_property_descriptor (obj_p, property_name_p, &prop_desc); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (status)) { ecma_collection_free (props_p); return ECMA_VALUE_ERROR; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ if (ecma_is_value_false (status)) { @@ -467,12 +467,12 @@ ecma_builtin_object_object_seal (ecma_object_t *obj_p) /**< routine's argument * return status; } -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ecma_is_value_false (status)) { return ecma_raise_type_error (ECMA_ERR_MSG ("Object cannot be sealed")); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ /* 4. */ ecma_ref_object (obj_p); @@ -498,12 +498,12 @@ ecma_builtin_object_object_freeze (ecma_object_t *obj_p) /**< routine's argument return status; } -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ecma_is_value_false (status)) { return ecma_raise_type_error (ECMA_ERR_MSG ("Object cannot be frozen")); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ /* 4. */ ecma_ref_object (obj_p); @@ -522,7 +522,7 @@ ecma_builtin_object_object_freeze (ecma_object_t *obj_p) /**< routine's argument ecma_value_t ecma_builtin_object_object_prevent_extensions (ecma_object_t *obj_p) /**< routine's argument */ { -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (obj_p)) { ecma_value_t status = ecma_proxy_object_prevent_extensions (obj_p); @@ -541,11 +541,11 @@ ecma_builtin_object_object_prevent_extensions (ecma_object_t *obj_p) /**< routin } else { -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ ecma_op_ordinary_object_prevent_extensions (obj_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ ecma_ref_object (obj_p); return ecma_make_object_value (obj_p); @@ -569,7 +569,7 @@ ecma_builtin_object_test_integrity_level (ecma_object_t *obj_p, /**< routine's a /* 3. */ bool is_extensible; -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (obj_p)) { ecma_value_t status = ecma_proxy_object_is_extensible (obj_p); @@ -582,7 +582,7 @@ ecma_builtin_object_test_integrity_level (ecma_object_t *obj_p, /**< routine's a is_extensible = ecma_is_value_true (status); } else -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ { is_extensible = ecma_op_ordinary_object_is_extensible (obj_p); } @@ -598,12 +598,12 @@ ecma_builtin_object_test_integrity_level (ecma_object_t *obj_p, /**< routine's a /* 2. */ ecma_collection_t *props_p = ecma_op_object_own_property_keys (obj_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (props_p == NULL) { return ECMA_VALUE_ERROR; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ ecma_value_t *buffer_p = props_p->buffer_p; @@ -615,13 +615,13 @@ ecma_builtin_object_test_integrity_level (ecma_object_t *obj_p, /**< routine's a ecma_property_descriptor_t prop_desc; ecma_value_t status = ecma_op_object_get_own_property_descriptor (obj_p, property_name_p, &prop_desc); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (status)) { ret_value = status; break; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ if (ecma_is_value_false (status)) { @@ -661,12 +661,12 @@ ecma_builtin_object_test_integrity_level (ecma_object_t *obj_p, /**< routine's a ecma_value_t ecma_builtin_object_object_is_extensible (ecma_object_t *obj_p) /**< routine's argument */ { -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (obj_p)) { return ecma_proxy_object_is_extensible (obj_p); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ return ecma_make_boolean_value (ecma_op_ordinary_object_is_extensible (obj_p)); } /* ecma_builtin_object_object_is_extensible */ @@ -716,12 +716,12 @@ ecma_builtin_object_object_get_own_property_descriptor (ecma_object_t *obj_p, /* ecma_value_t status = ecma_op_object_get_own_property_descriptor (obj_p, name_str_p, &prop_desc); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (status)) { return status; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ if (ecma_is_value_true (status)) { @@ -736,7 +736,7 @@ ecma_builtin_object_object_get_own_property_descriptor (ecma_object_t *obj_p, /* return ECMA_VALUE_UNDEFINED; } /* ecma_builtin_object_object_get_own_property_descriptor */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * The Object object's 'getOwnPropertyDescriptors' routine * @@ -752,12 +752,12 @@ ecma_builtin_object_object_get_own_property_descriptors (ecma_object_t *obj_p) / /* 2 */ ecma_collection_t *prop_names_p = ecma_op_object_own_property_keys (obj_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (prop_names_p == NULL) { return ECMA_VALUE_ERROR; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ ecma_value_t *names_buffer_p = prop_names_p->buffer_p; @@ -774,7 +774,7 @@ ecma_builtin_object_object_get_own_property_descriptors (ecma_object_t *obj_p) / ecma_property_descriptor_t prop_desc; ecma_value_t status = ecma_op_object_get_own_property_descriptor (obj_p, property_name_p, &prop_desc); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (status)) { ecma_deref_object (descriptors_p); @@ -782,7 +782,7 @@ ecma_builtin_object_object_get_own_property_descriptors (ecma_object_t *obj_p) / return status; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ if (ecma_is_value_true (status)) { @@ -804,7 +804,7 @@ ecma_builtin_object_object_get_own_property_descriptors (ecma_object_t *obj_p) / return ecma_make_object_value (descriptors_p); } /* ecma_builtin_object_object_get_own_property_descriptors */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * The Object object's 'defineProperties' routine @@ -834,13 +834,13 @@ ecma_builtin_object_object_define_properties (ecma_object_t *obj_p, /**< routine ecma_collection_t *prop_names_p = ecma_op_object_own_property_keys (props_p); ecma_value_t ret_value = ECMA_VALUE_ERROR; -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (prop_names_p == NULL) { ecma_deref_object (props_p); return ret_value; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ ecma_value_t *buffer_p = prop_names_p->buffer_p; @@ -859,12 +859,12 @@ ecma_builtin_object_object_define_properties (ecma_object_t *obj_p, /**< routine prop_name_p, &prop_desc); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ECMA_IS_VALUE_ERROR (get_desc)) { goto cleanup; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (ecma_is_value_true (get_desc)) { @@ -1036,7 +1036,7 @@ ecma_builtin_object_object_define_property (ecma_object_t *obj_p, /**< routine's return ecma_make_object_value (obj_p); } /* ecma_builtin_object_object_define_property */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * The Object object's 'assign' routine @@ -1075,13 +1075,13 @@ ecma_builtin_object_object_assign (ecma_object_t *target_p, /**< target object * /* 5.b.iii */ ecma_collection_t *props_p = ecma_op_object_own_property_keys (from_obj_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (props_p == NULL) { ecma_deref_object (from_obj_p); return ECMA_VALUE_ERROR; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ ecma_value_t *buffer_p = props_p->buffer_p; @@ -1093,13 +1093,13 @@ ecma_builtin_object_object_assign (ecma_object_t *target_p, /**< target object * ecma_property_descriptor_t prop_desc; ecma_value_t desc_status = ecma_op_object_get_own_property_descriptor (from_obj_p, property_name_p, &prop_desc); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (desc_status)) { ret_value = desc_status; break; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ if (ecma_is_value_false (desc_status)) { @@ -1269,11 +1269,11 @@ ecma_builtin_object_from_entries (ecma_value_t iterator) /**< object's iterator goto cleanup_iterator; } - ecma_property_value_t *prop; ecma_property_t *property_p = ecma_find_named_property (obj_p, property_key); if (property_p == NULL) { + ecma_property_value_t *prop; prop = ecma_create_named_data_property (obj_p, property_key, ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE, @@ -1302,7 +1302,7 @@ cleanup_iterator: return result; } /* ecma_builtin_object_from_entries */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * GetOwnPropertyKeys abstract method @@ -1317,7 +1317,7 @@ static ecma_value_t ecma_op_object_get_own_property_keys (ecma_value_t this_arg, /**< this argument */ uint16_t type) /**< routine type */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* 1. */ ecma_value_t object = ecma_op_to_object (this_arg); @@ -1360,12 +1360,12 @@ ecma_op_object_get_own_property_keys (ecma_value_t this_arg, /**< this argument ecma_collection_free (props_p); return result_array; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_UNUSED (type); ecma_object_t *obj_p = ecma_get_object_from_value (this_arg); ecma_collection_t *props_p = ecma_op_object_own_property_keys (obj_p); return ecma_op_new_array_object_from_collection (props_p, false); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* ecma_op_object_get_own_property_keys */ /** @@ -1395,7 +1395,7 @@ ecma_builtin_object_dispatch_routine (uint8_t builtin_routine_id, /**< built-in { return ecma_builtin_object_object_create (arg1, arg2); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case ECMA_OBJECT_ROUTINE_SET_PROTOTYPE_OF: { return ecma_builtin_object_object_set_prototype_of (arg1, arg2); @@ -1404,7 +1404,7 @@ ecma_builtin_object_dispatch_routine (uint8_t builtin_routine_id, /**< built-in { return ecma_builtin_object_object_is (arg1, arg2); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { break; @@ -1412,21 +1412,21 @@ ecma_builtin_object_dispatch_routine (uint8_t builtin_routine_id, /**< built-in } ecma_object_t *obj_p; -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT if (!ecma_is_value_object (arg1)) { return ecma_raise_type_error (ECMA_ERR_MSG ("Argument is not an object")); } -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ if (builtin_routine_id <= ECMA_OBJECT_ROUTINE_DEFINE_PROPERTIES) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (!ecma_is_value_object (arg1)) { return ecma_raise_type_error (ECMA_ERR_MSG ("Argument is not an object")); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ obj_p = ecma_get_object_from_value (arg1); @@ -1450,7 +1450,7 @@ ecma_builtin_object_dispatch_routine (uint8_t builtin_routine_id, /**< built-in } else if (builtin_routine_id <= ECMA_OBJECT_ROUTINE_ENTRIES) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t object = ecma_op_to_object (arg1); if (ECMA_IS_VALUE_ERROR (object)) { @@ -1458,9 +1458,9 @@ ecma_builtin_object_dispatch_routine (uint8_t builtin_routine_id, /**< built-in } obj_p = ecma_get_object_from_value (object); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ obj_p = ecma_get_object_from_value (arg1); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t result; switch (builtin_routine_id) @@ -1470,7 +1470,7 @@ ecma_builtin_object_dispatch_routine (uint8_t builtin_routine_id, /**< built-in result = ecma_builtin_object_object_get_prototype_of (obj_p); break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case ECMA_OBJECT_ROUTINE_ASSIGN: { result = ecma_builtin_object_object_assign (obj_p, arguments_list_p + 1, arguments_number - 1); @@ -1478,7 +1478,7 @@ ecma_builtin_object_dispatch_routine (uint8_t builtin_routine_id, /**< built-in } case ECMA_OBJECT_ROUTINE_ENTRIES: case ECMA_OBJECT_ROUTINE_VALUES: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case ECMA_OBJECT_ROUTINE_KEYS: { JERRY_ASSERT (builtin_routine_id - ECMA_OBJECT_ROUTINE_KEYS < ECMA_ENUMERABLE_PROPERTY__COUNT); @@ -1502,7 +1502,7 @@ ecma_builtin_object_dispatch_routine (uint8_t builtin_routine_id, /**< built-in ecma_deref_ecma_string (prop_name_p); break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case ECMA_OBJECT_ROUTINE_GET_OWN_PROPERTY_DESCRIPTORS: { result = ecma_builtin_object_object_get_own_property_descriptors (obj_p); @@ -1513,16 +1513,16 @@ ecma_builtin_object_dispatch_routine (uint8_t builtin_routine_id, /**< built-in result = ecma_builtin_object_from_entries (arg1); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { JERRY_UNREACHABLE (); } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_deref_object (obj_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return result; } else if (builtin_routine_id <= ECMA_OBJECT_ROUTINE_GET_OWN_PROPERTY_SYMBOLS) @@ -1531,12 +1531,12 @@ ecma_builtin_object_dispatch_routine (uint8_t builtin_routine_id, /**< built-in } else if (builtin_routine_id <= ECMA_OBJECT_ROUTINE_SEAL) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (!ecma_is_value_object (arg1)) { return ecma_copy_value (arg1); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ obj_p = ecma_get_object_from_value (arg1); switch (builtin_routine_id) @@ -1562,12 +1562,12 @@ ecma_builtin_object_dispatch_routine (uint8_t builtin_routine_id, /**< built-in else { JERRY_ASSERT (builtin_routine_id <= ECMA_OBJECT_ROUTINE_IS_SEALED); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (!ecma_is_value_object (arg1)) { return ecma_make_boolean_value (builtin_routine_id != ECMA_OBJECT_ROUTINE_IS_EXTENSIBLE); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ obj_p = ecma_get_object_from_value (arg1); switch (builtin_routine_id) diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-object.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-object.inc.h index 63df72fbc..546e57b9b 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-object.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-object.inc.h @@ -34,43 +34,43 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_OBJECT_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_MAGIC_STRING_GET_PROTOTYPE_OF_UL, ECMA_OBJECT_ROUTINE_GET_PROTOTYPE_OF, 1, 1) ROUTINE (LIT_MAGIC_STRING_GET_OWN_PROPERTY_NAMES_UL, ECMA_OBJECT_ROUTINE_GET_OWN_PROPERTY_NAMES, 1, 1) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ROUTINE (LIT_MAGIC_STRING_GET_OWN_PROPERTY_SYMBOLS_UL, ECMA_OBJECT_ROUTINE_GET_OWN_PROPERTY_SYMBOLS, 1, 1) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ROUTINE (LIT_MAGIC_STRING_SEAL, ECMA_OBJECT_ROUTINE_SEAL, 1, 1) ROUTINE (LIT_MAGIC_STRING_FREEZE, ECMA_OBJECT_ROUTINE_FREEZE, 1, 1) ROUTINE (LIT_MAGIC_STRING_PREVENT_EXTENSIONS_UL, ECMA_OBJECT_ROUTINE_PREVENT_EXTENSIONS, 1, 1) ROUTINE (LIT_MAGIC_STRING_IS_SEALED_UL, ECMA_OBJECT_ROUTINE_IS_SEALED, 1, 1) ROUTINE (LIT_MAGIC_STRING_IS_FROZEN_UL, ECMA_OBJECT_ROUTINE_IS_FROZEN, 1, 1) ROUTINE (LIT_MAGIC_STRING_IS_EXTENSIBLE, ECMA_OBJECT_ROUTINE_IS_EXTENSIBLE, 1, 1) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ROUTINE (LIT_MAGIC_STRING_ENTRIES, ECMA_OBJECT_ROUTINE_ENTRIES, 1, 1) ROUTINE (LIT_MAGIC_STRING_VALUES, ECMA_OBJECT_ROUTINE_VALUES, 1, 1) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ROUTINE (LIT_MAGIC_STRING_KEYS, ECMA_OBJECT_ROUTINE_KEYS, 1, 1) ROUTINE (LIT_MAGIC_STRING_GET_OWN_PROPERTY_DESCRIPTOR_UL, ECMA_OBJECT_ROUTINE_GET_OWN_PROPERTY_DESCRIPTOR, 2, 2) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ROUTINE (LIT_MAGIC_STRING_GET_OWN_PROPERTY_DESCRIPTORS_UL, ECMA_OBJECT_ROUTINE_GET_OWN_PROPERTY_DESCRIPTORS, 1, 1) ROUTINE (LIT_MAGIC_STRING_OBJECT_FROM_ENTRIES, ECMA_OBJECT_ROUTINE_FROM_ENTRIES, 1, 1) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ROUTINE (LIT_MAGIC_STRING_CREATE, ECMA_OBJECT_ROUTINE_CREATE, 2, 2) ROUTINE (LIT_MAGIC_STRING_DEFINE_PROPERTIES_UL, ECMA_OBJECT_ROUTINE_DEFINE_PROPERTIES, 2, 2) ROUTINE (LIT_MAGIC_STRING_DEFINE_PROPERTY_UL, ECMA_OBJECT_ROUTINE_DEFINE_PROPERTY, 3, 3) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ROUTINE (LIT_MAGIC_STRING_SET_PROTOTYPE_OF_UL, ECMA_OBJECT_ROUTINE_SET_PROTOTYPE_OF, 2, 2) ROUTINE (LIT_MAGIC_STRING_ASSIGN, ECMA_OBJECT_ROUTINE_ASSIGN, NON_FIXED, 2) ROUTINE (LIT_MAGIC_STRING_IS, ECMA_OBJECT_ROUTINE_IS, 2, 2) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.c index f25e0cf2c..6e31ed58e 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.c @@ -16,7 +16,7 @@ #include "ecma-globals.h" #include "ecma-promise-object.h" -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -95,4 +95,4 @@ ecma_builtin_promise_prototype_dispatch_routine (uint8_t builtin_routine_id, /** * @} */ -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.inc.h index 76ef3fada..48b5eae9b 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-promise-prototype.inc.h @@ -15,7 +15,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE /* Object properties: * (property name, object pointer getter) */ @@ -33,6 +33,6 @@ ROUTINE (LIT_MAGIC_STRING_THEN, ECMA_PROMISE_PROTOTYPE_ROUTINE_THEN, 2, 2) ROUTINE (LIT_MAGIC_STRING_CATCH, ECMA_PROMISE_PROTOTYPE_ROUTINE_CATCH, 1, 1) ROUTINE (LIT_MAGIC_STRING_FINALLY, ECMA_PROMISE_PROTOTYPE_ROUTINE_FINALLY, 1, 1) -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-promise.c b/jerry-core/ecma/builtin-objects/ecma-builtin-promise.c index 87e5a6491..e7a986000 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-promise.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-promise.c @@ -26,7 +26,7 @@ #include "ecma-promise-object.h" #include "jcontext.h" -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -505,4 +505,4 @@ ecma_builtin_promise_dispatch_routine (uint8_t builtin_routine_id, /**< built-in * @} */ -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-promise.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-promise.inc.h index baa295438..93b9a9bcc 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-promise.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-promise.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -51,6 +51,6 @@ ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ECMA_PROMISE_ROUTINE_SPECIES_GET, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.c b/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.c index 91c54203f..a5bd649bc 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.c @@ -21,7 +21,7 @@ #include "ecma-proxy-object.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -118,4 +118,4 @@ ecma_builtin_proxy_dispatch_construct (const ecma_value_t *arguments_list_p, /** * @} */ -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.inc.h index d7e7daff3..802d041c7 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-proxy.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -37,6 +37,6 @@ STRING_VALUE (LIT_MAGIC_STRING_NAME, ROUTINE (LIT_MAGIC_STRING_REVOCABLE, ecma_builtin_proxy_object_revocable, 2, 2) -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror-prototype.c index 8fbfd4063..21565971d 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror-prototype.c @@ -24,7 +24,7 @@ #include "ecma-string-object.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -33,4 +33,4 @@ #define BUILTIN_UNDERSCORED_ID range_error_prototype #include "ecma-builtin-internal-routines-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror-prototype.inc.h index 684171590..ce8406b11 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS /* Object properties: * (property name, object pointer getter) */ @@ -39,6 +39,6 @@ STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, LIT_MAGIC_STRING__EMPTY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.c b/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.c index fd45d8b63..8ef8c1026 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.c @@ -26,7 +26,7 @@ #include "jrt.h" #include "jcontext.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -66,9 +66,9 @@ ecma_value_t ecma_builtin_range_error_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */ uint32_t arguments_list_len) /**< number of arguments */ { -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT return ecma_builtin_range_error_dispatch_call (arguments_list_p, arguments_list_len); -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), ECMA_BUILTIN_ID_RANGE_ERROR_PROTOTYPE); @@ -88,7 +88,7 @@ ecma_builtin_range_error_dispatch_construct (const ecma_value_t *arguments_list_ ecma_deref_object (proto_p); return result; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* ecma_builtin_range_error_dispatch_construct */ /** @@ -97,4 +97,4 @@ ecma_builtin_range_error_dispatch_construct (const ecma_value_t *arguments_list_ * @} */ -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.inc.h index cc907526e..008acd088 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -36,12 +36,12 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_RANGE_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_RANGE_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror-prototype.c index af657830b..f1d4c593f 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror-prototype.c @@ -24,7 +24,7 @@ #include "ecma-string-object.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -33,4 +33,4 @@ #define BUILTIN_UNDERSCORED_ID reference_error_prototype #include "ecma-builtin-internal-routines-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror-prototype.inc.h index 496ea9923..d03e8a65c 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS /* Object properties: * (property name, object pointer getter) */ @@ -39,6 +39,6 @@ STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, LIT_MAGIC_STRING__EMPTY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.c b/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.c index 13fdecac2..0fc5354a4 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.c @@ -26,7 +26,7 @@ #include "jrt.h" #include "jcontext.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -66,9 +66,9 @@ ecma_value_t ecma_builtin_reference_error_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */ uint32_t arguments_list_len) /**< number of arguments */ { -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT return ecma_builtin_reference_error_dispatch_call (arguments_list_p, arguments_list_len); -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), ECMA_BUILTIN_ID_REFERENCE_ERROR_PROTOTYPE); @@ -88,7 +88,7 @@ ecma_builtin_reference_error_dispatch_construct (const ecma_value_t *arguments_l ecma_deref_object (proto_p); return result; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* ecma_builtin_reference_error_dispatch_construct */ /** @@ -97,4 +97,4 @@ ecma_builtin_reference_error_dispatch_construct (const ecma_value_t *arguments_l * @} */ -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.inc.h index ea517de58..4cb17bae1 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -36,12 +36,12 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_REFERENCE_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_REFERENCE_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-reflect.c b/jerry-core/ecma/builtin-objects/ecma-builtin-reflect.c index a1da681e5..76f97eff9 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-reflect.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-reflect.c @@ -25,7 +25,7 @@ #include "ecma-proxy-object.h" #include "jcontext.h" -#if ENABLED (JERRY_BUILTIN_REFLECT) +#if JERRY_BUILTIN_REFLECT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -167,12 +167,12 @@ ecma_builtin_reflect_dispatch_routine (uint8_t builtin_routine_id, /**< built-in /* 2. */ ecma_collection_t *prop_names = ecma_op_object_own_property_keys (target_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (prop_names == NULL) { return ECMA_VALUE_ERROR; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ /* 3. */ return ecma_op_new_array_object_from_collection (prop_names, false); @@ -245,13 +245,13 @@ ecma_builtin_reflect_dispatch_routine (uint8_t builtin_routine_id, /**< built-in ecma_object_t *obj_p = ecma_get_object_from_value (arguments_list[0]); ecma_value_t status; -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (obj_p)) { status = ecma_proxy_object_set_prototype_of (obj_p, arguments_list[1]); } else -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ { status = ecma_op_ordinary_object_set_prototype_of (obj_p, arguments_list[1]); } @@ -327,12 +327,12 @@ ecma_builtin_reflect_dispatch_routine (uint8_t builtin_routine_id, /**< built-in JERRY_ASSERT (builtin_routine_id == ECMA_REFLECT_OBJECT_PREVENT_EXTENSIONS); ecma_object_t *obj_p = ecma_get_object_from_value (arguments_list[0]); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (obj_p)) { return ecma_proxy_object_prevent_extensions (obj_p); } -#endif /* !ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* !JERRY_BUILTIN_PROXY */ ecma_op_ordinary_object_prevent_extensions (obj_p); @@ -347,4 +347,4 @@ ecma_builtin_reflect_dispatch_routine (uint8_t builtin_routine_id, /**< built-in * @} */ -#endif /* ENABLED (JERRY_BUILTIN_REFLECT) */ +#endif /* JERRY_BUILTIN_REFLECT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-reflect.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-reflect.inc.h index f67206c6f..4f4c824a6 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-reflect.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-reflect.inc.h @@ -15,7 +15,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_REFLECT) +#if JERRY_BUILTIN_REFLECT /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ @@ -33,6 +33,6 @@ ROUTINE (LIT_MAGIC_STRING_IS_EXTENSIBLE, ECMA_REFLECT_OBJECT_IS_EXTENSIBLE, 1, 1 ROUTINE (LIT_MAGIC_STRING_PREVENT_EXTENSIONS_UL, ECMA_REFLECT_OBJECT_PREVENT_EXTENSIONS, 1, 1) ROUTINE (LIT_MAGIC_STRING_SET_PROTOTYPE_OF_UL, ECMA_REFLECT_OBJECT_SET_PROTOTYPE_OF, 2, 2) -#endif /* ENABLED (JERRY_BUILTIN_REFLECT) */ +#endif /* JERRY_BUILTIN_REFLECT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c index 027f1b210..3ea8f5da4 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c @@ -27,7 +27,7 @@ #include "ecma-regexp-object.h" #include "lit-char-helpers.h" -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP #include "ecma-regexp-object.h" #include "re-compiler.h" @@ -47,13 +47,13 @@ enum /** These routines must be in this order */ ECMA_REGEXP_PROTOTYPE_ROUTINE_START = 0, ECMA_REGEXP_PROTOTYPE_ROUTINE_EXEC, -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB ECMA_REGEXP_PROTOTYPE_ROUTINE_COMPILE, -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ +#endif /* JERRY_BUILTIN_ANNEXB */ ECMA_REGEXP_PROTOTYPE_ROUTINE_TEST, ECMA_REGEXP_PROTOTYPE_ROUTINE_TO_STRING, -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ECMA_REGEXP_PROTOTYPE_ROUTINE_GET_SOURCE, ECMA_REGEXP_PROTOTYPE_ROUTINE_GET_FLAGS, @@ -69,7 +69,7 @@ enum ECMA_REGEXP_PROTOTYPE_ROUTINE_SYMBOL_REPLACE, ECMA_REGEXP_PROTOTYPE_ROUTINE_SYMBOL_SPLIT, ECMA_REGEXP_PROTOTYPE_ROUTINE_SYMBOL_MATCH_ALL, -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ }; #define BUILTIN_INC_HEADER_NAME "ecma-builtin-regexp-prototype.inc.h" @@ -86,7 +86,7 @@ enum * @{ */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Helper function to retrieve the flags associated with a RegExp object * @@ -258,9 +258,9 @@ ecma_builtin_regexp_prototype_get_source (ecma_extended_object_t *re_obj_p) /**< return ecma_op_escape_regexp_pattern (ecma_get_string_from_value (bc_p->source)); } /* ecma_builtin_regexp_prototype_get_source */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB /** * The RegExp.prototype object's 'compile' routine * @@ -277,12 +277,12 @@ ecma_builtin_regexp_prototype_compile (ecma_value_t this_arg, /**< this */ ecma_value_t pattern_arg, /**< pattern or RegExp object */ ecma_value_t flags_arg) /**< flags */ { -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT if (ecma_get_object_from_value (this_arg) == ecma_builtin_get (ECMA_BUILTIN_ID_REGEXP_PROTOTYPE)) { return ecma_raise_type_error (ECMA_ERR_MSG ("Argument 'this' is not a RegExp object")); } -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ ecma_object_t *this_obj_p = ecma_get_object_from_value (this_arg); ecma_extended_object_t *re_obj_p = (ecma_extended_object_t *) this_obj_p; @@ -329,7 +329,7 @@ ecma_builtin_regexp_prototype_compile (ecma_value_t this_arg, /**< this */ return ret_value; } /* ecma_builtin_regexp_prototype_compile */ -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ +#endif /* JERRY_BUILTIN_ANNEXB */ /** * The RegExp.prototype object's 'exec' routine @@ -383,7 +383,7 @@ static ecma_value_t ecma_builtin_regexp_prototype_test (ecma_value_t this_arg, /**< this argument */ ecma_value_t arg) /**< routine's argument */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_string_t *arg_str_p = ecma_op_to_string (arg); if (JERRY_UNLIKELY (arg_str_p == NULL)) @@ -399,14 +399,14 @@ ecma_builtin_regexp_prototype_test (ecma_value_t this_arg, /**< this argument */ { return result; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ ecma_value_t result = ecma_builtin_regexp_prototype_exec (this_arg, arg); if (ECMA_IS_VALUE_ERROR (result)) { return result; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t ret_value = ecma_make_boolean_value (!ecma_is_value_null (result)); ecma_free_value (result); @@ -426,7 +426,7 @@ ecma_builtin_regexp_prototype_test (ecma_value_t this_arg, /**< this argument */ static ecma_value_t ecma_builtin_regexp_prototype_to_string (ecma_object_t *object_p) /**< this object */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t result = ecma_op_object_get_by_magic_id (object_p, LIT_MAGIC_STRING_SOURCE); if (ECMA_IS_VALUE_ERROR (result)) { @@ -467,7 +467,7 @@ ecma_builtin_regexp_prototype_to_string (ecma_object_t *object_p) /**< this obje ecma_deref_ecma_string (flags_p); return ecma_make_string_value (ecma_stringbuilder_finalize (&builder)); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ ecma_extended_object_t *re_obj_p = (ecma_extended_object_t *) object_p; re_compiled_code_t *bc_p = ECMA_GET_INTERNAL_VALUE_POINTER (re_compiled_code_t, @@ -497,10 +497,10 @@ ecma_builtin_regexp_prototype_to_string (ecma_object_t *object_p) /**< this obje } return ecma_make_string_value (ecma_stringbuilder_finalize (&result)); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* ecma_builtin_regexp_prototype_to_string */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Helper function to determine if method is the builtin exec method * @@ -513,9 +513,9 @@ ecma_builtin_is_regexp_exec (ecma_extended_object_t *obj_p) return (ecma_get_object_is_builtin ((ecma_object_t *) obj_p) && obj_p->u.built_in.routine_id == ECMA_REGEXP_PROTOTYPE_ROUTINE_EXEC); } /* ecma_builtin_is_regexp_exec */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * The RegExp.prototype object's 'matchAll' routine * @@ -654,7 +654,7 @@ ecma_builtin_regexp_prototype_match_all (ecma_object_t *regexp_obj_p, /**< this return ecma_make_object_value (result_obj); } /* ecma_builtin_regexp_prototype_match_all */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Dispatcher of the Regexp built-in's routines @@ -671,11 +671,11 @@ ecma_builtin_regexp_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< { JERRY_UNUSED (arguments_number); -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT bool require_regexp = builtin_routine_id <= ECMA_REGEXP_PROTOTYPE_ROUTINE_TO_STRING; -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ bool require_regexp = builtin_routine_id < ECMA_REGEXP_PROTOTYPE_ROUTINE_TEST; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_object_t *obj_p = NULL; @@ -697,12 +697,12 @@ ecma_builtin_regexp_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< switch (builtin_routine_id) { -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB case ECMA_REGEXP_PROTOTYPE_ROUTINE_COMPILE: { return ecma_builtin_regexp_prototype_compile (this_arg, arguments_list_p[0], arguments_list_p[1]); } -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ +#endif /* JERRY_BUILTIN_ANNEXB */ case ECMA_REGEXP_PROTOTYPE_ROUTINE_TEST: { return ecma_builtin_regexp_prototype_test (this_arg, arguments_list_p[0]); @@ -715,7 +715,7 @@ ecma_builtin_regexp_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< { return ecma_builtin_regexp_prototype_to_string (obj_p); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case ECMA_REGEXP_PROTOTYPE_ROUTINE_SYMBOL_SEARCH: { return ecma_regexp_search_helper (this_arg, arguments_list_p[0]); @@ -775,7 +775,7 @@ ecma_builtin_regexp_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< ecma_extended_object_t *re_obj_p = (ecma_extended_object_t *) obj_p; return ecma_builtin_regexp_prototype_flags_helper (re_obj_p, builtin_routine_id); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { JERRY_UNREACHABLE (); @@ -788,4 +788,4 @@ ecma_builtin_regexp_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< * @} */ -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.inc.h index 7995aae8c..320b4bf02 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.inc.h @@ -19,14 +19,14 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP /* ECMA-262 v5, 15.10.6.1 */ OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, ECMA_BUILTIN_ID_REGEXP, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_FLAGS, ECMA_REGEXP_PROTOTYPE_ROUTINE_GET_FLAGS, ECMA_PROPERTY_FLAG_CONFIGURABLE) @@ -64,7 +64,7 @@ ROUTINE (LIT_GLOBAL_SYMBOL_SEARCH, ECMA_REGEXP_PROTOTYPE_ROUTINE_SYMBOL_SEARCH, ROUTINE (LIT_GLOBAL_SYMBOL_SPLIT, ECMA_REGEXP_PROTOTYPE_ROUTINE_SYMBOL_SPLIT, 2, 2) ROUTINE (LIT_GLOBAL_SYMBOL_MATCH, ECMA_REGEXP_PROTOTYPE_ROUTINE_SYMBOL_MATCH, 1, 1) ROUTINE (LIT_GLOBAL_SYMBOL_MATCH_ALL, ECMA_REGEXP_PROTOTYPE_ROUTINE_SYMBOL_MATCH_ALL, 1, 1) -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ /* ECMA-262 v5, 15.10.7.1 */ STRING_VALUE (LIT_MAGIC_STRING_SOURCE, LIT_MAGIC_STRING_EMPTY_NON_CAPTURE_GROUP, @@ -89,15 +89,15 @@ SIMPLE_VALUE (LIT_MAGIC_STRING_MULTILINE, NUMBER_VALUE (LIT_MAGIC_STRING_LASTINDEX_UL, 0, ECMA_PROPERTY_FLAG_WRITABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB ROUTINE (LIT_MAGIC_STRING_COMPILE, ECMA_REGEXP_PROTOTYPE_ROUTINE_COMPILE, 2, 2) -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ +#endif /* JERRY_BUILTIN_ANNEXB */ ROUTINE (LIT_MAGIC_STRING_EXEC, ECMA_REGEXP_PROTOTYPE_ROUTINE_EXEC, 1, 1) ROUTINE (LIT_MAGIC_STRING_TEST, ECMA_REGEXP_PROTOTYPE_ROUTINE_TEST, 1, 1) ROUTINE (LIT_MAGIC_STRING_TO_STRING_UL, ECMA_REGEXP_PROTOTYPE_ROUTINE_TO_STRING, 0, 0) -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-string-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-string-iterator-prototype.c index f7faf0d20..2853d07c7 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-string-iterator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-string-iterator-prototype.c @@ -20,7 +20,7 @@ #include "ecma-iterator-object.h" #include "ecma-objects.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -189,4 +189,4 @@ free_variables: * @} */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-string-iterator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-string-iterator-prototype.inc.h index ad7b2b6ad..d2eebddb7 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-string-iterator-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-string-iterator-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_REGEXP_STRING_ITERATOR_UL, @@ -29,6 +29,6 @@ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_MAGIC_STRING_NEXT, ecma_builtin_regexp_string_iterator_prototype_object_next, 0, 0) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.c b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.c index 5df1647b1..eac145eb6 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.c @@ -23,7 +23,7 @@ #include "ecma-objects.h" #include "ecma-regexp-object.h" -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -48,13 +48,13 @@ ecma_builtin_regexp_dispatch_helper (const ecma_value_t *arguments_list_p, /**< { ecma_value_t pattern_value = ECMA_VALUE_UNDEFINED; ecma_value_t flags_value = ECMA_VALUE_UNDEFINED; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT bool create_regexp_from_bc = false; bool free_arguments = false; ecma_object_t *new_target_p = JERRY_CONTEXT (current_new_target_p); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ ecma_object_t *new_target_p = NULL; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (arguments_list_len > 0) { @@ -67,7 +67,7 @@ ecma_builtin_regexp_dispatch_helper (const ecma_value_t *arguments_list_p, /**< } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t regexp_value = ecma_op_is_regexp (pattern_value); if (ECMA_IS_VALUE_ERROR (regexp_value)) @@ -144,7 +144,7 @@ ecma_builtin_regexp_dispatch_helper (const ecma_value_t *arguments_list_p, /**< free_arguments = true; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ if (ecma_object_is_regexp_object (pattern_value)) { if (ecma_is_value_undefined (flags_value)) @@ -154,21 +154,21 @@ ecma_builtin_regexp_dispatch_helper (const ecma_value_t *arguments_list_p, /**< return ecma_raise_type_error (ECMA_ERR_MSG ("Invalid argument is passed to RegExp function")); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t ret_value = ECMA_VALUE_ERROR; ecma_object_t *new_target_obj_p = ecma_op_regexp_alloc (new_target_p); if (JERRY_LIKELY (new_target_obj_p != NULL)) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (create_regexp_from_bc) { ret_value = ecma_op_create_regexp_from_bytecode (new_target_obj_p, bc_p); JERRY_ASSERT (!ECMA_IS_VALUE_ERROR (ret_value)); } else -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { ret_value = ecma_op_create_regexp_from_pattern (new_target_obj_p, pattern_value, flags_value); @@ -179,13 +179,13 @@ ecma_builtin_regexp_dispatch_helper (const ecma_value_t *arguments_list_p, /**< } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (free_arguments) { ecma_free_value (pattern_value); ecma_free_value (flags_value); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return ret_value; } /* ecma_builtin_regexp_dispatch_helper */ @@ -218,7 +218,7 @@ ecma_builtin_regexp_dispatch_construct (const ecma_value_t *arguments_list_p, /* arguments_list_len); } /* ecma_builtin_regexp_dispatch_construct */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * 21.2.4.2 get RegExp [ @@species ] accessor * @@ -230,7 +230,7 @@ ecma_builtin_regexp_species_get (ecma_value_t this_value) /**< This Value */ { return ecma_copy_value (this_value); } /* ecma_builtin_regexp_species_get */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} @@ -238,4 +238,4 @@ ecma_builtin_regexp_species_get (ecma_value_t this_value) /**< This Value */ * @} */ -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.inc.h index 2cdfc4db7..f64cea941 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH, 2, @@ -30,7 +30,7 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_REGEXP_PROTOTYPE, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_REGEXP_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) @@ -39,8 +39,8 @@ STRING_VALUE (LIT_MAGIC_STRING_NAME, ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ecma_builtin_regexp_species_get, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.c index eadf2e0b7..17ca0cecd 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.c @@ -17,7 +17,7 @@ #include "ecma-builtins.h" #include "ecma-container-object.h" -#if ENABLED (JERRY_BUILTIN_SET) +#if JERRY_BUILTIN_SET #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -60,4 +60,4 @@ ecma_builtin_set_iterator_prototype_object_next (ecma_value_t this_val) /**< thi * @} */ -#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#endif /* JERRY_BUILTIN_SET */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.inc.h index 559d833c8..3c590d2c1 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_SET) +#if JERRY_BUILTIN_SET STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_SET_ITERATOR_UL, @@ -29,6 +29,6 @@ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_MAGIC_STRING_NEXT, ecma_builtin_set_iterator_prototype_object_next, 0, 0) -#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#endif /* JERRY_BUILTIN_SET */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.c index 050ebed6b..24d3f2549 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.c @@ -15,7 +15,7 @@ #include "ecma-container-object.h" -#if ENABLED (JERRY_BUILTIN_SET) +#if JERRY_BUILTIN_SET #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -62,4 +62,4 @@ ecma_builtin_set_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< bu * @} */ -#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#endif /* JERRY_BUILTIN_SET */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.inc.h index d241ca5e8..8d0d6f0c2 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_SET) +#if JERRY_BUILTIN_SET /* Object properties: * (property name, object pointer getter) */ @@ -53,6 +53,6 @@ ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_SIZE, ECMA_CONTAINER_ROUTINE_SIZE_GETTER, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#endif /* JERRY_BUILTIN_SET */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set.c b/jerry-core/ecma/builtin-objects/ecma-builtin-set.c index 55449b24b..66c0ef9a4 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-set.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set.c @@ -17,7 +17,7 @@ #include "ecma-exceptions.h" #include "ecma-container-object.h" -#if ENABLED (JERRY_BUILTIN_SET) +#if JERRY_BUILTIN_SET #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -83,4 +83,4 @@ ecma_builtin_set_species_get (ecma_value_t this_value) /**< This Value */ * @} */ -#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#endif /* JERRY_BUILTIN_SET */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-set.inc.h index e4167abe6..99dcf3049 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-set.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_SET) +#if JERRY_BUILTIN_SET /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -47,6 +47,6 @@ ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ecma_builtin_set_species_get, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#endif /* JERRY_BUILTIN_SET */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.c index be0cda669..afbd358d6 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.c @@ -17,7 +17,7 @@ #include "ecma-builtins.h" #include "ecma-iterator-object.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -144,4 +144,4 @@ ecma_builtin_string_iterator_prototype_object_next (ecma_value_t this_val) /**< * @} */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.inc.h index 4344e860b..be8474994 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-string-iterator-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, LIT_MAGIC_STRING_STRING_ITERATOR_UL, @@ -29,6 +29,6 @@ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_MAGIC_STRING_NEXT, ecma_builtin_string_iterator_prototype_object_next, 0, 0) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.c index 6e251db67..c508766d9 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.c @@ -33,11 +33,11 @@ #include "lit-char-helpers.h" #include "lit-strings.h" -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP #include "ecma-regexp-object.h" -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ -#if ENABLED (JERRY_BUILTIN_STRING) +#if JERRY_BUILTIN_STRING #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -276,7 +276,7 @@ ecma_builtin_string_prototype_object_locale_compare (ecma_string_t *this_string_ return ecma_make_number_value (result); } /* ecma_builtin_string_prototype_object_locale_compare */ -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP /** * The String.prototype object's 'match' routine * @@ -290,7 +290,7 @@ static ecma_value_t ecma_builtin_string_prototype_object_match (ecma_value_t this_argument, /**< this argument */ ecma_value_t regexp_arg) /**< routine's argument */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* 3. */ if (!(ecma_is_value_undefined (regexp_arg) || ecma_is_value_null (regexp_arg))) { @@ -352,7 +352,7 @@ ecma_builtin_string_prototype_object_match (ecma_value_t this_argument, /**< thi return ret_value; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ if (ecma_object_is_regexp_object (regexp_arg)) { return ecma_regexp_match_helper (regexp_arg, this_argument); @@ -378,10 +378,10 @@ ecma_builtin_string_prototype_object_match (ecma_value_t this_argument, /**< thi ecma_free_value (new_regexp); return result; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* ecma_builtin_string_prototype_object_match */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * The String.prototype object's 'matchAll' routine * @@ -505,7 +505,7 @@ ecma_builtin_string_prototype_object_match_all (ecma_value_t this_argument, /**< return ret_value; } /* ecma_builtin_string_prototype_object_match_all */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * The String.prototype object's 'replace' and 'replaceAll' routine @@ -524,7 +524,7 @@ ecma_builtin_string_prototype_object_replace_helper (ecma_value_t this_value, /* ecma_value_t replace_value, /**< routine's second argument */ bool replace_all) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (!(ecma_is_value_undefined (search_value) || ecma_is_value_null (search_value))) { if (replace_all) @@ -598,12 +598,12 @@ ecma_builtin_string_prototype_object_replace_helper (ecma_value_t this_value, /* return replace_result; } } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ if (ecma_object_is_regexp_object (search_value)) { return ecma_regexp_replace_helper (search_value, this_value, replace_value); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_string_t *input_str_p = ecma_op_to_string (this_value); @@ -785,7 +785,7 @@ static ecma_value_t ecma_builtin_string_prototype_object_search (ecma_value_t this_value, /**< this argument */ ecma_value_t regexp_value) /**< routine's argument */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (!(ecma_is_value_undefined (regexp_value) || ecma_is_value_null (regexp_value))) { ecma_object_t *obj_p = ecma_get_object_from_value (ecma_op_to_object (regexp_value)); @@ -812,12 +812,12 @@ ecma_builtin_string_prototype_object_search (ecma_value_t this_value, /**< this return search_result; } } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ if (ecma_object_is_regexp_object (regexp_value)) { return ecma_regexp_search_helper (regexp_value, this_value); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t result = ECMA_VALUE_ERROR; @@ -854,22 +854,22 @@ ecma_builtin_string_prototype_object_search (ecma_value_t this_value, /**< this goto cleanup_string; } -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT result = ecma_regexp_search_helper (new_regexp, ecma_make_string_value (string_p)); ecma_deref_object (ecma_get_object_from_value (new_regexp)); -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ ecma_object_t *regexp_obj_p = ecma_get_object_from_value (new_regexp); ecma_value_t this_str_value = ecma_make_string_value (string_p); result = ecma_op_invoke_by_symbol_id (new_regexp, LIT_GLOBAL_SYMBOL_SEARCH, &this_str_value, 1); ecma_deref_object (regexp_obj_p); -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ cleanup_string: ecma_deref_ecma_string (string_p); return result; } /* ecma_builtin_string_prototype_object_search */ -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ /** * The String.prototype object's 'slice' routine @@ -934,7 +934,7 @@ ecma_builtin_string_prototype_object_split (ecma_value_t this_value, /**< this a ecma_value_t separator_value, /**< separator */ ecma_value_t limit_value) /**< limit */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (!(ecma_is_value_undefined (separator_value) || ecma_is_value_null (separator_value))) { ecma_object_t *obj_p = ecma_get_object_from_value (ecma_op_to_object (separator_value)); @@ -963,12 +963,12 @@ ecma_builtin_string_prototype_object_split (ecma_value_t this_value, /**< this a return split_result; } } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ if (ecma_object_is_regexp_object (separator_value)) { return ecma_regexp_split_helper (separator_value, this_value, limit_value); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t result = ECMA_VALUE_ERROR; @@ -1205,7 +1205,7 @@ ecma_builtin_string_prototype_object_conversion_helper (ecma_string_t *input_str { lit_code_point_t cp = lit_cesu8_read_next (&input_curr_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (lit_is_code_point_utf16_high_surrogate (cp) && input_curr_p < input_str_end_p) { @@ -1216,7 +1216,7 @@ ecma_builtin_string_prototype_object_conversion_helper (ecma_string_t *input_str input_curr_p += LIT_UTF8_MAX_BYTES_IN_CODE_UNIT; } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (lower_case) { @@ -1250,7 +1250,7 @@ ecma_builtin_string_prototype_object_trim (ecma_string_t *original_string_p) /** return ecma_make_string_value (trimmed_string_p); } /* ecma_builtin_string_prototype_object_trim */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * The String.prototype object's 'repeat' routine @@ -1366,9 +1366,9 @@ ecma_builtin_string_prototype_object_code_point_at (ecma_string_t *this_string_p return ecma_make_uint32_value (lit_convert_surrogate_pair_to_code_point (first, second)); } /* ecma_builtin_string_prototype_object_code_point_at */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB /** * The String.prototype object's 'substr' routine @@ -1429,9 +1429,9 @@ ecma_builtin_string_prototype_object_substr (ecma_string_t *this_string_p, /**< return ecma_make_string_value (new_str_p); } /* ecma_builtin_string_prototype_object_substr */ -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ +#endif /* JERRY_BUILTIN_ANNEXB */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * The String.prototype object's @@iterator routine @@ -1451,7 +1451,7 @@ ecma_builtin_string_prototype_object_iterator (ecma_value_t to_string) /**< this ECMA_ITERATOR_VALUES); } /* ecma_builtin_string_prototype_object_iterator */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Dispatcher of the built-in's routines @@ -1480,19 +1480,19 @@ ecma_builtin_string_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< ecma_value_t arg1 = arguments_list_p[0]; ecma_value_t arg2 = arguments_list_p[1]; -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP if (builtin_routine_id == ECMA_STRING_PROTOTYPE_MATCH) { return ecma_builtin_string_prototype_object_match (this_arg, arg1); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (builtin_routine_id == ECMA_STRING_PROTOTYPE_MATCH_ALL) { return ecma_builtin_string_prototype_object_match_all (this_arg, arg1); } -#endif /* ENABLED (JERRY_ESNEXT) */ -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_ESNEXT */ +#endif /* JERRY_BUILTIN_REGEXP */ if (builtin_routine_id <= ECMA_STRING_PROTOTYPE_CHAR_CODE_AT) { @@ -1501,18 +1501,18 @@ ecma_builtin_string_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< builtin_routine_id == ECMA_STRING_PROTOTYPE_CHAR_CODE_AT); } -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP if (builtin_routine_id == ECMA_STRING_PROTOTYPE_REPLACE) { return ecma_builtin_string_prototype_object_replace_helper (this_arg, arg1, arg2, false); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (builtin_routine_id == ECMA_STRING_PROTOTYPE_REPLACE_ALL) { return ecma_builtin_string_prototype_object_replace_helper (this_arg, arg1, arg2, true); } -#endif /* ENABLED (JERRY_ESNEXT) */ -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_ESNEXT */ +#endif /* JERRY_BUILTIN_REGEXP */ ecma_string_t *string_p = ecma_op_to_string (this_arg); @@ -1538,11 +1538,11 @@ ecma_builtin_string_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< } case ECMA_STRING_PROTOTYPE_LAST_INDEX_OF: case ECMA_STRING_PROTOTYPE_INDEX_OF: -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case ECMA_STRING_PROTOTYPE_STARTS_WITH: case ECMA_STRING_PROTOTYPE_INCLUDES: case ECMA_STRING_PROTOTYPE_ENDS_WITH: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { ecma_string_index_of_mode_t mode; mode = (ecma_string_index_of_mode_t) (builtin_routine_id - ECMA_STRING_PROTOTYPE_LAST_INDEX_OF); @@ -1554,13 +1554,13 @@ ecma_builtin_string_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< ret_value = ecma_builtin_string_prototype_object_locale_compare (string_p, arg1); break; } -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP case ECMA_STRING_PROTOTYPE_SEARCH: { ret_value = ecma_builtin_string_prototype_object_search (to_string_val, arg1); break; } -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ case ECMA_STRING_PROTOTYPE_SPLIT: { ret_value = ecma_builtin_string_prototype_object_split (to_string_val, arg1, arg2); @@ -1585,14 +1585,14 @@ ecma_builtin_string_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< ret_value = ecma_builtin_string_prototype_object_trim (string_p); break; } -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB case ECMA_STRING_PROTOTYPE_SUBSTR: { ret_value = ecma_builtin_string_prototype_object_substr (string_p, arg1, arg2); break; } -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ -#if ENABLED (JERRY_ESNEXT) +#endif /* JERRY_BUILTIN_ANNEXB */ +#if JERRY_ESNEXT case ECMA_STRING_PROTOTYPE_REPEAT: { ret_value = ecma_builtin_string_prototype_object_repeat (string_p, arg1); @@ -1614,7 +1614,7 @@ ecma_builtin_string_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< ret_value = ecma_string_pad (to_string_val, arg1, arg2, builtin_routine_id == ECMA_STRING_PROTOTYPE_PAD_START); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { JERRY_UNREACHABLE (); @@ -1632,4 +1632,4 @@ ecma_builtin_string_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< * @} */ -#endif /* ENABLED (JERRY_BUILTIN_STRING) */ +#endif /* JERRY_BUILTIN_STRING */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.inc.h index 39b45e178..10d28ddb9 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_STRING) +#if JERRY_BUILTIN_STRING /* Object properties: * (property name, object pointer getter) */ @@ -49,14 +49,14 @@ ROUTINE (LIT_MAGIC_STRING_CHAR_AT_UL, ECMA_STRING_PROTOTYPE_CHAR_AT, 1, 1) ROUTINE (LIT_MAGIC_STRING_CHAR_CODE_AT_UL, ECMA_STRING_PROTOTYPE_CHAR_CODE_AT, 1, 1) ROUTINE (LIT_MAGIC_STRING_LOCALE_COMPARE_UL, ECMA_STRING_PROTOTYPE_LOCALE_COMPARE, 1, 1) -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP ROUTINE (LIT_MAGIC_STRING_MATCH, ECMA_STRING_PROTOTYPE_MATCH, 1, 1) ROUTINE (LIT_MAGIC_STRING_REPLACE, ECMA_STRING_PROTOTYPE_REPLACE, 2, 2) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ROUTINE (LIT_MAGIC_STRING_REPLACE_ALL, ECMA_STRING_PROTOTYPE_REPLACE_ALL, 2, 2) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ROUTINE (LIT_MAGIC_STRING_SEARCH, ECMA_STRING_PROTOTYPE_SEARCH, 1, 1) -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ ROUTINE (LIT_MAGIC_STRING_SPLIT, ECMA_STRING_PROTOTYPE_SPLIT, 2, 2) ROUTINE (LIT_MAGIC_STRING_SUBSTRING, ECMA_STRING_PROTOTYPE_SUBSTRING, 2, 2) @@ -66,11 +66,11 @@ ROUTINE (LIT_MAGIC_STRING_TO_UPPER_CASE_UL, ECMA_STRING_PROTOTYPE_TO_UPPER_CASE, ROUTINE (LIT_MAGIC_STRING_TO_LOCALE_UPPER_CASE_UL, ECMA_STRING_PROTOTYPE_TO_LOCAL_UPPER_CASE, 0, 0) ROUTINE (LIT_MAGIC_STRING_TRIM, ECMA_STRING_PROTOTYPE_TRIM, 0, 0) -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB ROUTINE (LIT_MAGIC_STRING_SUBSTR, ECMA_STRING_PROTOTYPE_SUBSTR, 2, 2) -#endif /* ENABLED (JERRY_BUILTIN_ANNEXB) */ +#endif /* JERRY_BUILTIN_ANNEXB */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ROUTINE (LIT_MAGIC_STRING_REPEAT, ECMA_STRING_PROTOTYPE_REPEAT, 1, 1) ROUTINE (LIT_MAGIC_STRING_STARTS_WITH, ECMA_STRING_PROTOTYPE_STARTS_WITH, 2, 1) ROUTINE (LIT_MAGIC_STRING_INCLUDES, ECMA_STRING_PROTOTYPE_INCLUDES, 2, 1) @@ -89,8 +89,8 @@ INTRINSIC_PROPERTY (LIT_MAGIC_STRING_TRIM_END, LIT_MAGIC_STRING_TRIM_END, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) INTRINSIC_PROPERTY (LIT_MAGIC_STRING_TRIM_RIGHT, LIT_MAGIC_STRING_TRIM_END, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#endif /* ENABLED (JERRY_BUILTIN_STRING) */ +#endif /* JERRY_BUILTIN_STRING */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-string.c b/jerry-core/ecma/builtin-objects/ecma-builtin-string.c index 2ba965d37..3e625cf70 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-string.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-string.c @@ -23,12 +23,12 @@ #include "ecma-helpers.h" #include "ecma-objects.h" #include "ecma-string-object.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #include "ecma-symbol-object.h" -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_STRING) +#if JERRY_BUILTIN_STRING #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -108,7 +108,7 @@ ecma_builtin_string_object_from_char_code (ecma_value_t this_arg, /**< 'this' ar return isError ? ECMA_VALUE_ERROR : ecma_make_string_value (ret_string_p); } /* ecma_builtin_string_object_from_char_code */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * The String object's 'raw' routine @@ -328,7 +328,7 @@ ecma_builtin_string_object_from_code_point (ecma_value_t this_arg, /**< 'this' a return ecma_make_string_value (ret_str_p); } /* ecma_builtin_string_object_from_code_point */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Handle calling [[Call]] of built-in String object @@ -351,13 +351,13 @@ ecma_builtin_string_dispatch_call (const ecma_value_t *arguments_list_p, /**< ar { ret_value = ecma_make_magic_string_value (LIT_MAGIC_STRING__EMPTY); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* 2.a */ else if (ecma_is_value_symbol (arguments_list_p[0])) { ret_value = ecma_get_symbol_descriptive_string (arguments_list_p[0]); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* 2.b */ else { @@ -393,4 +393,4 @@ ecma_builtin_string_dispatch_construct (const ecma_value_t *arguments_list_p, /* * @} */ -#endif /* ENABLED (JERRY_BUILTIN_STRING) */ +#endif /* JERRY_BUILTIN_STRING */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-string.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-string.inc.h index 7d1b6fdc5..d571346c1 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-string.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-string.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_STRING) +#if JERRY_BUILTIN_STRING /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -36,21 +36,21 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_STRING_PROTOTYPE, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_STRING_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* Routine properties: * (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */ ROUTINE (LIT_MAGIC_STRING_FROM_CHAR_CODE_UL, ecma_builtin_string_object_from_char_code, NON_FIXED, 1) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ROUTINE (LIT_MAGIC_STRING_FROM_CODE_POINT_UL, ecma_builtin_string_object_from_code_point, NON_FIXED, 1) ROUTINE (LIT_MAGIC_STRING_RAW, ecma_builtin_string_object_raw, NON_FIXED, 1) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#endif /* ENABLED (JERRY_BUILTIN_STRING) */ +#endif /* JERRY_BUILTIN_STRING */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.c index 1c415a14c..9bd30dce5 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.c @@ -24,7 +24,7 @@ #include "ecma-symbol-object.h" #include "jrt.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -111,4 +111,4 @@ ecma_builtin_symbol_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< * @} */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.inc.h index d502de18f..15ff82a08 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* Object properties: * (property name, object pointer getter) */ @@ -44,6 +44,6 @@ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG, ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_DESCRIPTION, ECMA_SYMBOL_PROTOTYPE_DESCRIPTION, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.c b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.c index 5668492db..5cec6a053 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.c @@ -26,7 +26,7 @@ #include "jcontext.h" #include "jrt.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -255,4 +255,4 @@ ecma_builtin_symbol_key_for (ecma_value_t this_arg, /**< this argument */ * @} */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.inc.h index 0eeaf57cf..a2037c82a 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -98,6 +98,6 @@ SYMBOL_VALUE (LIT_MAGIC_STRING_MATCH_ALL, ROUTINE (LIT_MAGIC_STRING_FOR, ecma_builtin_symbol_for, 1, 1) ROUTINE (LIT_MAGIC_STRING_KEY_FOR, ecma_builtin_symbol_key_for, 1, 1) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.c index 3480c8fd0..915c586f4 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.c @@ -24,7 +24,7 @@ #include "ecma-string-object.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -33,4 +33,4 @@ #define BUILTIN_UNDERSCORED_ID syntax_error_prototype #include "ecma-builtin-internal-routines-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.inc.h index 827290ade..abaf5a4f6 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS /* Object properties: * (property name, object pointer getter) */ @@ -39,6 +39,6 @@ STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, LIT_MAGIC_STRING__EMPTY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.c b/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.c index 23cf1dbaa..e8bfc56ee 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.c @@ -26,7 +26,7 @@ #include "jrt.h" #include "jcontext.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -66,9 +66,9 @@ ecma_value_t ecma_builtin_syntax_error_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */ uint32_t arguments_list_len) /**< number of arguments */ { -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT return ecma_builtin_syntax_error_dispatch_call (arguments_list_p, arguments_list_len); -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), ECMA_BUILTIN_ID_SYNTAX_ERROR_PROTOTYPE); @@ -88,7 +88,7 @@ ecma_builtin_syntax_error_dispatch_construct (const ecma_value_t *arguments_list ecma_deref_object (proto_p); return result; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* ecma_builtin_syntax_error_dispatch_construct */ /** @@ -97,4 +97,4 @@ ecma_builtin_syntax_error_dispatch_construct (const ecma_value_t *arguments_list * @} */ -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.inc.h index 2e80ad495..88e12d51e 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -36,12 +36,12 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_SYNTAX_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_SYNTAX_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror-prototype.c index ab96a5e5c..45ad82101 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror-prototype.c @@ -24,7 +24,7 @@ #include "ecma-string-object.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -33,4 +33,4 @@ #define BUILTIN_UNDERSCORED_ID type_error_prototype #include "ecma-builtin-internal-routines-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror-prototype.inc.h index d570124c7..b34fb39ec 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS /* Object properties: * (property name, object pointer getter) */ @@ -39,6 +39,6 @@ STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, LIT_MAGIC_STRING__EMPTY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.c b/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.c index d6c12ce04..1ad2fd48d 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.c @@ -26,7 +26,7 @@ #include "jrt.h" #include "jcontext.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -66,9 +66,9 @@ ecma_value_t ecma_builtin_type_error_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */ uint32_t arguments_list_len) /**< number of arguments */ { -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT return ecma_builtin_type_error_dispatch_call (arguments_list_p, arguments_list_len); -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), ECMA_BUILTIN_ID_TYPE_ERROR_PROTOTYPE); @@ -88,7 +88,7 @@ ecma_builtin_type_error_dispatch_construct (const ecma_value_t *arguments_list_p ecma_deref_object (proto_p); return result; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* ecma_builtin_type_error_dispatch_construct */ /** @@ -97,4 +97,4 @@ ecma_builtin_type_error_dispatch_construct (const ecma_value_t *arguments_list_p * @} */ -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.inc.h index 528accaa8..bcd735b1d 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -36,12 +36,12 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_TYPE_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_TYPE_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-urierror-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-urierror-prototype.c index 4f97be4f8..068ec26a0 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-urierror-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-urierror-prototype.c @@ -24,7 +24,7 @@ #include "ecma-string-object.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -33,4 +33,4 @@ #define BUILTIN_UNDERSCORED_ID uri_error_prototype #include "ecma-builtin-internal-routines-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-urierror-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-urierror-prototype.inc.h index 9f9213175..caa932cdc 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-urierror-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-urierror-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS /* Object properties: * (property name, object pointer getter) */ @@ -39,6 +39,6 @@ STRING_VALUE (LIT_MAGIC_STRING_MESSAGE, LIT_MAGIC_STRING__EMPTY, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.c b/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.c index ee592b761..da0f4e5ec 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.c @@ -26,7 +26,7 @@ #include "jrt.h" #include "jcontext.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -66,9 +66,9 @@ ecma_value_t ecma_builtin_uri_error_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */ uint32_t arguments_list_len) /**< number of arguments */ { -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT return ecma_builtin_uri_error_dispatch_call (arguments_list_p, arguments_list_len); -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), ECMA_BUILTIN_ID_URI_ERROR_PROTOTYPE); @@ -88,7 +88,7 @@ ecma_builtin_uri_error_dispatch_construct (const ecma_value_t *arguments_list_p, ecma_deref_object (proto_p); return result; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* ecma_builtin_uri_error_dispatch_construct */ /** @@ -97,4 +97,4 @@ ecma_builtin_uri_error_dispatch_construct (const ecma_value_t *arguments_list_p, * @} */ -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.inc.h index f17fc2579..08259451a 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -36,12 +36,12 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_URI_ERROR_PROTOTYPE, ECMA_PROPERTY_FIXED) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT STRING_VALUE (LIT_MAGIC_STRING_NAME, LIT_MAGIC_STRING_URI_ERROR_UL, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.c index a3f7fdf5c..8bc364b1c 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.c @@ -15,7 +15,7 @@ #include "ecma-container-object.h" -#if ENABLED (JERRY_BUILTIN_WEAKMAP) +#if JERRY_BUILTIN_WEAKMAP #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -62,4 +62,4 @@ ecma_builtin_weakmap_prototype_dispatch_routine (uint8_t builtin_routine_id, /** * @} */ -#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ +#endif /* JERRY_BUILTIN_WEAKMAP */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.inc.h index 5be7450be..c0333f6f9 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_WEAKMAP) +#if JERRY_BUILTIN_WEAKMAP /* Object properties: * (property name, object pointer getter) */ @@ -41,6 +41,6 @@ ROUTINE (LIT_MAGIC_STRING_GET, ECMA_CONTAINER_ROUTINE_GET, 1, 1) ROUTINE (LIT_MAGIC_STRING_HAS, ECMA_CONTAINER_ROUTINE_HAS, 1, 1) ROUTINE (LIT_MAGIC_STRING_SET, ECMA_CONTAINER_ROUTINE_SET, 2, 2) -#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ +#endif /* JERRY_BUILTIN_WEAKMAP */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.c b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.c index 3e0cd2dee..326835f71 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.c @@ -17,7 +17,7 @@ #include "ecma-exceptions.h" #include "ecma-container-object.h" -#if ENABLED (JERRY_BUILTIN_WEAKMAP) +#if JERRY_BUILTIN_WEAKMAP #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -71,4 +71,4 @@ ecma_builtin_weakmap_dispatch_construct (const ecma_value_t *arguments_list_p, / * @} */ -#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ +#endif /* JERRY_BUILTIN_WEAKMAP */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.inc.h index c6e25a635..52d938359 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_WEAKMAP) +#if JERRY_BUILTIN_WEAKMAP /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -42,6 +42,6 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_WEAKMAP_PROTOTYPE, ECMA_PROPERTY_FIXED) -#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ +#endif /* JERRY_BUILTIN_WEAKMAP */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.c index 599687e58..ec59b676f 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.c @@ -15,7 +15,7 @@ #include "ecma-container-object.h" -#if ENABLED (JERRY_BUILTIN_WEAKSET) +#if JERRY_BUILTIN_WEAKSET #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -64,4 +64,4 @@ ecma_builtin_weakset_prototype_dispatch_routine (uint8_t builtin_routine_id, /** * @} */ -#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ +#endif /* JERRY_BUILTIN_WEAKSET */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.inc.h index 109ea047d..b03502f40 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_WEAKSET) +#if JERRY_BUILTIN_WEAKSET /* Object properties: * (property name, object pointer getter) */ @@ -40,6 +40,6 @@ ROUTINE (LIT_MAGIC_STRING_ADD, ECMA_CONTAINER_ROUTINE_ADD, 1, 1) ROUTINE (LIT_MAGIC_STRING_DELETE, ECMA_CONTAINER_ROUTINE_DELETE_WEAK, 1, 1) ROUTINE (LIT_MAGIC_STRING_HAS, ECMA_CONTAINER_ROUTINE_HAS, 1, 1) -#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ +#endif /* JERRY_BUILTIN_WEAKSET */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.c b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.c index 538f7dee6..a854c235e 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.c @@ -17,7 +17,7 @@ #include "ecma-exceptions.h" #include "ecma-container-object.h" -#if ENABLED (JERRY_BUILTIN_WEAKSET) +#if JERRY_BUILTIN_WEAKSET #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -71,4 +71,4 @@ ecma_builtin_weakset_dispatch_construct (const ecma_value_t *arguments_list_p, / * @} */ -#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ +#endif /* JERRY_BUILTIN_WEAKSET */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.inc.h index 9d70c3878..e5753012e 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_WEAKSET) +#if JERRY_BUILTIN_WEAKSET /* Number properties: * (property name, number value, writable, enumerable, configurable) */ @@ -42,6 +42,6 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, ECMA_BUILTIN_ID_WEAKSET_PROTOTYPE, ECMA_PROPERTY_FIXED) -#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ +#endif /* JERRY_BUILTIN_WEAKSET */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/ecma-builtins-internal.h b/jerry-core/ecma/builtin-objects/ecma-builtins-internal.h index f4cb230d3..a158c0f05 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtins-internal.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtins-internal.h @@ -31,12 +31,12 @@ typedef enum ECMA_BUILTIN_PROPERTY_SIMPLE, /**< simple value property */ ECMA_BUILTIN_PROPERTY_NUMBER, /**< number value property */ ECMA_BUILTIN_PROPERTY_STRING, /**< string value property */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ECMA_BUILTIN_PROPERTY_SYMBOL, /**< symbol value property */ ECMA_BUILTIN_PROPERTY_INTRINSIC_PROPERTY, /**< intrinsic routine property */ ECMA_BUILTIN_PROPERTY_ACCESSOR_BUILTIN_FUNCTION, /**< full accessor property with builtin function object getter/setter pair */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ECMA_BUILTIN_PROPERTY_OBJECT, /**< builtin object property */ ECMA_BUILTIN_PROPERTY_ROUTINE, /**< routine property */ ECMA_BUILTIN_PROPERTY_ACCESSOR_READ_WRITE, /**< full accessor property */ @@ -51,11 +51,11 @@ typedef enum { ECMA_BUILTIN_NUMBER_MAX = 256, /**< value of ECMA_NUMBER_MAX_VALUE */ ECMA_BUILTIN_NUMBER_MIN, /**< value of ECMA_NUMBER_MIN_VALUE */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ECMA_BUILTIN_NUMBER_EPSILON, /**< value of ECMA_NUMBER_EPSILON */ ECMA_BUILTIN_NUMBER_MAX_SAFE_INTEGER, /**< value of ECMA_NUMBER_MAX_SAFE_INTEGER */ ECMA_BUILTIN_NUMBER_MIN_SAFE_INTEGER, /**< value of ECMA_NUMBER_MIN_SAFE_INTEGER */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ECMA_BUILTIN_NUMBER_E, /**< value of ECMA_NUMBER_E */ ECMA_BUILTIN_NUMBER_PI, /**< value of ECMA_NUMBER_PI */ ECMA_BUILTIN_NUMBER_LN10, /**< value of ECMA_NUMBER_LN10 */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtins.c b/jerry-core/ecma/builtin-objects/ecma-builtins.c index 6de1bd8e3..8f50d44cd 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtins.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtins.c @@ -343,7 +343,7 @@ ecma_builtin_function_is_routine (ecma_object_t *func_obj_p) /**< function objec return (ext_func_obj_p->u.built_in.routine_id != 0); } /* ecma_builtin_function_is_routine */ -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS /** * Get reference to the realm provided by another built-in object @@ -373,7 +373,7 @@ ecma_builtin_get_realm (ecma_object_t *builtin_object_p) /**< built-in object */ return ECMA_GET_INTERNAL_VALUE_POINTER (ecma_global_object_t, realm_value); } /* ecma_builtin_get_realm */ -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ /** * Instantiate specified ECMA built-in object @@ -394,7 +394,6 @@ ecma_instantiate_builtin (ecma_global_object_t *global_object_p, /**< global obj ecma_object_t *prototype_obj_p; - /* cppcheck-suppress arrayIndexOutOfBoundsCond */ if (JERRY_UNLIKELY (object_prototype_builtin_id == ECMA_BUILTIN_ID__COUNT)) { prototype_obj_p = NULL; @@ -460,11 +459,11 @@ ecma_instantiate_builtin (ecma_global_object_t *global_object_p, /**< global obj built_in_props_p->routine_id = 0; built_in_props_p->u.length_and_bitset_size = 0; built_in_props_p->u2.instantiated_bitset[0] = 0; -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ECMA_SET_INTERNAL_VALUE_POINTER (built_in_props_p->realm_value, global_object_p); -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ built_in_props_p->continue_instantiated_bitset[0] = 0; -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ if (property_count > ECMA_BUILTIN_INSTANTIATED_BITSET_MIN_SIZE) { @@ -478,7 +477,7 @@ ecma_instantiate_builtin (ecma_global_object_t *global_object_p, /**< global obj /** Initializing [[PrimitiveValue]] properties of built-in prototype objects */ switch (obj_builtin_id) { -#if ENABLED (JERRY_BUILTIN_ARRAY) +#if JERRY_BUILTIN_ARRAY case ECMA_BUILTIN_ID_ARRAY_PROTOTYPE: { JERRY_ASSERT (obj_type == ECMA_OBJECT_TYPE_ARRAY); @@ -488,9 +487,9 @@ ecma_instantiate_builtin (ecma_global_object_t *global_object_p, /**< global obj ext_object_p->u.array.length_prop_and_hole_count = ECMA_PROPERTY_FLAG_WRITABLE | ECMA_PROPERTY_VIRTUAL; break; } -#endif /* ENABLED (JERRY_BUILTIN_ARRAY) */ +#endif /* JERRY_BUILTIN_ARRAY */ -#if ENABLED (JERRY_BUILTIN_STRING) +#if JERRY_BUILTIN_STRING case ECMA_BUILTIN_ID_STRING_PROTOTYPE: { JERRY_ASSERT (obj_type == ECMA_OBJECT_TYPE_CLASS); @@ -500,9 +499,9 @@ ecma_instantiate_builtin (ecma_global_object_t *global_object_p, /**< global obj ext_object_p->u.class_prop.u.value = ecma_make_magic_string_value (LIT_MAGIC_STRING__EMPTY); break; } -#endif /* ENABLED (JERRY_BUILTIN_STRING) */ +#endif /* JERRY_BUILTIN_STRING */ -#if ENABLED (JERRY_BUILTIN_NUMBER) +#if JERRY_BUILTIN_NUMBER case ECMA_BUILTIN_ID_NUMBER_PROTOTYPE: { JERRY_ASSERT (obj_type == ECMA_OBJECT_TYPE_CLASS); @@ -512,9 +511,9 @@ ecma_instantiate_builtin (ecma_global_object_t *global_object_p, /**< global obj ext_object_p->u.class_prop.u.value = ecma_make_integer_value (0); break; } -#endif /* ENABLED (JERRY_BUILTIN_NUMBER) */ +#endif /* JERRY_BUILTIN_NUMBER */ -#if ENABLED (JERRY_BUILTIN_BOOLEAN) +#if JERRY_BUILTIN_BOOLEAN case ECMA_BUILTIN_ID_BOOLEAN_PROTOTYPE: { JERRY_ASSERT (obj_type == ECMA_OBJECT_TYPE_CLASS); @@ -524,10 +523,10 @@ ecma_instantiate_builtin (ecma_global_object_t *global_object_p, /**< global obj ext_object_p->u.class_prop.u.value = ECMA_VALUE_FALSE; break; } -#endif /* ENABLED (JERRY_BUILTIN_BOOLEAN) */ +#endif /* JERRY_BUILTIN_BOOLEAN */ -#if !ENABLED (JERRY_ESNEXT) -#if ENABLED (JERRY_BUILTIN_DATE) +#if !JERRY_ESNEXT +#if JERRY_BUILTIN_DATE case ECMA_BUILTIN_ID_DATE_PROTOTYPE: { JERRY_ASSERT (obj_type == ECMA_OBJECT_TYPE_CLASS); @@ -540,9 +539,9 @@ ecma_instantiate_builtin (ecma_global_object_t *global_object_p, /**< global obj ECMA_SET_INTERNAL_VALUE_POINTER (ext_object_p->u.class_prop.u.value, prim_prop_num_value_p); break; } -#endif /* ENABLED (JERRY_BUILTIN_DATE) */ +#endif /* JERRY_BUILTIN_DATE */ -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP case ECMA_BUILTIN_ID_REGEXP_PROTOTYPE: { JERRY_ASSERT (obj_type == ECMA_OBJECT_TYPE_CLASS); @@ -559,8 +558,8 @@ ecma_instantiate_builtin (ecma_global_object_t *global_object_p, /**< global obj break; } -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_BUILTIN_REGEXP */ +#endif /* !JERRY_ESNEXT */ default: { JERRY_ASSERT (obj_type != ECMA_OBJECT_TYPE_CLASS); @@ -592,11 +591,11 @@ ecma_builtin_create_global_object (void) /* Whenever this assertion fails, the size of extra_instantiated_bitset in ecma_global_object_t * must be increased and 32 must be added to these constants. Furthermore the new uint32 item * must be set to zero. */ -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS JERRY_ASSERT (property_count <= ECMA_BUILTIN_INSTANTIATED_BITSET_MIN_SIZE + 64); -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ JERRY_ASSERT (property_count <= ECMA_BUILTIN_INSTANTIATED_BITSET_MIN_SIZE + 32); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ ecma_object_t *object_p = ecma_create_object (NULL, sizeof (ecma_global_object_t), obj_type); @@ -611,29 +610,29 @@ ecma_builtin_create_global_object (void) global_object_p->extended_object.u.built_in.u.length_and_bitset_size = 0; global_object_p->extended_object.u.built_in.u2.instantiated_bitset[0] = 0; global_object_p->extra_instantiated_bitset[0] = 0; -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ECMA_SET_INTERNAL_VALUE_POINTER (global_object_p->extended_object.u.built_in.realm_value, global_object_p); global_object_p->extra_realms_bitset = 0; global_object_p->this_binding = ecma_make_object_value (object_p); -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ global_object_p->extended_object.u.built_in.continue_instantiated_bitset[0] = 0; -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ memset (global_object_p->builtin_objects, 0, (sizeof (jmem_cpointer_t) * ECMA_BUILTIN_OBJECTS_COUNT)); /* Temporary self reference for GC mark. */ ECMA_SET_NON_NULL_POINTER (global_object_p->global_env_cp, object_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT global_object_p->global_scope_cp = global_object_p->global_env_cp; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_object_t *global_lex_env_p = ecma_create_object_lex_env (NULL, object_p, ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND); ECMA_SET_NON_NULL_POINTER (global_object_p->global_env_cp, global_lex_env_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT global_object_p->global_scope_cp = global_object_p->global_env_cp; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_deref_object (global_lex_env_p); ecma_object_t *prototype_object_p; @@ -669,7 +668,7 @@ ecma_builtin_get (ecma_builtin_id_t builtin_id) /**< id of built-in to check on return ECMA_GET_NON_NULL_POINTER (ecma_object_t, *builtin_p); } /* ecma_builtin_get */ -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS /** * Get reference to specified built-in object using the realm provided by another built-in object @@ -695,7 +694,7 @@ ecma_builtin_get_from_realm (ecma_global_object_t *global_object_p, /**< global return ECMA_GET_NON_NULL_POINTER (ecma_object_t, *builtin_p); } /* ecma_builtin_get_from_realm */ -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ /** * Get reference to specified built-in object using the realm provided by another built-in object @@ -711,12 +710,12 @@ ecma_builtin_get_from_builtin (ecma_object_t *builtin_object_p, /**< built-in ob { JERRY_ASSERT (builtin_id < ECMA_BUILTIN_OBJECTS_COUNT); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS return ecma_builtin_get_from_realm (ecma_builtin_get_realm (builtin_object_p), builtin_id); -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ JERRY_UNUSED (builtin_object_p); return ecma_builtin_get (builtin_id); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ } /* ecma_builtin_get_from_builtin */ /** @@ -764,9 +763,9 @@ ecma_builtin_make_function_object_for_routine (ecma_object_t *builtin_object_p, ext_func_obj_p->u.built_in.u.routine_index = (uint8_t) routine_index; ext_func_obj_p->u.built_in.u2.routine_flags = flags; -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ext_func_obj_p->u.built_in.realm_value = built_in_props_p->realm_value; -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ return func_obj_p; } /* ecma_builtin_make_function_object_for_routine */ @@ -807,7 +806,7 @@ ecma_builtin_make_function_object_for_setter_accessor (ecma_object_t *builtin_ob ECMA_BUILTIN_ROUTINE_SETTER); } /* ecma_builtin_make_function_object_for_setter_accessor */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Create specification defined properties for built-in native handlers. @@ -858,7 +857,7 @@ ecma_builtin_native_handler_try_to_instantiate_property (ecma_object_t *object_p return prop_p; } /* ecma_builtin_native_handler_try_to_instantiate_property */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Lazy instantiation of builtin routine property of builtin object @@ -879,12 +878,12 @@ ecma_builtin_routine_try_to_instantiate_property (ecma_object_t *object_p, /**< ecma_extended_object_t *ext_func_p = (ecma_extended_object_t *) object_p; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (ext_func_p->u.built_in.id == ECMA_BUILTIN_ID_HANDLER)) { return ecma_builtin_native_handler_try_to_instantiate_property (object_p, string_p); } -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ if (ecma_string_is_length (string_p)) { @@ -893,7 +892,7 @@ ecma_builtin_routine_try_to_instantiate_property (ecma_object_t *object_p, /**< */ ecma_property_t *len_prop_p; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint8_t *bitset_p = &ext_func_p->u.built_in.u2.routine_flags; if (*bitset_p & ECMA_BUILTIN_ROUTINE_LENGTH_INITIALIZED) @@ -909,14 +908,14 @@ ecma_builtin_routine_try_to_instantiate_property (ecma_object_t *object_p, /**< string_p, ECMA_PROPERTY_FLAG_CONFIGURABLE, &len_prop_p); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ /* We don't need to mark that the property was already lazy instantiated, * as it is non-configurable and so can't be deleted (ECMA-262 v5, 13.2.5) */ ecma_property_value_t *len_prop_value_p = ecma_create_named_data_property (object_p, string_p, ECMA_PROPERTY_FIXED, &len_prop_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ uint8_t length = 0; @@ -940,7 +939,7 @@ ecma_builtin_routine_try_to_instantiate_property (ecma_object_t *object_p, /**< return len_prop_p; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* * Lazy instantiation of 'name' property */ @@ -1016,7 +1015,7 @@ ecma_builtin_routine_try_to_instantiate_property (ecma_object_t *object_p, /**< return name_prop_p; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return NULL; } /* ecma_builtin_routine_try_to_instantiate_property */ @@ -1037,7 +1036,7 @@ ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, /**< object * lit_magic_string_id_t magic_string_id = ecma_get_string_magic (string_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (ecma_prop_name_is_symbol (string_p))) { if (string_p->u.hash & ECMA_GLOBAL_SYMBOL_FLAG) @@ -1045,7 +1044,7 @@ ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, /**< object * magic_string_id = (string_p->u.hash >> ECMA_GLOBAL_SYMBOL_SHIFT); } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (magic_string_id == LIT_MAGIC_STRING__COUNT) { @@ -1085,12 +1084,12 @@ ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, /**< object * uint32_t index = (uint32_t) (curr_property_p - property_list_p); uint8_t *bitset_p = built_in_props_p->u2.instantiated_bitset + (index >> 3); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS if (index >= 8 * sizeof (uint8_t)) { bitset_p += sizeof (ecma_value_t); } -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ uint8_t bit_for_index = (uint8_t) (1u << (index & 0x7)); @@ -1113,7 +1112,7 @@ ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, /**< object * { value = curr_property_p->value; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (value == ECMA_VALUE_GLOBAL_THIS) { /* Only the global object has globalThis property. */ @@ -1121,7 +1120,7 @@ ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, /**< object * ecma_ref_object (object_p); value = ecma_make_object_value (object_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ break; } case ECMA_BUILTIN_PROPERTY_NUMBER: @@ -1138,11 +1137,11 @@ ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, /**< object * { ECMA_NUMBER_MAX_VALUE, ECMA_NUMBER_MIN_VALUE, -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ECMA_NUMBER_EPSILON, ECMA_NUMBER_MAX_SAFE_INTEGER, ECMA_NUMBER_MIN_SAFE_INTEGER, -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ECMA_NUMBER_E, ECMA_NUMBER_PI, ECMA_NUMBER_LN10, @@ -1187,7 +1186,7 @@ ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, /**< object * value = ecma_make_magic_string_value ((lit_magic_string_id_t) curr_property_p->value); break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case ECMA_BUILTIN_PROPERTY_SYMBOL: { lit_magic_string_id_t symbol_id = (lit_magic_string_id_t) curr_property_p->value; @@ -1212,7 +1211,7 @@ ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, /**< object * ecma_ref_object (setter_p); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case ECMA_BUILTIN_PROPERTY_OBJECT: { ecma_object_t *builtin_object_p; @@ -1286,7 +1285,7 @@ ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, /**< object * return prop_p; } /* ecma_builtin_try_to_instantiate_property */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * List names of an Built-in native handler object's lazy instantiated properties, @@ -1314,7 +1313,7 @@ ecma_builtin_native_handler_list_lazy_property_names (ecma_object_t *object_p, / } } /* ecma_builtin_native_handler_list_lazy_property_names */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * List names of a built-in function's lazy instantiated properties @@ -1331,7 +1330,7 @@ ecma_builtin_routine_list_lazy_property_names (ecma_object_t *object_p, /**< a b JERRY_ASSERT (ecma_get_object_type (object_p) == ECMA_OBJECT_TYPE_NATIVE_FUNCTION); JERRY_ASSERT (ecma_builtin_function_is_routine (object_p)); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_extended_object_t *ext_func_p = (ecma_extended_object_t *) object_p; if (JERRY_UNLIKELY (ext_func_p->u.built_in.id == ECMA_BUILTIN_ID_HANDLER)) @@ -1352,11 +1351,11 @@ ecma_builtin_routine_list_lazy_property_names (ecma_object_t *object_p, /**< a b ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_NAME)); prop_counter_p->string_named_props++; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ /* 'length' property is non-enumerable (ECMA-262 v5, 15) */ ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_LENGTH)); prop_counter_p->string_named_props++; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* ecma_builtin_routine_list_lazy_property_names */ /** @@ -1395,11 +1394,11 @@ ecma_builtin_list_lazy_property_names (ecma_object_t *object_p, /**< a built-in uint32_t index = 0; uint8_t bitset = built_in_props_p->u2.instantiated_bitset[0]; -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS uint8_t *bitset_p = built_in_props_p->u2.instantiated_bitset + 1 + sizeof (ecma_value_t); -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ uint8_t *bitset_p = built_in_props_p->u2.instantiated_bitset + 1; -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ while (curr_property_p->magic_string_id != LIT_MAGIC_STRING__COUNT) { @@ -1413,7 +1412,7 @@ ecma_builtin_list_lazy_property_names (ecma_object_t *object_p, /**< a built-in if (curr_property_p->magic_string_id > LIT_NON_INTERNAL_MAGIC_STRING__COUNT) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (LIT_IS_GLOBAL_SYMBOL (curr_property_p->magic_string_id)) { ecma_string_t *name_p = ecma_op_get_global_symbol (curr_property_p->magic_string_id); @@ -1429,7 +1428,7 @@ ecma_builtin_list_lazy_property_names (ecma_object_t *object_p, /**< a built-in ecma_deref_ecma_string (name_p); } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } else { @@ -1511,13 +1510,13 @@ ecma_builtin_dispatch_call (ecma_object_t *obj_p, /**< built-in object */ if (ecma_builtin_function_is_routine (obj_p)) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (ext_obj_p->u.built_in.id == ECMA_BUILTIN_ID_HANDLER)) { ecma_native_handler_t handler = ecma_builtin_handler_get (ext_obj_p->u.built_in.routine_id); return handler (ecma_make_object_value (obj_p), this_arg_value, arguments_list_p, arguments_list_len); } -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ return ecma_builtin_dispatch_routine (ext_obj_p, this_arg_value, diff --git a/jerry-core/ecma/builtin-objects/ecma-builtins.h b/jerry-core/ecma/builtin-objects/ecma-builtins.h index 5be9d0714..412ae3569 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtins.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtins.h @@ -48,7 +48,7 @@ typedef enum ECMA_BUILTIN_ID__COUNT /**< number of built-in objects */ } ecma_builtin_id_t; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Special id for handlers (handlers are not regular built-ins, but @@ -62,7 +62,7 @@ typedef enum #define ECMA_BUILTIN_GLOBAL_SYMBOL_COUNT \ (LIT_GLOBAL_SYMBOL__LAST - LIT_GLOBAL_SYMBOL__FIRST + 1) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Construct a routine value @@ -106,14 +106,14 @@ typedef struct { ecma_extended_object_t extended_object; /**< extended object part */ uint32_t extra_instantiated_bitset[1]; /**< extra bit set for instantiated properties */ -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS uint32_t extra_realms_bitset; /**< extra bit set for instantiated properties when realms is enabled */ ecma_value_t this_binding; /**< 'this' binding of this global object */ -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ jmem_cpointer_t global_env_cp; /**< global lexical environment */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT jmem_cpointer_t global_scope_cp; /**< global lexical scope */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ jmem_cpointer_t builtin_objects[ECMA_BUILTIN_OBJECTS_COUNT]; /**< pointer to instances of built-in objects */ } ecma_global_object_t; @@ -150,9 +150,9 @@ ecma_builtin_get_global (void); bool ecma_builtin_function_is_routine (ecma_object_t *func_obj_p); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_object_t * ecma_builtin_get_from_realm (ecma_global_object_t *global_object_p, ecma_builtin_id_t builtin_id); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ #endif /* !ECMA_BUILTINS_H */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h index b5455174e..105459e91 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h +++ b/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h @@ -30,7 +30,7 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_OBJECT, true, object) -#if ENABLED (JERRY_BUILTIN_ARRAY) +#if JERRY_BUILTIN_ARRAY /* The Array.prototype object (15.4.4) */ BUILTIN (ECMA_BUILTIN_ID_ARRAY_PROTOTYPE, ECMA_OBJECT_TYPE_ARRAY, @@ -44,47 +44,47 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_ARRAY, ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, true, array) -#endif /* ENABLED (JERRY_BUILTIN_ARRAY) */ +#endif /* JERRY_BUILTIN_ARRAY */ -#if ENABLED (JERRY_ESNEXT) -# if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_ESNEXT +# if JERRY_BUILTIN_DATE /* The Date.prototype object (20.3.4) */ BUILTIN (ECMA_BUILTIN_ID_DATE_PROTOTYPE, ECMA_OBJECT_TYPE_GENERAL, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, true, date_prototype) -# endif /* ENABLED (JERRY_BUILTIN_DATE) */ +# endif /* JERRY_BUILTIN_DATE */ -# if ENABLED (JERRY_BUILTIN_REGEXP) +# if JERRY_BUILTIN_REGEXP /* The RegExp.prototype object (21.2.5) */ BUILTIN (ECMA_BUILTIN_ID_REGEXP_PROTOTYPE, ECMA_OBJECT_TYPE_GENERAL, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, true, regexp_prototype) -# endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ -#else /* !ENABLED (JERRY_ESNEXT) */ -# if ENABLED (JERRY_BUILTIN_DATE) +# endif /* JERRY_BUILTIN_REGEXP */ +#else /* !JERRY_ESNEXT */ +# if JERRY_BUILTIN_DATE /* The Date.prototype object (15.9.4) */ BUILTIN (ECMA_BUILTIN_ID_DATE_PROTOTYPE, ECMA_OBJECT_TYPE_CLASS, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, true, date_prototype) -# endif /* ENABLED (JERRY_BUILTIN_DATE) */ +# endif /* JERRY_BUILTIN_DATE */ -# if ENABLED (JERRY_BUILTIN_REGEXP) +# if JERRY_BUILTIN_REGEXP /* The RegExp.prototype object (15.10.6) */ BUILTIN (ECMA_BUILTIN_ID_REGEXP_PROTOTYPE, ECMA_OBJECT_TYPE_CLASS, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, true, regexp_prototype) -# endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ -#endif /* !ENABLED (JERRY_ESNEXT) */ +# endif /* JERRY_BUILTIN_REGEXP */ +#endif /* !JERRY_ESNEXT */ -#if ENABLED (JERRY_BUILTIN_STRING) +#if JERRY_BUILTIN_STRING /* The String.prototype object (15.5.4) */ BUILTIN (ECMA_BUILTIN_ID_STRING_PROTOTYPE, ECMA_OBJECT_TYPE_CLASS, @@ -98,9 +98,9 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_STRING, ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, true, string) -#endif /* ENABLED (JERRY_BUILTIN_STRING) */ +#endif /* JERRY_BUILTIN_STRING */ -#if ENABLED (JERRY_BUILTIN_BOOLEAN) +#if JERRY_BUILTIN_BOOLEAN /* The Boolean.prototype object (15.6.4) */ BUILTIN (ECMA_BUILTIN_ID_BOOLEAN_PROTOTYPE, ECMA_OBJECT_TYPE_CLASS, @@ -114,9 +114,9 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_BOOLEAN, ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, true, boolean) -#endif /* ENABLED (JERRY_BUILTIN_BOOLEAN) */ +#endif /* JERRY_BUILTIN_BOOLEAN */ -#if ENABLED (JERRY_BUILTIN_NUMBER) +#if JERRY_BUILTIN_NUMBER /* The Number.prototype object (15.7.4) */ BUILTIN (ECMA_BUILTIN_ID_NUMBER_PROTOTYPE, ECMA_OBJECT_TYPE_CLASS, @@ -130,7 +130,7 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_NUMBER, ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, true, number) -#endif /* ENABLED (JERRY_BUILTIN_NUMBER) */ +#endif /* JERRY_BUILTIN_NUMBER */ /* The Function.prototype object (15.3.4) */ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, @@ -146,16 +146,16 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_FUNCTION, true, function) -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH /* The Math object (15.8) */ BUILTIN (ECMA_BUILTIN_ID_MATH, ECMA_OBJECT_TYPE_GENERAL, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, true, math) -#endif /* ENABLED (JERRY_BUILTIN_MATH) */ +#endif /* JERRY_BUILTIN_MATH */ -#if ENABLED (JERRY_BUILTIN_REFLECT) +#if JERRY_BUILTIN_REFLECT /* The Reflect object (26.1) */ BUILTIN (ECMA_BUILTIN_ID_REFLECT, @@ -163,40 +163,40 @@ BUILTIN (ECMA_BUILTIN_ID_REFLECT, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, true, reflect) -#endif /* ENABLED (JERRY_BUILTIN_REFLECT) */ +#endif /* JERRY_BUILTIN_REFLECT */ -#if ENABLED (JERRY_BUILTIN_JSON) +#if JERRY_BUILTIN_JSON /* The JSON object (15.12) */ BUILTIN (ECMA_BUILTIN_ID_JSON, ECMA_OBJECT_TYPE_GENERAL, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE, true, json) -#endif /* ENABLED (JERRY_BUILTIN_JSON) */ +#endif /* JERRY_BUILTIN_JSON */ -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE /* The Date object (15.9.3) */ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_DATE, ECMA_OBJECT_TYPE_NATIVE_FUNCTION, ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, true, date) -#endif /* ENABLED (JERRY_BUILTIN_DATE) */ +#endif /* JERRY_BUILTIN_DATE */ -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP /* The RegExp object (15.10) */ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_REGEXP, ECMA_OBJECT_TYPE_NATIVE_FUNCTION, ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, true, regexp) -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define ECMA_BUILTIN_NATIVE_ERROR_PROTOTYPE_ID ECMA_BUILTIN_ID_ERROR -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ #define ECMA_BUILTIN_NATIVE_ERROR_PROTOTYPE_ID ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE -#endif /* ENABLED (JERRY_ESNEXT */ +#endif /* JERRY_ESNEXT */ /* The Error object (15.11.1) */ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_ERROR, @@ -212,7 +212,7 @@ BUILTIN (ECMA_BUILTIN_ID_ERROR_PROTOTYPE, true, error_prototype) -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS /* The EvalError.prototype object (15.11.6.1) */ BUILTIN (ECMA_BUILTIN_ID_EVAL_ERROR_PROTOTYPE, ECMA_OBJECT_TYPE_GENERAL, @@ -296,7 +296,7 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_URI_ERROR, ECMA_BUILTIN_NATIVE_ERROR_PROTOTYPE_ID, true, uri_error) -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ /**< The [[ThrowTypeError]] object (13.2.3) */ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_TYPE_ERROR_THROWER, @@ -305,7 +305,7 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_TYPE_ERROR_THROWER, false, type_error_thrower) -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY /* The ArrayBuffer.prototype object (ES2015 24.1.4) */ BUILTIN (ECMA_BUILTIN_ID_ARRAYBUFFER_PROTOTYPE, @@ -384,15 +384,15 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_FLOAT32ARRAY, true, float32array) -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 BUILTIN_ROUTINE (ECMA_BUILTIN_ID_FLOAT64ARRAY, ECMA_OBJECT_TYPE_NATIVE_FUNCTION, ECMA_BUILTIN_ID_TYPEDARRAY, true, float64array) -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT BUILTIN_ROUTINE (ECMA_BUILTIN_ID_BIGINT64ARRAY, ECMA_OBJECT_TYPE_NATIVE_FUNCTION, ECMA_BUILTIN_ID_TYPEDARRAY, @@ -404,7 +404,7 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_BIGUINT64ARRAY, ECMA_BUILTIN_ID_TYPEDARRAY, true, biguint64array) -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ BUILTIN (ECMA_BUILTIN_ID_INT8ARRAY_PROTOTYPE, ECMA_OBJECT_TYPE_GENERAL, @@ -454,15 +454,15 @@ BUILTIN (ECMA_BUILTIN_ID_FLOAT32ARRAY_PROTOTYPE, true, float32array_prototype) -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 BUILTIN (ECMA_BUILTIN_ID_FLOAT64ARRAY_PROTOTYPE, ECMA_OBJECT_TYPE_GENERAL, ECMA_BUILTIN_ID_TYPEDARRAY_PROTOTYPE, true, float64array_prototype) -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT BUILTIN (ECMA_BUILTIN_ID_BIGINT64ARRAY_PROTOTYPE, ECMA_OBJECT_TYPE_GENERAL, ECMA_BUILTIN_ID_TYPEDARRAY_PROTOTYPE, @@ -474,10 +474,10 @@ BUILTIN (ECMA_BUILTIN_ID_BIGUINT64ARRAY_PROTOTYPE, ECMA_BUILTIN_ID_TYPEDARRAY_PROTOTYPE, true, biguint64array_prototype) -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_BIGINT */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE BUILTIN (ECMA_BUILTIN_ID_PROMISE_PROTOTYPE, ECMA_OBJECT_TYPE_GENERAL, @@ -491,9 +491,9 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_PROMISE, true, promise) -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ -#if ENABLED (JERRY_BUILTIN_MAP) +#if JERRY_BUILTIN_MAP /* The Map prototype object (23.1.3) */ BUILTIN (ECMA_BUILTIN_ID_MAP_PROTOTYPE, @@ -509,9 +509,9 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_MAP, true, map) -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ +#endif /* JERRY_BUILTIN_MAP */ -#if ENABLED (JERRY_BUILTIN_SET) +#if JERRY_BUILTIN_SET /* The Set prototype object (23.1.3) */ BUILTIN (ECMA_BUILTIN_ID_SET_PROTOTYPE, @@ -527,9 +527,9 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_SET, true, set) -#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#endif /* JERRY_BUILTIN_SET */ -#if ENABLED (JERRY_BUILTIN_WEAKMAP) +#if JERRY_BUILTIN_WEAKMAP /* The WeakMap prototype object (23.1.3) */ BUILTIN (ECMA_BUILTIN_ID_WEAKMAP_PROTOTYPE, @@ -545,9 +545,9 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_WEAKMAP, true, weakmap) -#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ +#endif /* JERRY_BUILTIN_WEAKMAP */ -#if ENABLED (JERRY_BUILTIN_WEAKSET) +#if JERRY_BUILTIN_WEAKSET /* The WeakSet prototype object (23.1.3) */ BUILTIN (ECMA_BUILTIN_ID_WEAKSET_PROTOTYPE, @@ -563,18 +563,18 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_WEAKSET, true, weakset) -#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ +#endif /* JERRY_BUILTIN_WEAKSET */ -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY /* The Proxy routine (ECMA-262 v6, 26.2.1) */ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_PROXY, ECMA_OBJECT_TYPE_NATIVE_FUNCTION, ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, true, proxy) -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* Intrinsic hidden builtin object */ BUILTIN (ECMA_BUILTIN_ID_INTRINSIC_OBJECT, @@ -695,27 +695,27 @@ BUILTIN (ECMA_BUILTIN_ID_ASYNC_GENERATOR_PROTOTYPE, true, async_generator_prototype) -#if ENABLED (JERRY_BUILTIN_SET) +#if JERRY_BUILTIN_SET /* The %SetIteratorPrototype% object (ECMA-262 v6, 23.2.5.2) */ BUILTIN (ECMA_BUILTIN_ID_SET_ITERATOR_PROTOTYPE, ECMA_OBJECT_TYPE_GENERAL, ECMA_BUILTIN_ID_ITERATOR_PROTOTYPE, true, set_iterator_prototype) -#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#endif /* JERRY_BUILTIN_SET */ -#if ENABLED (JERRY_BUILTIN_MAP) +#if JERRY_BUILTIN_MAP /* The %MapIteratorPrototype% object (ECMA-262 v6, 23.1.5.2) */ BUILTIN (ECMA_BUILTIN_ID_MAP_ITERATOR_PROTOTYPE, ECMA_OBJECT_TYPE_GENERAL, ECMA_BUILTIN_ID_ITERATOR_PROTOTYPE, true, map_iterator_prototype) -#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#endif /* JERRY_BUILTIN_SET */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT /* The %BigInt.prototype% object */ BUILTIN (ECMA_BUILTIN_ID_BIGINT_PROTOTYPE, ECMA_OBJECT_TYPE_GENERAL, @@ -729,9 +729,9 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_BIGINT, ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, true, bigint) -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW /* The DataView prototype object (ECMA-262 v6, 24.2.3.1) */ BUILTIN (ECMA_BUILTIN_ID_DATAVIEW_PROTOTYPE, ECMA_OBJECT_TYPE_GENERAL, @@ -745,7 +745,7 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_DATAVIEW, ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE, true, dataview) -#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW */ +#endif /* JERRY_BUILTIN_DATAVIEW */ /* The Global object (15.1) */ BUILTIN (ECMA_BUILTIN_ID_GLOBAL, diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array-prototype.c index 0e8514bc9..373b05803 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array-prototype.c @@ -15,8 +15,8 @@ #include "ecma-builtins.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_TYPEDARRAY +#if JERRY_BUILTIN_BIGINT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -41,5 +41,5 @@ * @} */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_BIGINT */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array-prototype.inc.h index b5cd21aa1..e6822117d 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array-prototype.inc.h @@ -17,12 +17,12 @@ * BigInt64Array prototype description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_TYPEDARRAY +#if JERRY_BUILTIN_BIGINT #define TYPEDARRAY_BYTES_PER_ELEMENT 8 #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_BIGINT64ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_BIGINT */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array.c index 30dd36091..da4f3c8d5 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array.c @@ -21,8 +21,8 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_TYPEDARRAY +#if JERRY_BUILTIN_BIGINT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -76,5 +76,5 @@ ecma_builtin_bigint64array_dispatch_construct (const ecma_value_t *arguments_lis * @} */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_BIGINT */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array.inc.h index 9e7854f4e..b68f35815 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-bigint64array.inc.h @@ -17,11 +17,11 @@ * BigInt64Array description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 8 #define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_BIGINT64_ARRAY_UL #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_BIGINT64ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array-prototype.c index ef1539773..3cc4006d9 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array-prototype.c @@ -15,8 +15,8 @@ #include "ecma-builtins.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_TYPEDARRAY +#if JERRY_BUILTIN_BIGINT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -41,5 +41,5 @@ * @} */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_BIGINT */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array-prototype.inc.h index 2be38f862..6c0da05be 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array-prototype.inc.h @@ -17,12 +17,12 @@ * BigUInt64Array prototype description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_TYPEDARRAY +#if JERRY_BUILTIN_BIGINT #define TYPEDARRAY_BYTES_PER_ELEMENT 8 #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_BIGUINT64ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_BIGINT */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array.c index 734adfa84..6037d081e 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array.c @@ -21,8 +21,8 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_TYPEDARRAY +#if JERRY_BUILTIN_BIGINT #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -76,5 +76,5 @@ ecma_builtin_biguint64array_dispatch_construct (const ecma_value_t *arguments_li * @} */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_BIGINT */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array.inc.h index 441411bc8..f9ba33385 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-biguint64array.inc.h @@ -17,13 +17,13 @@ * BigUInt64Array description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_TYPEDARRAY +#if JERRY_BUILTIN_BIGINT #define TYPEDARRAY_BYTES_PER_ELEMENT 8 #define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_BIGUINT64_ARRAY_UL #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_BIGUINT64ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) && ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ +#endif /* JERRY_BUILTIN_TYPEDARRAY && JERRY_BUILTIN_BIGINT */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.c index 79bc5002e..3179f97c3 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.c @@ -15,7 +15,7 @@ #include "ecma-builtins.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -40,4 +40,4 @@ * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.inc.h index efe795444..6bba9b675 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array-prototype.inc.h @@ -17,10 +17,10 @@ * Float32Array prototype description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 4 #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_FLOAT32ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.c index 1332b64dc..1998e1894 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.c @@ -21,7 +21,7 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -75,4 +75,4 @@ ecma_builtin_float32array_dispatch_construct (const ecma_value_t *arguments_list * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.inc.h index dfd321989..0cc3d7380 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float32array.inc.h @@ -17,11 +17,11 @@ * Float32Array description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 4 #define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_FLOAT32_ARRAY_UL #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_FLOAT32ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.c index 152b392b4..4f6f8a2d6 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.c @@ -15,8 +15,8 @@ #include "ecma-builtins.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_BUILTIN_TYPEDARRAY +#if JERRY_NUMBER_TYPE_FLOAT64 #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -41,5 +41,5 @@ * @} */ -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.inc.h index 2a575cc98..68fce0d42 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.inc.h @@ -17,12 +17,12 @@ * Float64Array prototype description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_BUILTIN_TYPEDARRAY +#if JERRY_NUMBER_TYPE_FLOAT64 #define TYPEDARRAY_BYTES_PER_ELEMENT 8 #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_FLOAT64ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.c index 79eb95a5a..ed857e0a2 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.c @@ -21,8 +21,8 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_BUILTIN_TYPEDARRAY +#if JERRY_NUMBER_TYPE_FLOAT64 #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -76,5 +76,5 @@ ecma_builtin_float64array_dispatch_construct (const ecma_value_t *arguments_list * @} */ -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.inc.h index d36755d0a..e7b053dd7 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array.inc.h @@ -17,13 +17,13 @@ * Float64Array description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_BUILTIN_TYPEDARRAY +#if JERRY_NUMBER_TYPE_FLOAT64 #define TYPEDARRAY_BYTES_PER_ELEMENT 8 #define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_FLOAT64_ARRAY_UL #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_FLOAT64ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.c index 5d6745046..0d4e1675f 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.c @@ -15,7 +15,7 @@ #include "ecma-builtins.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -40,4 +40,4 @@ * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.inc.h index b9df1d592..d9a0ef946 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array-prototype.inc.h @@ -17,10 +17,10 @@ * Int16Array prototype description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 2 #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT16ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.c index 2c05944b4..99fd2a8c5 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.c @@ -21,7 +21,7 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -75,4 +75,4 @@ ecma_builtin_int16array_dispatch_construct (const ecma_value_t *arguments_list_p * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.inc.h index b8eb51762..3427207be 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int16array.inc.h @@ -17,11 +17,11 @@ * Int16Array description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 2 #define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_INT16_ARRAY_UL #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT16ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.c index d73bb940f..0253bc0ae 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.c @@ -15,7 +15,7 @@ #include "ecma-builtins.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -40,4 +40,4 @@ * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.inc.h index c09bf7aa1..ea2f33267 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array-prototype.inc.h @@ -17,10 +17,10 @@ * Int32Array prototype description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 4 #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT32ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.c index e6393cdb5..06170fbe7 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.c @@ -21,7 +21,7 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -75,4 +75,4 @@ ecma_builtin_int32array_dispatch_construct (const ecma_value_t *arguments_list_p * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.inc.h index b32819d38..bdc667fb9 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int32array.inc.h @@ -17,11 +17,11 @@ * Int32Array description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 4 #define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_INT32_ARRAY_UL #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT32ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.c index 675f6cb67..a7b0b1565 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.c @@ -15,7 +15,7 @@ #include "ecma-builtins.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -40,4 +40,4 @@ * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.inc.h index c701f16de..4cb7e582a 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array-prototype.inc.h @@ -17,10 +17,10 @@ * Int8Array prototype description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 1 #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT8ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.c index fc3a18f0f..03522f0b7 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.c @@ -21,7 +21,7 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -75,4 +75,4 @@ ecma_builtin_int8array_dispatch_construct (const ecma_value_t *arguments_list_p, * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.inc.h index f9e74d3f2..2e3146fb1 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-int8array.inc.h @@ -17,11 +17,11 @@ * Int8Array description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 1 #define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_INT8_ARRAY_UL #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_INT8ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.c index fd66b5cc8..565a48a19 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.c @@ -15,7 +15,7 @@ #include "ecma-builtin-typedarray-helpers.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #include "ecma-builtins.h" #include "ecma-gc.h" @@ -70,4 +70,4 @@ ecma_typedarray_helper_dispatch_construct (const ecma_value_t *arguments_list_p, return val; } /* ecma_typedarray_helper_dispatch_construct */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.h index 3ead931bd..54972bd9d 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.h @@ -17,7 +17,7 @@ #define ECMA_TYPEDARRAY_HELPERS_H #include "ecma-globals.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY /** \addtogroup ecma ECMA * @{ @@ -36,5 +36,5 @@ ecma_typedarray_helper_dispatch_construct (const ecma_value_t *arguments_list_p, * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ #endif /* !ECMA_TYPEDARRAY_HELPERS_H */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype-template.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype-template.inc.h index b28f23352..8715d0d98 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype-template.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype-template.inc.h @@ -13,7 +13,7 @@ * limitations under the License. */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #ifndef TYPEDARRAY_BYTES_PER_ELEMENT # error "Please define TYPEDARRAY_BYTES_PER_ELEMENT" @@ -40,4 +40,4 @@ NUMBER_VALUE (LIT_MAGIC_STRING_BYTES_PER_ELEMENT_U, #undef TYPEDARRAY_BUILTIN_ID #undef TYPEDARRAY_BYTES_PER_ELEMENT -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c index c4d3cec8e..5ba9adbf5 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c @@ -37,7 +37,7 @@ #include "jrt.h" #include "lit-char-helpers.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -665,7 +665,7 @@ ecma_builtin_typedarray_prototype_set (ecma_value_t this_arg, /**< this argument ecma_value_t value_to_set; -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (ECMA_TYPEDARRAY_IS_BIGINT_TYPE (target_info.id)) { value_to_set = ecma_bigint_to_bigint (elem, false); @@ -678,7 +678,7 @@ ecma_builtin_typedarray_prototype_set (ecma_value_t this_arg, /**< this argument } } else -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ { ecma_number_t elem_num; if (ECMA_IS_VALUE_ERROR (ecma_op_to_numeric (elem, &elem_num, ECMA_TO_NUMERIC_NO_OPTS))) @@ -948,7 +948,7 @@ ecma_builtin_typedarray_prototype_fill (ecma_value_t this_arg, /**< this object { ecma_value_t value_to_set; -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (ECMA_TYPEDARRAY_IS_BIGINT_TYPE (info_p->id)) { value_to_set = ecma_bigint_to_bigint (value, true); @@ -959,7 +959,7 @@ ecma_builtin_typedarray_prototype_fill (ecma_value_t this_arg, /**< this object } } else -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ { ecma_number_t value_num; ecma_value_t ret_value = ecma_op_to_numeric (value, &value_num, ECMA_TO_NUMERIC_NO_OPTS); @@ -1043,12 +1043,12 @@ ecma_builtin_typedarray_prototype_sort_compare_helper (ecma_value_t lhs, /**< le if (ecma_is_value_undefined (compare_func)) { /* Default comparison when no comparefn is passed. */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (ecma_is_value_bigint (lhs) && ecma_is_value_bigint (rhs)) { return ecma_make_number_value (ecma_bigint_compare_to_bigint (lhs, rhs)); } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ ecma_number_t result = ECMA_NUMBER_ZERO; @@ -1283,11 +1283,11 @@ ecma_builtin_typedarray_prototype_index_of (ecma_typedarray_info_t *info_p, /**< const ecma_value_t args[], /**< arguments list */ uint32_t args_number) /**< number of arguments */ { -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT bool is_bigint = ECMA_TYPEDARRAY_IS_BIGINT_TYPE (info_p->id); -#else /* !ENABLED (JERRY_BUILTIN_BIGINT) */ +#else /* !JERRY_BUILTIN_BIGINT */ bool is_bigint = false; -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ uint32_t limit = info_p->length * info_p->element_size; uint32_t from_index; @@ -1350,11 +1350,11 @@ ecma_builtin_typedarray_prototype_last_index_of (ecma_typedarray_info_t *info_p, const ecma_value_t args[], /**< arguments list */ uint32_t args_number) /**< number of arguments */ { -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT bool is_bigint = ECMA_TYPEDARRAY_IS_BIGINT_TYPE (info_p->id); -#else /* !ENABLED (JERRY_BUILTIN_BIGINT) */ +#else /* !JERRY_BUILTIN_BIGINT */ bool is_bigint = false; -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ uint32_t from_index; @@ -1646,11 +1646,11 @@ ecma_builtin_typedarray_prototype_includes (ecma_typedarray_info_t *info_p, /**< { uint32_t limit = info_p->length * info_p->element_size; -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT bool is_bigint = ECMA_TYPEDARRAY_IS_BIGINT_TYPE (info_p->id); -#else /* !ENABLED (JERRRY_BUILTIN_BIGINT) */ +#else /* !JERRRY_BUILTIN_BIGINT */ bool is_bigint = false; -#endif /* ENABLED (JERRRY_BUILTIN_BIGINT) */ +#endif /* JERRRY_BUILTIN_BIGINT */ if (args_number == 0 || (!ecma_is_value_number (args[0]) && !is_bigint) @@ -1879,4 +1879,4 @@ ecma_builtin_typedarray_prototype_dispatch_routine (uint8_t builtin_routine_id, * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.inc.h index 193e644a5..8bb73ac2c 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY /* ES2015 22.2.3.4 */ OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR, @@ -81,6 +81,6 @@ INTRINSIC_PROPERTY (LIT_MAGIC_STRING_VALUES, LIT_INTERNAL_MAGIC_STRING_TYPEDARRA ECMA_PROPERTY_CONFIGURABLE_WRITABLE) INTRINSIC_PROPERTY (LIT_GLOBAL_SYMBOL_ITERATOR, LIT_INTERNAL_MAGIC_STRING_TYPEDARRAY_PROTOTYPE_VALUES, ECMA_PROPERTY_CONFIGURABLE_WRITABLE) -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-template.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-template.inc.h index c64a3d740..23c4ce6f9 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-template.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-template.inc.h @@ -13,7 +13,7 @@ * limitations under the License. */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #ifndef TYPEDARRAY_BYTES_PER_ELEMENT # error "Please define TYPEDARRAY_BYTES_PER_ELEMENT" @@ -55,4 +55,4 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE, #undef TYPEDARRAY_MAGIC_STRING_ID #undef TYPEDARRAY_BYTES_PER_ELEMENT -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.c index 56d51f4af..247616606 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.c @@ -23,7 +23,7 @@ #include "ecma-function-object.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -230,4 +230,4 @@ ecma_builtin_typedarray_species_get (ecma_value_t this_value) /**< This Value */ * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.inc.h index 050ed5b55..d362f817d 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.inc.h @@ -19,7 +19,7 @@ #include "ecma-builtin-helpers-macro-defines.inc.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY /* ES2015 22.2.2 */ /* ES11 22.2.1.1 - value of length changed to 0 */ @@ -51,6 +51,6 @@ ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES, ecma_builtin_typedarray_species_get, ECMA_PROPERTY_FLAG_CONFIGURABLE) -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ #include "ecma-builtin-helpers-macro-undefs.inc.h" diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.c index ea61fe8ac..5e980625a 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.c @@ -15,7 +15,7 @@ #include "ecma-builtins.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -40,4 +40,4 @@ * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.inc.h index 50f18f71c..6d0fef96e 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array-prototype.inc.h @@ -17,10 +17,10 @@ * Uint16Array prototype description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 2 #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT16ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.c index a6c5c025b..5b3d33adb 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.c @@ -21,7 +21,7 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -75,4 +75,4 @@ ecma_builtin_uint16array_dispatch_construct (const ecma_value_t *arguments_list_ * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.inc.h index 8dc3258a2..8a21218fd 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint16array.inc.h @@ -17,11 +17,11 @@ * Uint16Array description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 2 #define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_UINT16_ARRAY_UL #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT16ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.c index 1f8b089b1..ff721dcd9 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.c @@ -15,7 +15,7 @@ #include "ecma-builtins.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -40,4 +40,4 @@ * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.inc.h index dcdb595be..b4142cb14 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array-prototype.inc.h @@ -17,10 +17,10 @@ * Uint32Array prototype description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 4 #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT32ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.c index 9628171bd..17b6d390c 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.c @@ -21,7 +21,7 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -77,4 +77,4 @@ ecma_builtin_uint32array_dispatch_construct (const ecma_value_t *arguments_list_ * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.inc.h index 7311d2052..c38120836 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint32array.inc.h @@ -17,11 +17,11 @@ * Uint32Array description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 4 #define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_UINT32_ARRAY_UL #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT32ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.c index 2eb2b62e8..67347067e 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.c @@ -15,7 +15,7 @@ #include "ecma-builtins.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -40,4 +40,4 @@ * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.inc.h index 4a84067ab..c047d6c9b 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array-prototype.inc.h @@ -17,10 +17,10 @@ * Uint8Array prototype description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 1 #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT8ARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.c index 1dd946e0b..c451327c4 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.c @@ -21,7 +21,7 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -75,4 +75,4 @@ ecma_builtin_uint8array_dispatch_construct (const ecma_value_t *arguments_list_p * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.inc.h index 555fb0373..b108370d4 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8array.inc.h @@ -17,11 +17,11 @@ * Uint8Array description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 1 #define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_UINT8_ARRAY_UL #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT8ARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.c index 4523f3a0b..b7526a92d 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.c @@ -15,7 +15,7 @@ #include "ecma-builtins.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -40,4 +40,4 @@ * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.inc.h index 7995c0f13..3d8f96d1c 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray-prototype.inc.h @@ -17,10 +17,10 @@ * Uint8ClampedArray prototype description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 1 #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT8CLAMPEDARRAY #include "ecma-builtin-typedarray-prototype-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.c b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.c index d17e4c4b6..0d6fe2120 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.c +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.c @@ -21,7 +21,7 @@ #include "ecma-typedarray-object.h" #include "jrt.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -77,4 +77,4 @@ ecma_builtin_uint8clampedarray_dispatch_construct (const ecma_value_t *arguments * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.inc.h b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.inc.h index f84d18252..16d21454a 100644 --- a/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.inc.h +++ b/jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-uint8clampedarray.inc.h @@ -17,11 +17,11 @@ * Uint8ClampedArray description */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #define TYPEDARRAY_BYTES_PER_ELEMENT 1 #define TYPEDARRAY_MAGIC_STRING_ID LIT_MAGIC_STRING_UINT8_CLAMPED_ARRAY_UL #define TYPEDARRAY_BUILTIN_ID ECMA_BUILTIN_ID_UINT8CLAMPEDARRAY_PROTOTYPE #include "ecma-builtin-typedarray-template.inc.h" -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/operations/ecma-arguments-object.c b/jerry-core/ecma/operations/ecma-arguments-object.c index e2bafbede..dc6100a0a 100644 --- a/jerry-core/ecma/operations/ecma-arguments-object.c +++ b/jerry-core/ecma/operations/ecma-arguments-object.c @@ -100,14 +100,14 @@ ecma_op_create_arguments_object (vm_frame_ctx_shared_args_t *shared_p, /**< shar ECMA_SET_INTERNAL_VALUE_POINTER (mapped_arguments_p->lex_env, lex_env_p); arguments_p->header.u.pseudo_array.extra_info |= ECMA_ARGUMENTS_OBJECT_MAPPED; -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC if (bytecode_data_p->status_flags & CBC_CODE_FLAGS_STATIC_FUNCTION) { arguments_p->header.u.pseudo_array.extra_info |= ECMA_ARGUMENTS_OBJECT_STATIC_BYTECODE; mapped_arguments_p->u.byte_code_p = (ecma_compiled_code_t *) bytecode_data_p; } else -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ { ECMA_SET_INTERNAL_VALUE_POINTER (mapped_arguments_p->u.byte_code, bytecode_data_p); } @@ -343,17 +343,17 @@ ecma_op_arguments_object_try_to_lazy_instantiate_property (ecma_object_t *object { ecma_object_t *thrower_p = ecma_builtin_get (ECMA_BUILTIN_ID_TYPE_ERROR_THROWER); - prop_value_p = ecma_create_named_accessor_property (object_p, - ecma_get_magic_string (LIT_MAGIC_STRING_CALLEE), - thrower_p, - thrower_p, - ECMA_PROPERTY_FIXED, - &prop_p); + ecma_create_named_accessor_property (object_p, + ecma_get_magic_string (LIT_MAGIC_STRING_CALLEE), + thrower_p, + thrower_p, + ECMA_PROPERTY_FIXED, + &prop_p); } return prop_p; } -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT if (property_name_p == ecma_get_magic_string (LIT_MAGIC_STRING_CALLER) && !(arguments_p->header.u.pseudo_array.extra_info & ECMA_ARGUMENTS_OBJECT_CALLER_INITIALIZED)) { @@ -366,15 +366,15 @@ ecma_op_arguments_object_try_to_lazy_instantiate_property (ecma_object_t *object ecma_object_t *thrower_p = ecma_builtin_get (ECMA_BUILTIN_ID_TYPE_ERROR_THROWER); - prop_value_p = ecma_create_named_accessor_property (object_p, - ecma_get_magic_string (LIT_MAGIC_STRING_CALLER), - thrower_p, - thrower_p, - ECMA_PROPERTY_FIXED, - &prop_p); + ecma_create_named_accessor_property (object_p, + ecma_get_magic_string (LIT_MAGIC_STRING_CALLER), + thrower_p, + thrower_p, + ECMA_PROPERTY_FIXED, + &prop_p); return prop_p; } -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ ecma_string_t *symbol_p = ecma_op_get_global_symbol (LIT_GLOBAL_SYMBOL_ITERATOR); if (property_name_p == symbol_p @@ -395,7 +395,7 @@ ecma_op_arguments_object_try_to_lazy_instantiate_property (ecma_object_t *object } ecma_deref_ecma_string (symbol_p); -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ return prop_p; } /* ecma_op_arguments_object_try_to_lazy_instantiate_property */ @@ -444,20 +444,20 @@ ecma_op_arguments_object_list_lazy_property_names (ecma_object_t *obj_p, /**< ar prop_counter_p->string_named_props++; } -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT if (!(flags & (ECMA_ARGUMENTS_OBJECT_CALLER_INITIALIZED | ECMA_ARGUMENTS_OBJECT_MAPPED))) { ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_CALLER)); prop_counter_p->string_named_props++; } -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ if (!(flags & ECMA_ARGUMENTS_OBJECT_ITERATOR_INITIALIZED)) { ecma_string_t *symbol_p = ecma_op_get_global_symbol (LIT_GLOBAL_SYMBOL_ITERATOR); ecma_collection_push_back (prop_names_p, ecma_make_symbol_value (symbol_p)); prop_counter_p->symbol_named_props++; } -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ } /* ecma_op_arguments_object_list_lazy_property_names */ /** @@ -475,13 +475,13 @@ ecma_op_arguments_object_get_formal_parameter (ecma_mapped_arguments_t *mapped_a ecma_compiled_code_t *byte_code_p; -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC if (mapped_arguments_p->unmapped.header.u.pseudo_array.extra_info & ECMA_ARGUMENTS_OBJECT_STATIC_BYTECODE) { byte_code_p = mapped_arguments_p->u.byte_code_p; } else -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ { byte_code_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_compiled_code_t, mapped_arguments_p->u.byte_code); } diff --git a/jerry-core/ecma/operations/ecma-array-object.c b/jerry-core/ecma/operations/ecma-array-object.c index 9bf4236c0..7143def78 100644 --- a/jerry-core/ecma/operations/ecma-array-object.c +++ b/jerry-core/ecma/operations/ecma-array-object.c @@ -35,21 +35,21 @@ * @{ */ -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT /** * Maximum length of the array length to allocate fast mode access for it * e.g. new Array(5000) is constructed as fast mode access array, * but new Array(50000000) is consturcted as normal property list based array */ #define ECMA_FAST_ARRAY_MAX_INITIAL_LENGTH (1 << 17) -#else /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* JERRY_CPOINTER_32_BIT */ /** * Maximum length of the array length to allocate fast mode access for it * e.g. new Array(5000) is constructed as fast mode access array, * but new Array(50000000) is consturcted as normal property list based array */ #define ECMA_FAST_ARRAY_MAX_INITIAL_LENGTH (1 << 13) -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ /** * Property name type flag for array indices. @@ -65,11 +65,11 @@ static ecma_object_t * ecma_op_alloc_array_object (uint32_t length) /**< length of the new array */ { -#if ENABLED (JERRY_BUILTIN_ARRAY) +#if JERRY_BUILTIN_ARRAY ecma_object_t *array_prototype_object_p = ecma_builtin_get (ECMA_BUILTIN_ID_ARRAY_PROTOTYPE); -#else /* !ENABLED (JERRY_BUILTIN_ARRAY) */ +#else /* !JERRY_BUILTIN_ARRAY */ ecma_object_t *array_prototype_object_p = ecma_builtin_get (ECMA_BUILTIN_ID_OBJECT_PROTOTYPE); -#endif /* ENABLED (JERRY_BUILTIN_ARRAY) */ +#endif /* JERRY_BUILTIN_ARRAY */ ecma_object_t *object_p = ecma_create_object (array_prototype_object_p, sizeof (ecma_extended_object_t), @@ -170,13 +170,13 @@ ecma_op_new_array_object (uint32_t length) /**< length of the new array */ ecma_object_t * ecma_op_new_array_object_from_length (ecma_length_t length) /**< length of the new array */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (length > UINT32_MAX) { ecma_raise_range_error (ECMA_ERR_MSG ("Invalid Array length")); return NULL; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return ecma_op_new_array_object ((uint32_t) length); } /* ecma_op_new_array_object_from_length */ @@ -677,7 +677,7 @@ ecma_fast_array_object_own_property_keys (ecma_object_t *object_p) /**< fast acc return ret_p; } /* ecma_fast_array_object_own_property_keys */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Array object creation with custom prototype. * @@ -709,7 +709,7 @@ ecma_op_array_species_create (ecma_object_t *original_array_p, /**< The object f return NULL; } -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS if (ecma_is_constructor (constructor)) { ecma_object_t *constructor_p = ecma_get_object_from_value (constructor); @@ -722,7 +722,7 @@ ecma_op_array_species_create (ecma_object_t *original_array_p, /**< The object f constructor = ECMA_VALUE_UNDEFINED; } } -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ if (ecma_is_value_object (constructor)) { @@ -800,7 +800,7 @@ ecma_op_create_array_iterator (ecma_object_t *obj_p, /**< array object */ ECMA_PSEUDO_ARRAY_ITERATOR, kind); } /* ecma_op_create_array_iterator */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Low level delete of array items from new_length to old_length @@ -832,14 +832,14 @@ ecma_delete_array_properties (ecma_object_t *object_p, /**< object */ ecma_property_header_t *current_prop_p; -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP current_prop_p = ECMA_GET_NON_NULL_POINTER (ecma_property_header_t, current_prop_cp); if (current_prop_p->types[0] == ECMA_PROPERTY_TYPE_HASHMAP) { current_prop_cp = current_prop_p->next_property_cp; } -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ while (current_prop_cp != JMEM_CP_NULL) { @@ -878,7 +878,7 @@ ecma_delete_array_properties (ecma_object_t *object_p, /**< object */ current_prop_cp = object_p->u1.property_list_cp; ecma_property_header_t *prev_prop_p = NULL; -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP JERRY_ASSERT (current_prop_cp != JMEM_CP_NULL); ecma_property_hashmap_delete_status hashmap_status = ECMA_PROPERTY_HASHMAP_DELETE_NO_HASHMAP; @@ -890,7 +890,7 @@ ecma_delete_array_properties (ecma_object_t *object_p, /**< object */ current_prop_cp = current_prop_p->next_property_cp; hashmap_status = ECMA_PROPERTY_HASHMAP_DELETE_HAS_HASHMAP; } -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ while (current_prop_cp != JMEM_CP_NULL) { @@ -911,14 +911,14 @@ ecma_delete_array_properties (ecma_object_t *object_p, /**< object */ { JERRY_ASSERT (index != ECMA_STRING_NOT_ARRAY_INDEX); -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP if (hashmap_status == ECMA_PROPERTY_HASHMAP_DELETE_HAS_HASHMAP) { hashmap_status = ecma_property_hashmap_delete (object_p, prop_pair_p->names_cp[i], current_prop_p->types + i); } -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ ecma_free_property (object_p, prop_pair_p->names_cp[i], current_prop_p->types + i); current_prop_p->types[i] = ECMA_PROPERTY_TYPE_DELETED; @@ -950,13 +950,13 @@ ecma_delete_array_properties (ecma_object_t *object_p, /**< object */ } } -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP if (hashmap_status == ECMA_PROPERTY_HASHMAP_DELETE_RECREATE_HASHMAP) { ecma_property_hashmap_free (object_p); ecma_property_hashmap_create (object_p); } -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ return new_length; } /* ecma_delete_array_properties */ diff --git a/jerry-core/ecma/operations/ecma-array-object.h b/jerry-core/ecma/operations/ecma-array-object.h index bebffbdad..b02061aef 100644 --- a/jerry-core/ecma/operations/ecma-array-object.h +++ b/jerry-core/ecma/operations/ecma-array-object.h @@ -102,7 +102,7 @@ ecma_fast_array_object_own_property_keys (ecma_object_t *object_p); void ecma_fast_array_convert_to_normal (ecma_object_t *object_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_object_t * ecma_op_array_species_create (ecma_object_t *original_array_p, ecma_length_t length); @@ -110,7 +110,7 @@ ecma_op_array_species_create (ecma_object_t *original_array_p, ecma_value_t ecma_op_create_array_iterator (ecma_object_t *obj_p, ecma_iterator_kind_t kind); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t ecma_op_array_object_set_length (ecma_object_t *object_p, ecma_value_t new_value, uint32_t flags); diff --git a/jerry-core/ecma/operations/ecma-arraybuffer-object.c b/jerry-core/ecma/operations/ecma-arraybuffer-object.c index d79589da2..89e84f7d3 100644 --- a/jerry-core/ecma/operations/ecma-arraybuffer-object.c +++ b/jerry-core/ecma/operations/ecma-arraybuffer-object.c @@ -25,7 +25,7 @@ #include "jcontext.h" #include "ecma-function-object.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY /** \addtogroup ecma ECMA * @{ @@ -273,4 +273,4 @@ ecma_arraybuffer_detach (ecma_object_t *object_p) /**< pointer to the ArrayBuffe * @} * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/operations/ecma-arraybuffer-object.h b/jerry-core/ecma/operations/ecma-arraybuffer-object.h index d062542af..ada0cfc3a 100644 --- a/jerry-core/ecma/operations/ecma-arraybuffer-object.h +++ b/jerry-core/ecma/operations/ecma-arraybuffer-object.h @@ -18,7 +18,7 @@ #include "ecma-globals.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY /** \addtogroup ecma ECMA * @{ @@ -55,5 +55,5 @@ ecma_is_arraybuffer (ecma_value_t val); * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ #endif /* !ECMA_ARRAYBUFFER_OBJECT_H */ diff --git a/jerry-core/ecma/operations/ecma-async-generator-object.c b/jerry-core/ecma/operations/ecma-async-generator-object.c index 78094b302..6ef633778 100644 --- a/jerry-core/ecma/operations/ecma-async-generator-object.c +++ b/jerry-core/ecma/operations/ecma-async-generator-object.c @@ -29,7 +29,7 @@ #include "vm.h" #include "vm-stack.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** \addtogroup ecma ECMA * @{ @@ -534,7 +534,7 @@ ecma_await_continue (vm_executable_object_t *executable_object_p, /**< executabl } } /* ecma_await_continue */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-async-generator-object.h b/jerry-core/ecma/operations/ecma-async-generator-object.h index 153754a7b..cb6626692 100644 --- a/jerry-core/ecma/operations/ecma-async-generator-object.h +++ b/jerry-core/ecma/operations/ecma-async-generator-object.h @@ -19,7 +19,7 @@ #include "ecma-globals.h" #include "vm-defines.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** \addtogroup ecma ECMA * @{ @@ -83,7 +83,7 @@ void ecma_async_generator_finalize (vm_executable_object_t *async_generator_obje ecma_value_t ecma_await_continue (vm_executable_object_t *async_generator_object_p, ecma_value_t value); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-big-uint.c b/jerry-core/ecma/operations/ecma-big-uint.c index 0aa357163..fa9ca1f06 100644 --- a/jerry-core/ecma/operations/ecma-big-uint.c +++ b/jerry-core/ecma/operations/ecma-big-uint.c @@ -18,7 +18,7 @@ #include "jmem.h" #include "lit-char-helpers.h" -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT JERRY_STATIC_ASSERT (sizeof (ecma_bigint_two_digits_t) == 2 * sizeof (ecma_bigint_digit_t), ecma_big_int_two_digits_must_be_twice_as_long_as_ecma_big_int_digit); @@ -925,13 +925,12 @@ ecma_big_uint_div_digit (ecma_extended_primitive_t *left_value_p, /**< left BigU last_digit = last_digit / divisor_digit; - ecma_bigint_digit_t result_size = 0; ecma_extended_primitive_t *result_p = NULL; ecma_bigint_digit_t *current_p = NULL; if (!is_mod) { - result_size = left_size; + ecma_bigint_digit_t result_size = left_size; if (last_digit == 0) { @@ -1494,7 +1493,7 @@ ecma_big_uint_shift_right (ecma_extended_primitive_t *left_value_p, /**< left B return ecma_big_uint_increase_result (result_value_p); } /* ecma_big_uint_shift_right */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Compute the left value raised to the power of right value @@ -1566,7 +1565,7 @@ ecma_big_uint_pow (ecma_extended_primitive_t *left_value_p, /**< left BigUInt va return result_p; } /* ecma_big_uint_pow */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Perform bitwise operations on two BigUInt numbers @@ -1799,4 +1798,4 @@ ecma_big_uint_bitwise_op (uint32_t operation_and_options, /**< bitwise operation return result_value_p; } /* ecma_big_uint_bitwise_op */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ diff --git a/jerry-core/ecma/operations/ecma-big-uint.h b/jerry-core/ecma/operations/ecma-big-uint.h index 80cbb1cf9..913387a0f 100644 --- a/jerry-core/ecma/operations/ecma-big-uint.h +++ b/jerry-core/ecma/operations/ecma-big-uint.h @@ -18,7 +18,7 @@ #include "ecma-globals.h" -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT /** * Limit of BigUInt memory allocation in JerryScript. @@ -127,14 +127,14 @@ ecma_extended_primitive_t *ecma_big_uint_shift_left (ecma_extended_primitive_t * ecma_extended_primitive_t *ecma_big_uint_shift_right (ecma_extended_primitive_t *left_value_p, uint32_t right_value, bool increase_result); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_extended_primitive_t *ecma_big_uint_pow (ecma_extended_primitive_t *left_value_p, uint32_t right_value); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_extended_primitive_t *ecma_big_uint_bitwise_op (uint32_t operation_and_options, ecma_extended_primitive_t *left_value_p, ecma_extended_primitive_t *right_value_p); -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ #endif /* ECMA_BIG_UINT_H */ diff --git a/jerry-core/ecma/operations/ecma-bigint-object.c b/jerry-core/ecma/operations/ecma-bigint-object.c index fbce1938b..8a41e9c6a 100644 --- a/jerry-core/ecma/operations/ecma-bigint-object.c +++ b/jerry-core/ecma/operations/ecma-bigint-object.c @@ -23,7 +23,7 @@ #include "ecma-objects.h" #include "ecma-objects-general.h" -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT /** \addtogroup ecma ECMA * @{ @@ -63,4 +63,4 @@ ecma_op_create_bigint_object (ecma_value_t arg) /**< argument passed to the toOb * @} */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ diff --git a/jerry-core/ecma/operations/ecma-bigint-object.h b/jerry-core/ecma/operations/ecma-bigint-object.h index 254e75987..72adefece 100644 --- a/jerry-core/ecma/operations/ecma-bigint-object.h +++ b/jerry-core/ecma/operations/ecma-bigint-object.h @@ -18,7 +18,7 @@ #include "ecma-globals.h" -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT /** \addtogroup ecma ECMA * @{ @@ -34,6 +34,6 @@ ecma_value_t ecma_op_create_bigint_object (ecma_value_t arg); * @} */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ #endif /* !ECMA_BIGINT_OBJECT_H */ diff --git a/jerry-core/ecma/operations/ecma-bigint.c b/jerry-core/ecma/operations/ecma-bigint.c index 216d6d570..6d2a2e275 100644 --- a/jerry-core/ecma/operations/ecma-bigint.c +++ b/jerry-core/ecma/operations/ecma-bigint.c @@ -20,7 +20,7 @@ #include "ecma-objects.h" #include "lit-char-helpers.h" -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT /** * Raise a not enough memory error @@ -325,18 +325,18 @@ ecma_bigint_number_to_digits (ecma_number_t number, /**< ecma number */ fraction >>= ECMA_NUMBER_FRACTION_WIDTH - biased_exp; digits_p[0] = (ecma_bigint_digit_t) fraction; -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 digits_p[1] = (ecma_bigint_digit_t) (fraction >> (8 * sizeof (ecma_bigint_digit_t))); return ECMA_BIGINT_NUMBER_TO_DIGITS_SET_DIGITS (digits_p[1] == 0 ? 1 : 2) | has_fraction; -#else /* !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#else /* !JERRY_NUMBER_TYPE_FLOAT64 */ return ECMA_BIGINT_NUMBER_TO_DIGITS_SET_DIGITS (1) | has_fraction; -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ } digits_p[0] = (ecma_bigint_digit_t) fraction; -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 digits_p[1] = (ecma_bigint_digit_t) (fraction >> (8 * sizeof (ecma_bigint_digit_t))); -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ biased_exp -= ECMA_NUMBER_FRACTION_WIDTH; @@ -345,27 +345,27 @@ ecma_bigint_number_to_digits (ecma_number_t number, /**< ecma number */ if (shift_left == 0) { -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 return biased_exp | ECMA_BIGINT_NUMBER_TO_DIGITS_SET_DIGITS (2); -#else /* !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#else /* !JERRY_NUMBER_TYPE_FLOAT64 */ return biased_exp | ECMA_BIGINT_NUMBER_TO_DIGITS_SET_DIGITS (1); -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ } uint32_t shift_right = (1 << ECMA_BIGINT_DIGIT_SHIFT) - shift_left; -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 digits_p[2] = digits_p[1] >> shift_right; digits_p[1] = (digits_p[1] << shift_left) | (digits_p[0] >> shift_right); digits_p[0] <<= shift_left; return biased_exp | ECMA_BIGINT_NUMBER_TO_DIGITS_SET_DIGITS (digits_p[2] == 0 ? 2 : 3); -#else /* !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#else /* !JERRY_NUMBER_TYPE_FLOAT64 */ digits_p[1] = digits_p[0] >> shift_right; digits_p[0] <<= shift_left; return biased_exp | ECMA_BIGINT_NUMBER_TO_DIGITS_SET_DIGITS (digits_p[1] == 0 ? 1 : 2); -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ } /* ecma_bigint_number_to_digits */ /** @@ -1451,7 +1451,7 @@ ecma_bigint_shift (ecma_value_t left_value, /**< left BigInt value */ return ecma_make_extended_primitive_value (result_p, ECMA_TYPE_BIGINT); } /* ecma_bigint_shift */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Compute the left value raised to the power of right value @@ -1541,7 +1541,7 @@ ecma_bigint_pow (ecma_value_t left_value, /**< left BigInt value */ return ecma_make_extended_primitive_value (result_p, ECMA_TYPE_BIGINT); } /* ecma_bigint_pow */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Convert the result to an ecma value @@ -1723,4 +1723,4 @@ ecma_bigint_xor (ecma_value_t left_value, /**< left BigInt value */ return ecma_bigint_bitwise_op (operation_and_options, left_p, right_p); } /* ecma_bigint_xor */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ diff --git a/jerry-core/ecma/operations/ecma-bigint.h b/jerry-core/ecma/operations/ecma-bigint.h index 8c7f01358..128c903c1 100644 --- a/jerry-core/ecma/operations/ecma-bigint.h +++ b/jerry-core/ecma/operations/ecma-bigint.h @@ -18,7 +18,7 @@ #include "ecma-globals.h" -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT /** * Sign bit of a BigInt value. The number is negative, if this bit is set. @@ -71,14 +71,14 @@ ecma_value_t ecma_bigint_add_sub (ecma_value_t left_value, ecma_value_t right_va ecma_value_t ecma_bigint_mul (ecma_value_t left_value, ecma_value_t right_value); ecma_value_t ecma_bigint_div_mod (ecma_value_t left_value, ecma_value_t right_value, bool is_mod); ecma_value_t ecma_bigint_shift (ecma_value_t left_value, ecma_value_t right_value, bool is_left); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t ecma_bigint_pow (ecma_value_t left_value, ecma_value_t right_value); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t ecma_bigint_and (ecma_value_t left_value, ecma_value_t right_value); ecma_value_t ecma_bigint_or (ecma_value_t left_value, ecma_value_t right_value); ecma_value_t ecma_bigint_xor (ecma_value_t left_value, ecma_value_t right_value); -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ #endif /* ECMA_BIG_INT_H */ diff --git a/jerry-core/ecma/operations/ecma-boolean-object.c b/jerry-core/ecma/operations/ecma-boolean-object.c index ce4b3d130..59d0e043b 100644 --- a/jerry-core/ecma/operations/ecma-boolean-object.c +++ b/jerry-core/ecma/operations/ecma-boolean-object.c @@ -46,15 +46,15 @@ ecma_op_create_boolean_object (ecma_value_t arg) /**< argument passed to the Boo bool boolean_value = ecma_op_to_boolean (arg); ecma_builtin_id_t proto_id; -#if ENABLED (JERRY_BUILTIN_BOOLEAN) +#if JERRY_BUILTIN_BOOLEAN proto_id = ECMA_BUILTIN_ID_BOOLEAN_PROTOTYPE; -#else /* ENABLED (JERRY_BUILTIN_BOOLEAN) */ +#else /* JERRY_BUILTIN_BOOLEAN */ proto_id = ECMA_BUILTIN_ID_OBJECT_PROTOTYPE; -#endif /* !(ENABLED (JERRY_BUILTIN_BOOLEAN) */ +#endif /* !(JERRY_BUILTIN_BOOLEAN */ ecma_object_t *prototype_obj_p = ecma_builtin_get (proto_id); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_object_t *new_target = JERRY_CONTEXT (current_new_target_p); if (new_target) { @@ -65,7 +65,7 @@ ecma_op_create_boolean_object (ecma_value_t arg) /**< argument passed to the Boo return ECMA_VALUE_ERROR; } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_object_t *object_p = ecma_create_object (prototype_obj_p, sizeof (ecma_extended_object_t), ECMA_OBJECT_TYPE_CLASS); @@ -74,12 +74,12 @@ ecma_op_create_boolean_object (ecma_value_t arg) /**< argument passed to the Boo ext_object_p->u.class_prop.class_id = LIT_MAGIC_STRING_BOOLEAN_UL; ext_object_p->u.class_prop.u.value = ecma_make_boolean_value (boolean_value); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (new_target) { ecma_deref_object (prototype_obj_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return ecma_make_object_value (object_p); } /* ecma_op_create_boolean_object */ diff --git a/jerry-core/ecma/operations/ecma-comparison.c b/jerry-core/ecma/operations/ecma-comparison.c index f1a4539d1..5e1f22b99 100644 --- a/jerry-core/ecma/operations/ecma-comparison.c +++ b/jerry-core/ecma/operations/ecma-comparison.c @@ -151,7 +151,7 @@ ecma_op_abstract_equality_compare (ecma_value_t x, /**< first operand */ return ecma_op_abstract_equality_compare (ecma_make_integer_value (ecma_is_value_true (x) ? 1 : 0), y); } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (JERRY_UNLIKELY (ecma_is_value_bigint (x))) { if (ecma_is_value_bigint (y)) @@ -187,7 +187,7 @@ ecma_op_abstract_equality_compare (ecma_value_t x, /**< first operand */ y ^= x; x ^= y; } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ if (ecma_is_value_undefined (x) || ecma_is_value_null (x)) @@ -199,7 +199,7 @@ ecma_op_abstract_equality_compare (ecma_value_t x, /**< first operand */ return ecma_make_boolean_value (is_equal); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (ecma_is_value_symbol (x))) { if (!ecma_is_value_object (y)) @@ -212,17 +212,17 @@ ecma_op_abstract_equality_compare (ecma_value_t x, /**< first operand */ y ^= x; x ^= y; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ JERRY_ASSERT (ecma_is_value_object (x)); if (ecma_is_value_string (y) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT || ecma_is_value_symbol (y) -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#endif /* JERRY_ESNEXT */ +#if JERRY_BUILTIN_BIGINT || ecma_is_value_bigint (y) -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ || ecma_is_value_number (y)) { /* 9. */ @@ -259,10 +259,10 @@ ecma_op_strict_equality_compare (ecma_value_t x, /**< first operand */ { if (ecma_is_value_direct (x) || ecma_is_value_direct (y) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT || ecma_is_value_symbol (x) || ecma_is_value_symbol (y) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ || ecma_is_value_object (x) || ecma_is_value_object (y)) { @@ -305,7 +305,7 @@ ecma_op_strict_equality_compare (ecma_value_t x, /**< first operand */ return ecma_compare_ecma_strings (x_str_p, y_str_p); } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (JERRY_UNLIKELY (ecma_is_value_bigint (x))) { if (!ecma_is_value_bigint (y)) @@ -315,7 +315,7 @@ ecma_op_strict_equality_compare (ecma_value_t x, /**< first operand */ return ecma_bigint_is_equal_to_bigint (x, y); } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ if (!ecma_is_value_number (y)) { @@ -389,11 +389,11 @@ ecma_op_abstract_relational_compare (ecma_value_t x, /**< first operand */ if (!(is_px_string && is_py_string)) { -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (JERRY_LIKELY (!ecma_is_value_bigint (px)) && JERRY_LIKELY (!ecma_is_value_bigint (py))) { -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ /* 3. */ /* a. */ @@ -478,7 +478,7 @@ ecma_op_abstract_relational_compare (ecma_value_t x, /**< first operand */ ret_value = ecma_make_boolean_value (is_x_less_than_y); } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT } else { @@ -546,7 +546,7 @@ ecma_op_abstract_relational_compare (ecma_value_t x, /**< first operand */ ret_value = ecma_make_boolean_value (compare_result < 0); } } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ } else { /* 4. */ diff --git a/jerry-core/ecma/operations/ecma-container-object.c b/jerry-core/ecma/operations/ecma-container-object.c index 0981cbf49..30613fe49 100644 --- a/jerry-core/ecma/operations/ecma-container-object.c +++ b/jerry-core/ecma/operations/ecma-container-object.c @@ -26,7 +26,7 @@ #include "ecma-property-hashmap.h" #include "ecma-objects.h" -#if ENABLED (JERRY_BUILTIN_CONTAINER) +#if JERRY_BUILTIN_CONTAINER /** \addtogroup ecma ECMA * @{ @@ -184,7 +184,7 @@ ecma_op_container_entry_size (lit_magic_string_id_t lit_id) /**< class id */ return ECMA_CONTAINER_VALUE_SIZE; } /* ecma_op_container_entry_size */ -#if ENABLED (JERRY_BUILTIN_WEAKSET) +#if JERRY_BUILTIN_WEAKSET /** * Release the entries in the WeakSet container. */ @@ -213,9 +213,9 @@ ecma_op_container_free_weakset_entries (ecma_object_t *object_p, /**< object poi *entry_p = ECMA_VALUE_EMPTY; } } /* ecma_op_container_free_weakset_entries */ -#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ +#endif /* JERRY_BUILTIN_WEAKSET */ -#if ENABLED (JERRY_BUILTIN_WEAKMAP) +#if JERRY_BUILTIN_WEAKMAP /** * Release the entries in the WeakMap container. */ @@ -247,9 +247,9 @@ ecma_op_container_free_weakmap_entries (ecma_object_t *object_p, /**< object poi entry_p->value = ECMA_VALUE_EMPTY; } } /* ecma_op_container_free_weakmap_entries */ -#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ +#endif /* JERRY_BUILTIN_WEAKMAP */ -#if ENABLED (JERRY_BUILTIN_SET) +#if JERRY_BUILTIN_SET /** * Release the entries in the Set container. */ @@ -274,9 +274,9 @@ ecma_op_container_free_set_entries (ecma_collection_t *container_p) *entry_p = ECMA_VALUE_EMPTY; } } /* ecma_op_container_free_set_entries */ -#endif /* ENABLED (JERRY_BUILTIN_SET) */ +#endif /* JERRY_BUILTIN_SET */ -#if ENABLED (JERRY_BUILTIN_MAP) +#if JERRY_BUILTIN_MAP /** * Release the entries in the Map container. */ @@ -304,7 +304,7 @@ ecma_op_container_free_map_entries (ecma_collection_t *container_p) entry_p->value = ECMA_VALUE_EMPTY; } } /* ecma_op_container_free_map_entries */ -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ +#endif /* JERRY_BUILTIN_MAP */ /** * Release the internal buffer and the stored entries. @@ -320,34 +320,34 @@ ecma_op_container_free_entries (ecma_object_t *object_p) /**< collection object switch (map_object_p->u.class_prop.class_id) { -#if ENABLED (JERRY_BUILTIN_WEAKSET) +#if JERRY_BUILTIN_WEAKSET case LIT_MAGIC_STRING_WEAKSET_UL: { ecma_op_container_free_weakset_entries (object_p, container_p); break; } -#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ -#if ENABLED (JERRY_BUILTIN_WEAKMAP) +#endif /* JERRY_BUILTIN_WEAKSET */ +#if JERRY_BUILTIN_WEAKMAP case LIT_MAGIC_STRING_WEAKMAP_UL: { ecma_op_container_free_weakmap_entries (object_p, container_p); break; } -#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ -#if ENABLED (JERRY_BUILTIN_SET) +#endif /* JERRY_BUILTIN_WEAKMAP */ +#if JERRY_BUILTIN_SET case LIT_MAGIC_STRING_SET_UL: { ecma_op_container_free_set_entries (container_p); break; } -#endif /* ENABLED (JERRY_BUILTIN_SET) */ -#if ENABLED (JERRY_BUILTIN_MAP) +#endif /* JERRY_BUILTIN_SET */ +#if JERRY_BUILTIN_MAP case LIT_MAGIC_STRING_MAP_UL: { ecma_op_container_free_map_entries (container_p); break; } -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ +#endif /* JERRY_BUILTIN_MAP */ default: { break; @@ -401,7 +401,7 @@ ecma_op_container_create (const ecma_value_t *arguments_list_p, /**< arguments l ecma_value_t set_value = ecma_make_object_value (object_p); ecma_value_t result = set_value; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (arguments_list_len == 0) { return result; @@ -543,7 +543,7 @@ cleanup_adder: ecma_deref_object (adder_func_p); cleanup_object: ecma_deref_object (object_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return result; } /* ecma_op_container_create */ @@ -573,13 +573,13 @@ ecma_op_container_get_object (ecma_value_t this_arg, /**< this argument */ } } -#if ENABLED (JERRY_ERROR_MESSAGES) +#if JERRY_ERROR_MESSAGES ecma_raise_standard_error_with_format (ECMA_ERROR_TYPE, "Expected a % object", ecma_make_string_value (ecma_get_magic_string (lit_id))); -#else /* !ENABLED (JERRY_ERROR_MESSAGES) */ +#else /* !JERRY_ERROR_MESSAGES */ ecma_raise_type_error (NULL); -#endif /* ENABLED (JERRY_ERROR_MESSAGES) */ +#endif /* JERRY_ERROR_MESSAGES */ return NULL; } /* ecma_op_container_get_object */ @@ -609,12 +609,12 @@ ecma_op_container_get (ecma_extended_object_t *map_object_p, /**< map object */ ecma_value_t key_arg, /**< key argument */ lit_magic_string_id_t lit_id) /**< internal class id */ { -#if ENABLED (JERRY_BUILTIN_WEAKMAP) +#if JERRY_BUILTIN_WEAKMAP if (lit_id == LIT_MAGIC_STRING_WEAKMAP_UL && !ecma_is_value_object (key_arg)) { return ECMA_VALUE_UNDEFINED; } -#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ +#endif /* JERRY_BUILTIN_WEAKMAP */ ecma_collection_t *container_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, map_object_p->u.class_prop.u.value); @@ -648,13 +648,13 @@ ecma_op_container_has (ecma_extended_object_t *map_object_p, /**< map object */ ecma_collection_t *container_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, map_object_p->u.class_prop.u.value); -#if ENABLED (JERRY_BUILTIN_WEAKMAP) || ENABLED (JERRY_BUILTIN_WEAKSET) +#if JERRY_BUILTIN_WEAKMAP || JERRY_BUILTIN_WEAKSET if ((map_object_p->u.class_prop.extra_info & ECMA_CONTAINER_FLAGS_WEAK) != 0 && !ecma_is_value_object (key_arg)) { return ECMA_VALUE_FALSE; } -#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) || ENABLED (JERRY_BUILTIN_WEAKSET) */ +#endif /* JERRY_BUILTIN_WEAKMAP || JERRY_BUILTIN_WEAKSET */ if (ECMA_CONTAINER_GET_SIZE (container_p) == 0) { @@ -748,13 +748,13 @@ ecma_op_container_set (ecma_extended_object_t *map_object_p, /**< map object */ ecma_collection_t *container_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, map_object_p->u.class_prop.u.value); -#if ENABLED (JERRY_BUILTIN_WEAKMAP) || ENABLED (JERRY_BUILTIN_WEAKSET) +#if JERRY_BUILTIN_WEAKMAP || JERRY_BUILTIN_WEAKSET if ((map_object_p->u.class_prop.extra_info & ECMA_CONTAINER_FLAGS_WEAK) != 0 && !ecma_is_value_object (key_arg)) { return ecma_raise_type_error (ECMA_ERR_MSG ("Key must be an object")); } -#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) || ENABLED (JERRY_BUILTIN_WEAKSET) */ +#endif /* JERRY_BUILTIN_WEAKMAP || JERRY_BUILTIN_WEAKSET */ ecma_value_t *entry_p = ecma_op_internal_buffer_find (container_p, key_arg, lit_id); @@ -765,13 +765,13 @@ ecma_op_container_set (ecma_extended_object_t *map_object_p, /**< map object */ value_arg, lit_id); -#if ENABLED (JERRY_BUILTIN_WEAKMAP) || ENABLED (JERRY_BUILTIN_WEAKSET) +#if JERRY_BUILTIN_WEAKMAP || JERRY_BUILTIN_WEAKSET if ((map_object_p->u.class_prop.extra_info & ECMA_CONTAINER_FLAGS_WEAK) != 0) { ecma_object_t *key_p = ecma_get_object_from_value (key_arg); ecma_op_container_set_weak (key_p, map_object_p); } -#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) || ENABLED (JERRY_BUILTIN_WEAKSET) */ +#endif /* JERRY_BUILTIN_WEAKMAP || JERRY_BUILTIN_WEAKSET */ } else { @@ -957,7 +957,7 @@ ecma_op_container_remove_weak_entry (ecma_object_t *object_p, /**< internal cont ecma_op_internal_buffer_delete (container_p, (ecma_container_pair_t *) entry_p, map_object_p->u.class_prop.class_id); } /* ecma_op_container_remove_weak_entry */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * The Create{Set, Map}Iterator Abstract operation @@ -1227,11 +1227,11 @@ ecma_builtin_container_dispatch_routine (uint16_t builtin_routine_id, /**< built } } /* ecma_builtin_container_dispatch_routine */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} * @} */ -#endif /* ENABLED (JERRY_BUILTIN_CONTAINER) */ +#endif /* JERRY_BUILTIN_CONTAINER */ diff --git a/jerry-core/ecma/operations/ecma-container-object.h b/jerry-core/ecma/operations/ecma-container-object.h index 416df81ed..2d2661911 100644 --- a/jerry-core/ecma/operations/ecma-container-object.h +++ b/jerry-core/ecma/operations/ecma-container-object.h @@ -19,7 +19,7 @@ #include "ecma-globals.h" #include "ecma-builtins.h" -#if ENABLED (JERRY_BUILTIN_CONTAINER) +#if JERRY_BUILTIN_CONTAINER /** \addtogroup ecma ECMA * @{ @@ -84,6 +84,6 @@ ecma_value_t ecma_builtin_container_dispatch_routine (uint16_t builtin_routine_i * @} */ -#endif /* ENABLED (JERRY_BUILTIN_CONTAINER) */ +#endif /* JERRY_BUILTIN_CONTAINER */ #endif /* !ECMA_CONTAINER_OBJECT_H */ diff --git a/jerry-core/ecma/operations/ecma-conversion.c b/jerry-core/ecma/operations/ecma-conversion.c index 39f0388ce..2f60c67d2 100644 --- a/jerry-core/ecma/operations/ecma-conversion.c +++ b/jerry-core/ecma/operations/ecma-conversion.c @@ -123,19 +123,19 @@ ecma_op_same_value (ecma_value_t x, /**< ecma value */ return ecma_compare_ecma_strings (x_str_p, y_str_p); } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (ecma_is_value_bigint (x)) { return (ecma_is_value_bigint (y) && ecma_bigint_compare_to_bigint (x, y) == 0); } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ JERRY_ASSERT (ecma_is_value_object (x) || ecma_is_value_symbol (x)); return false; } /* ecma_op_same_value */ -#if ENABLED (JERRY_BUILTIN_MAP) +#if JERRY_BUILTIN_MAP /** * SameValueZero operation. * @@ -182,7 +182,7 @@ ecma_op_same_value_zero (ecma_value_t x, /**< ecma value */ return ecma_op_same_value (x, y); } /* ecma_op_same_value_zero */ -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ +#endif /* JERRY_BUILTIN_MAP */ /** * ToPrimitive operation. @@ -253,12 +253,12 @@ ecma_op_to_boolean (ecma_value_t value) /**< ecma value */ return !ecma_string_is_empty (str_p); } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (ecma_is_value_bigint (value)) { return value != ECMA_BIGINT_ZERO; } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ JERRY_ASSERT (ecma_is_value_object (value) || ecma_is_value_symbol (value)); @@ -341,14 +341,14 @@ ecma_op_to_numeric (ecma_value_t value, /**< ecma value */ return ECMA_VALUE_EMPTY; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ecma_is_value_symbol (value)) { return ecma_raise_type_error (ECMA_ERR_MSG ("Cannot convert a Symbol value to a number")); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (ecma_is_value_bigint (value)) { if (options & ECMA_TO_NUMERIC_ALLOW_BIGINT) @@ -357,7 +357,7 @@ ecma_op_to_numeric (ecma_value_t value, /**< ecma value */ } return ecma_raise_type_error (ECMA_ERR_MSG ("Cannot convert a BigInt value to a number")); } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ JERRY_ASSERT (ecma_is_value_object (value)); @@ -438,20 +438,20 @@ ecma_op_to_string (ecma_value_t value) /**< ecma value */ return ecma_get_magic_string (LIT_MAGIC_STRING_FALSE); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ecma_is_value_symbol (value)) { ecma_raise_type_error (ECMA_ERR_MSG ("Cannot convert a Symbol value to a string")); return NULL; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (ecma_is_value_bigint (value)) { return ecma_bigint_to_string (value, 10); } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ JERRY_ASSERT (ecma_is_value_object (value)); @@ -493,7 +493,7 @@ ecma_op_to_property_key (ecma_value_t value) /**< ecma value */ return key_p; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t key = ecma_op_to_primitive (value, ECMA_PREFERRED_TYPE_STRING); if (ECMA_IS_VALUE_ERROR (key)) @@ -511,11 +511,11 @@ ecma_op_to_property_key (ecma_value_t value) /**< ecma value */ ecma_free_value (key); return result; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ ecma_check_value_type_is_spec_defined (value); return ecma_op_to_string (value); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* ecma_op_to_property_key */ /** @@ -536,35 +536,35 @@ ecma_op_to_object (ecma_value_t value) /**< ecma value */ if (ecma_is_value_number (value)) { -#if ENABLED (JERRY_BUILTIN_NUMBER) +#if JERRY_BUILTIN_NUMBER proto_id = ECMA_BUILTIN_ID_NUMBER_PROTOTYPE; -#endif /* ENABLED (JERRY_BUILTIN_NUMBER) */ +#endif /* JERRY_BUILTIN_NUMBER */ lit_id = LIT_MAGIC_STRING_NUMBER_UL; } else if (ecma_is_value_string (value)) { -#if ENABLED (JERRY_BUILTIN_STRING) +#if JERRY_BUILTIN_STRING proto_id = ECMA_BUILTIN_ID_STRING_PROTOTYPE; -#endif /* ENABLED (JERRY_BUILTIN_STRING) */ +#endif /* JERRY_BUILTIN_STRING */ lit_id = LIT_MAGIC_STRING_STRING_UL; } else if (ecma_is_value_object (value)) { return ecma_copy_value (value); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (ecma_is_value_symbol (value)) { proto_id = ECMA_BUILTIN_ID_SYMBOL_PROTOTYPE; lit_id = LIT_MAGIC_STRING_SYMBOL_UL; } -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#endif /* JERRY_ESNEXT */ +#if JERRY_BUILTIN_BIGINT else if (ecma_is_value_bigint (value)) { return ecma_op_create_bigint_object (value); } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ else { if (ecma_is_value_undefined (value) @@ -575,9 +575,9 @@ ecma_op_to_object (ecma_value_t value) /**< ecma value */ else { JERRY_ASSERT (ecma_is_value_boolean (value)); -#if ENABLED (JERRY_BUILTIN_BOOLEAN) +#if JERRY_BUILTIN_BOOLEAN proto_id = ECMA_BUILTIN_ID_BOOLEAN_PROTOTYPE; -#endif /* ENABLED (JERRY_BUILTIN_BOOLEAN) */ +#endif /* JERRY_BUILTIN_BOOLEAN */ lit_id = LIT_MAGIC_STRING_BOOLEAN_UL; } } @@ -656,11 +656,11 @@ ecma_op_from_property_descriptor (const ecma_property_descriptor_t *src_prop_des } else { -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT JERRY_ASSERT (src_prop_desc_p->flags & (ECMA_PROP_IS_GET_DEFINED | ECMA_PROP_IS_SET_DEFINED)); -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ if (src_prop_desc_p->flags & (ECMA_PROP_IS_GET_DEFINED | ECMA_PROP_IS_SET_DEFINED)) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { /* a. */ if (src_prop_desc_p->get_p == NULL) @@ -999,7 +999,7 @@ ecma_op_to_length (ecma_value_t value, /**< ecma value */ return value; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* 2 */ ecma_number_t num; ecma_value_t length_num = ecma_op_to_integer (value, &num); @@ -1027,7 +1027,7 @@ ecma_op_to_length (ecma_value_t value, /**< ecma value */ /* 6 */ *length = (ecma_length_t) num; return ECMA_VALUE_EMPTY; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ /* In the case of ES5, ToLength(ES6) operation is the same as ToUint32(ES5) */ ecma_number_t num; ecma_value_t to_number = ecma_op_to_number (value, &num); @@ -1040,10 +1040,10 @@ ecma_op_to_length (ecma_value_t value, /**< ecma value */ *length = ecma_number_to_uint32 (num); return ECMA_VALUE_EMPTY; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* ecma_op_to_length */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * ToIndex operation. * @@ -1145,7 +1145,7 @@ ecma_op_create_list_from_array_like (ecma_value_t arr, /**< array value */ /* 9. */ return list_ptr; } /* ecma_op_create_list_from_array_like */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-conversion.h b/jerry-core/ecma/operations/ecma-conversion.h index 32de03757..f7375e813 100644 --- a/jerry-core/ecma/operations/ecma-conversion.h +++ b/jerry-core/ecma/operations/ecma-conversion.h @@ -49,9 +49,9 @@ typedef enum bool ecma_op_require_object_coercible (ecma_value_t value); bool ecma_op_same_value (ecma_value_t x, ecma_value_t y); -#if ENABLED (JERRY_BUILTIN_MAP) +#if JERRY_BUILTIN_MAP bool ecma_op_same_value_zero (ecma_value_t x, ecma_value_t y, bool strict_equality); -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ +#endif /* JERRY_BUILTIN_MAP */ ecma_value_t ecma_op_to_primitive (ecma_value_t value, ecma_preferred_type_hint_t preferred_type); bool ecma_op_to_boolean (ecma_value_t value); ecma_value_t ecma_op_to_number (ecma_value_t value, ecma_number_t *number_p); @@ -65,10 +65,10 @@ ecma_value_t ecma_op_create_class_object (ecma_builtin_id_t proto_id, uint16_t lit_id); ecma_value_t ecma_op_to_integer (ecma_value_t value, ecma_number_t *number_p); ecma_value_t ecma_op_to_length (ecma_value_t value, ecma_length_t *length); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t ecma_op_to_index (ecma_value_t value, ecma_number_t *index); ecma_collection_t *ecma_op_create_list_from_array_like (ecma_value_t arr, bool prop_names_only); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_object_t *ecma_op_from_property_descriptor (const ecma_property_descriptor_t *src_prop_desc_p); ecma_value_t ecma_op_to_property_descriptor (ecma_value_t obj_value, ecma_property_descriptor_t *out_prop_desc_p); diff --git a/jerry-core/ecma/operations/ecma-dataview-object.c b/jerry-core/ecma/operations/ecma-dataview-object.c index d5bc5de65..074e169b0 100644 --- a/jerry-core/ecma/operations/ecma-dataview-object.c +++ b/jerry-core/ecma/operations/ecma-dataview-object.c @@ -25,7 +25,7 @@ #include "ecma-typedarray-object.h" #include "ecma-objects.h" -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW /** \addtogroup ecma ECMA * @{ @@ -268,7 +268,7 @@ ecma_op_dataview_get_set_view_value (ecma_value_t view, /**< the operation's 'vi /* SetViewValue 4 - 5. */ if (!ecma_is_value_empty (value_to_set)) { -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (ECMA_TYPEDARRAY_IS_BIGINT_TYPE (id)) { value_to_set = ecma_bigint_to_bigint (value_to_set, true); @@ -279,7 +279,7 @@ ecma_op_dataview_get_set_view_value (ecma_value_t view, /**< the operation's 'vi } } else -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ { ecma_number_t value_to_set_number; ecma_value_t value = ecma_op_to_number (value_to_set, &value_to_set_number); @@ -373,4 +373,4 @@ ecma_is_dataview (ecma_value_t value) /**< the target need to be checked */ * @} */ -#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW */ +#endif /* JERRY_BUILTIN_DATAVIEW */ diff --git a/jerry-core/ecma/operations/ecma-dataview-object.h b/jerry-core/ecma/operations/ecma-dataview-object.h index 11b15897f..cac99a25e 100644 --- a/jerry-core/ecma/operations/ecma-dataview-object.h +++ b/jerry-core/ecma/operations/ecma-dataview-object.h @@ -18,7 +18,7 @@ #include "ecma-globals.h" -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW /** \addtogroup ecma ECMA * @{ @@ -39,6 +39,6 @@ bool ecma_is_dataview (ecma_value_t value); * @} */ -#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW */ +#endif /* JERRY_BUILTIN_DATAVIEW */ #endif /* !ECMA_DATAVIEW_OBJECT_H */ diff --git a/jerry-core/ecma/operations/ecma-eval.c b/jerry-core/ecma/operations/ecma-eval.c index 54a7eeef3..50a29cb99 100644 --- a/jerry-core/ecma/operations/ecma-eval.c +++ b/jerry-core/ecma/operations/ecma-eval.c @@ -79,7 +79,7 @@ ecma_op_eval_chars_buffer (const lit_utf8_byte_t *code_p, /**< code characters b size_t code_buffer_size, /**< size of the buffer */ uint32_t parse_opts) /**< ecma_parse_opts_t option bits */ { -#if ENABLED (JERRY_PARSER) +#if JERRY_PARSER JERRY_ASSERT (code_p != NULL); uint32_t is_strict_call = ECMA_PARSE_STRICT_MODE | ECMA_PARSE_DIRECT_EVAL; @@ -91,9 +91,9 @@ ecma_op_eval_chars_buffer (const lit_utf8_byte_t *code_p, /**< code characters b parse_opts |= ECMA_PARSE_EVAL; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ECMA_CLEAR_LOCAL_PARSE_OPTS (); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t resource_name = ecma_make_magic_string_value (LIT_MAGIC_STRING_RESOURCE_EVAL); ecma_compiled_code_t *bytecode_p = parser_parse_script (NULL, @@ -109,13 +109,13 @@ ecma_op_eval_chars_buffer (const lit_utf8_byte_t *code_p, /**< code characters b } return vm_run_eval (bytecode_p, parse_opts); -#else /* !ENABLED (JERRY_PARSER) */ +#else /* !JERRY_PARSER */ JERRY_UNUSED (code_p); JERRY_UNUSED (code_buffer_size); JERRY_UNUSED (parse_opts); return ecma_raise_syntax_error (ECMA_ERR_MSG ("Source code parsing is disabled")); -#endif /* ENABLED (JERRY_PARSER) */ +#endif /* JERRY_PARSER */ } /* ecma_op_eval_chars_buffer */ /** diff --git a/jerry-core/ecma/operations/ecma-exceptions.c b/jerry-core/ecma/operations/ecma-exceptions.c index f1e069891..424724547 100644 --- a/jerry-core/ecma/operations/ecma-exceptions.c +++ b/jerry-core/ecma/operations/ecma-exceptions.c @@ -25,9 +25,9 @@ #include "jcontext.h" #include "jrt.h" -#if ENABLED (JERRY_LINE_INFO) +#if JERRY_LINE_INFO #include "vm.h" -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ /** \addtogroup ecma ECMA * @{ @@ -53,14 +53,14 @@ const ecma_error_mapping_t ecma_error_mappings[] = #define ERROR_ELEMENT(TYPE, ID) { TYPE, ID } ERROR_ELEMENT (ECMA_ERROR_COMMON, ECMA_BUILTIN_ID_ERROR_PROTOTYPE), -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS ERROR_ELEMENT (ECMA_ERROR_EVAL, ECMA_BUILTIN_ID_EVAL_ERROR_PROTOTYPE), ERROR_ELEMENT (ECMA_ERROR_RANGE, ECMA_BUILTIN_ID_RANGE_ERROR_PROTOTYPE), ERROR_ELEMENT (ECMA_ERROR_REFERENCE, ECMA_BUILTIN_ID_REFERENCE_ERROR_PROTOTYPE), ERROR_ELEMENT (ECMA_ERROR_TYPE, ECMA_BUILTIN_ID_TYPE_ERROR_PROTOTYPE), ERROR_ELEMENT (ECMA_ERROR_URI, ECMA_BUILTIN_ID_URI_ERROR_PROTOTYPE), ERROR_ELEMENT (ECMA_ERROR_SYNTAX, ECMA_BUILTIN_ID_SYNTAX_ERROR_PROTOTYPE), -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ #undef ERROR_ELEMENT }; @@ -82,7 +82,7 @@ ecma_object_t * ecma_new_standard_error (ecma_standard_error_t error_type, /**< native error type */ ecma_string_t *message_string_p) /**< message string */ { -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS ecma_builtin_id_t prototype_id = ECMA_BUILTIN_ID__COUNT; switch (error_type) @@ -134,7 +134,7 @@ ecma_new_standard_error (ecma_standard_error_t error_type, /**< native error typ #else JERRY_UNUSED (error_type); ecma_builtin_id_t prototype_id = ECMA_BUILTIN_ID_ERROR_PROTOTYPE; -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ ecma_object_t *prototype_obj_p = ecma_builtin_get (prototype_id); @@ -167,7 +167,7 @@ ecma_new_standard_error (ecma_standard_error_t error_type, /**< native error typ } else { -#if ENABLED (JERRY_LINE_INFO) +#if JERRY_LINE_INFO /* Default decorator when line info is enabled. */ ecma_string_t *stack_str_p = ecma_get_magic_string (LIT_MAGIC_STRING_STACK); @@ -181,7 +181,7 @@ ecma_new_standard_error (ecma_standard_error_t error_type, /**< native error typ prop_value_p->value = backtrace_value; ecma_deref_object (ecma_get_object_from_value (backtrace_value)); -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ } return new_error_obj_p; @@ -244,7 +244,7 @@ ecma_raise_standard_error (ecma_standard_error_t error_type, /**< error type */ return ECMA_VALUE_ERROR; } /* ecma_raise_standard_error */ -#if ENABLED (JERRY_ERROR_MESSAGES) +#if JERRY_ERROR_MESSAGES /** * Raise a standard ecma-error with the given format string and arguments. @@ -288,13 +288,13 @@ ecma_raise_standard_error_with_format (ecma_standard_error_t error_type, /**< er lit_magic_string_id_t class_name = ecma_object_get_class_name (arg_object_p); arg_string_p = ecma_get_magic_string (class_name); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (ecma_is_value_symbol (arg_val)) { ecma_value_t symbol_desc_value = ecma_get_symbol_descriptive_string (arg_val); arg_string_p = ecma_get_string_from_value (symbol_desc_value); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ else { arg_string_p = ecma_op_to_string (arg_val); @@ -330,7 +330,7 @@ ecma_raise_standard_error_with_format (ecma_standard_error_t error_type, /**< er return ECMA_VALUE_ERROR; } /* ecma_raise_standard_error_with_format */ -#endif /* ENABLED (JERRY_ERROR_MESSAGES) */ +#endif /* JERRY_ERROR_MESSAGES */ /** * Raise a common error with the given message. diff --git a/jerry-core/ecma/operations/ecma-exceptions.h b/jerry-core/ecma/operations/ecma-exceptions.h index 0d254449d..653d80467 100644 --- a/jerry-core/ecma/operations/ecma-exceptions.h +++ b/jerry-core/ecma/operations/ecma-exceptions.h @@ -26,11 +26,11 @@ * @{ */ -#if ENABLED (JERRY_ERROR_MESSAGES) +#if JERRY_ERROR_MESSAGES #define ECMA_ERR_MSG(msg) msg -#else /* !ENABLED (JERRY_ERROR_MESSAGES) */ +#else /* !JERRY_ERROR_MESSAGES */ #define ECMA_ERR_MSG(msg) NULL -#endif /* ENABLED (JERRY_ERROR_MESSAGES) */ +#endif /* JERRY_ERROR_MESSAGES */ /** * Native errors. @@ -52,9 +52,9 @@ typedef enum ecma_standard_error_t ecma_get_error_type (ecma_object_t *error_object); ecma_object_t *ecma_new_standard_error (ecma_standard_error_t error_type, ecma_string_t *message_string_p); -#if ENABLED (JERRY_ERROR_MESSAGES) +#if JERRY_ERROR_MESSAGES ecma_value_t ecma_raise_standard_error_with_format (ecma_standard_error_t error_type, const char *msg_p, ...); -#endif /* ENABLED (JERRY_ERROR_MESSAGES) */ +#endif /* JERRY_ERROR_MESSAGES */ ecma_value_t ecma_raise_common_error (const char *msg_p); ecma_value_t ecma_raise_range_error (const char *msg_p); ecma_value_t ecma_raise_reference_error (const char *msg_p); diff --git a/jerry-core/ecma/operations/ecma-function-object.c b/jerry-core/ecma/operations/ecma-function-object.c index 72fef38bd..e143bd0f2 100644 --- a/jerry-core/ecma/operations/ecma-function-object.c +++ b/jerry-core/ecma/operations/ecma-function-object.c @@ -36,7 +36,7 @@ * @{ */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * SetFunctionName operation * @@ -86,7 +86,7 @@ ecma_op_function_form_name (ecma_string_t *prop_name_p, /**< property name */ return ecma_make_string_value (prop_name_p); } /* ecma_op_function_form_name */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * IsCallable operation. @@ -103,12 +103,12 @@ ecma_op_object_is_callable (ecma_object_t *obj_p) /**< ecma object */ const ecma_object_type_t type = ecma_get_object_type (obj_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_TYPE_IS_PROXY (type)) { return (obj_p->u2.prototype_cp & ECMA_PROXY_IS_CALLABLE) != 0; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ return type >= ECMA_OBJECT_TYPE_FUNCTION; } /* ecma_op_object_is_callable */ @@ -161,12 +161,12 @@ ecma_object_check_constructor (ecma_object_t *obj_p) /**< ecma object */ { JERRY_ASSERT (!ecma_get_object_is_builtin (obj_p)); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const ecma_compiled_code_t *byte_code_p = ecma_op_function_get_compiled_code ((ecma_extended_object_t *) obj_p); if (!CBC_FUNCTION_IS_CONSTRUCTABLE (byte_code_p->status_flags)) { -#if ENABLED (JERRY_ERROR_MESSAGES) +#if JERRY_ERROR_MESSAGES switch (CBC_FUNCTION_GET_TYPE (byte_code_p->status_flags)) { case CBC_FUNCTION_SCRIPT: @@ -203,16 +203,16 @@ ecma_object_check_constructor (ecma_object_t *obj_p) /**< ecma object */ return "Async arrow functions cannot be invoked with 'new'"; } } -#else /* !ENABLED (JERRY_ERROR_MESSAGES) */ +#else /* !JERRY_ERROR_MESSAGES */ return NULL; -#endif /* ENABLED (JERRY_ERROR_MESSAGES) */ +#endif /* JERRY_ERROR_MESSAGES */ } -#endif /* ENABLED (JERRY_NEXT) */ +#endif /* JERRY_NEXT */ return ECMA_IS_VALID_CONSTRUCTOR; } -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_TYPE_IS_PROXY (type)) { if (!(obj_p->u2.prototype_cp & ECMA_PROXY_IS_CONSTRUCTABLE)) @@ -222,7 +222,7 @@ ecma_object_check_constructor (ecma_object_t *obj_p) /**< ecma object */ return ECMA_IS_VALID_CONSTRUCTOR; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ JERRY_ASSERT (type == ECMA_OBJECT_TYPE_NATIVE_FUNCTION); @@ -233,9 +233,9 @@ ecma_object_check_constructor (ecma_object_t *obj_p) /**< ecma object */ return ECMA_ERR_MSG ("Built-in routines have no constructor"); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_ASSERT (((ecma_extended_object_t *) obj_p)->u.built_in.id != ECMA_BUILTIN_ID_HANDLER); -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ } return ECMA_IS_VALID_CONSTRUCTOR; @@ -356,12 +356,12 @@ ecma_op_create_function_object (ecma_object_t *scope_p, /**< function's scope */ size_t function_object_size = sizeof (ecma_extended_object_t); -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC if (bytecode_data_p->status_flags & CBC_CODE_FLAGS_STATIC_FUNCTION) { function_object_size = sizeof (ecma_static_function_t); } -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ ecma_object_t *func_p = ecma_create_object (prototype_obj_p, function_object_size, @@ -388,14 +388,14 @@ ecma_op_create_function_object (ecma_object_t *scope_p, /**< function's scope */ /* 10., 11., 12. */ -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC if (bytecode_data_p->status_flags & CBC_CODE_FLAGS_STATIC_FUNCTION) { ext_func_p->u.function.bytecode_cp = JMEM_CP_NULL; ((ecma_static_function_t *) func_p)->bytecode_p = bytecode_data_p; } else -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ { ECMA_SET_INTERNAL_VALUE_POINTER (ext_func_p->u.function.bytecode_cp, bytecode_data_p); ecma_bytecode_ref ((ecma_compiled_code_t *) bytecode_data_p); @@ -475,22 +475,22 @@ ecma_op_create_dynamic_function (const ecma_value_t *arguments_list_p, /**< argu return ECMA_VALUE_ERROR; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t *func_name_p; func_name_p = ecma_compiled_code_resolve_function_name ((const ecma_compiled_code_t *) bytecode_p); *func_name_p = ecma_make_magic_string_value (LIT_MAGIC_STRING_ANONYMOUS); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_object_t *global_object_p = ecma_builtin_get_global (); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS JERRY_ASSERT (global_object_p == (ecma_object_t *) ecma_op_function_get_realm (bytecode_p)); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ ecma_object_t *global_env_p = ecma_get_global_environment (global_object_p); ecma_builtin_id_t fallback_proto = ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_object_t *new_target_p = JERRY_CONTEXT (current_new_target_p); ecma_builtin_id_t fallback_ctor = ECMA_BUILTIN_ID_FUNCTION; @@ -523,14 +523,14 @@ ecma_op_create_dynamic_function (const ecma_value_t *arguments_list_p, /**< argu ecma_bytecode_deref (bytecode_p); return ECMA_VALUE_ERROR; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_object_t *func_obj_p = ecma_op_create_function_object (global_env_p, bytecode_p, fallback_proto); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ECMA_SET_NON_NULL_POINTER (func_obj_p->u2.prototype_cp, proto); ecma_deref_object (proto); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_bytecode_deref (bytecode_p); return ecma_make_object_value (func_obj_p); @@ -550,7 +550,7 @@ ecma_op_create_simple_function_object (ecma_object_t *scope_p, /**< function's s return ecma_op_create_function_object (scope_p, bytecode_data_p, ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE); } /* ecma_op_create_simple_function_object */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Create a function object with the appropriate prototype. @@ -616,12 +616,12 @@ ecma_op_create_arrow_function_object (ecma_object_t *scope_p, /**< function's sc size_t arrow_function_object_size = sizeof (ecma_arrow_function_t); -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC if (bytecode_data_p->status_flags & CBC_CODE_FLAGS_STATIC_FUNCTION) { arrow_function_object_size = sizeof (ecma_static_arrow_function_t); } -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ ecma_object_t *func_p = ecma_create_object (prototype_obj_p, arrow_function_object_size, @@ -631,7 +631,7 @@ ecma_op_create_arrow_function_object (ecma_object_t *scope_p, /**< function's sc ECMA_SET_NON_NULL_POINTER_TAG (arrow_func_p->header.u.function.scope_cp, scope_p, 0); -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC if ((bytecode_data_p->status_flags & CBC_CODE_FLAGS_STATIC_FUNCTION)) { arrow_func_p->header.u.function.bytecode_cp = ECMA_NULL_POINTER; @@ -639,12 +639,12 @@ ecma_op_create_arrow_function_object (ecma_object_t *scope_p, /**< function's sc } else { -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ ECMA_SET_INTERNAL_VALUE_POINTER (arrow_func_p->header.u.function.bytecode_cp, bytecode_data_p); ecma_bytecode_ref ((ecma_compiled_code_t *) bytecode_data_p); -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC } -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ arrow_func_p->this_binding = ecma_copy_value_if_not_object (this_binding); arrow_func_p->new_target = ECMA_VALUE_UNDEFINED; @@ -656,7 +656,7 @@ ecma_op_create_arrow_function_object (ecma_object_t *scope_p, /**< function's sc return func_p; } /* ecma_op_create_arrow_function_object */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * External function object creation operation. @@ -683,16 +683,16 @@ ecma_op_create_external_function_object (ecma_native_handler_t handler_cb) /**< */ ecma_native_function_t *native_function_p = (ecma_native_function_t *) function_obj_p; -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ECMA_SET_INTERNAL_VALUE_POINTER (native_function_p->realm_value, ecma_builtin_get_global ()); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ native_function_p->native_handler_cb = handler_cb; return function_obj_p; } /* ecma_op_create_external_function_object */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Create built-in native handler object. @@ -715,15 +715,15 @@ ecma_op_create_native_handler (ecma_native_handler_id_t id, /**< handler id */ ext_func_obj_p->u.built_in.routine_id = (uint8_t) id; ext_func_obj_p->u.built_in.u2.routine_flags = ECMA_NATIVE_HANDLER_FLAGS_NONE; -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ECMA_SET_INTERNAL_VALUE_POINTER (ext_func_obj_p->u.built_in.realm_value, ecma_builtin_get_global ()); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ return function_obj_p; } /* ecma_op_create_native_handler */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Get compiled code of a function object. @@ -733,7 +733,7 @@ ecma_op_create_native_handler (ecma_native_handler_id_t id, /**< handler id */ extern inline const ecma_compiled_code_t * JERRY_ATTR_ALWAYS_INLINE ecma_op_function_get_compiled_code (ecma_extended_object_t *function_p) /**< function pointer */ { -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC if (JERRY_LIKELY (function_p->u.function.bytecode_cp != ECMA_NULL_POINTER)) { return ECMA_GET_INTERNAL_VALUE_POINTER (const ecma_compiled_code_t, @@ -741,13 +741,13 @@ ecma_op_function_get_compiled_code (ecma_extended_object_t *function_p) /**< fun } return ((ecma_static_function_t *) function_p)->bytecode_p; -#else /* !ENABLED (JERRY_SNAPSHOT_EXEC) */ +#else /* !JERRY_SNAPSHOT_EXEC */ return ECMA_GET_INTERNAL_VALUE_POINTER (const ecma_compiled_code_t, function_p->u.function.bytecode_cp); -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ } /* ecma_op_function_get_compiled_code */ -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS /** * Get realm from a byte code. @@ -773,16 +773,16 @@ ecma_op_function_get_realm (const ecma_compiled_code_t *bytecode_header_p) /**< realm_value = args_p->realm_value; } -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC if (JERRY_LIKELY (realm_value != JMEM_CP_NULL)) { return ECMA_GET_INTERNAL_VALUE_POINTER (ecma_global_object_t, realm_value); } return (ecma_global_object_t *) ecma_builtin_get_global (); -#else /* !ENABLED (JERRY_SNAPSHOT_EXEC) */ +#else /* !JERRY_SNAPSHOT_EXEC */ return ECMA_GET_INTERNAL_VALUE_POINTER (ecma_global_object_t, realm_value); -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ } /* ecma_op_function_get_realm */ /** @@ -818,7 +818,7 @@ ecma_op_function_get_function_realm (ecma_object_t *func_obj_p) /**< function ob native_function_p->realm_value); } - #if ENABLED (JERRY_BUILTIN_PROXY) + #if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (func_obj_p)) { ecma_proxy_object_t *proxy_obj_p = (ecma_proxy_object_t *) func_obj_p; @@ -830,7 +830,7 @@ ecma_op_function_get_function_realm (ecma_object_t *func_obj_p) /**< function ob func_obj_p = ecma_get_object_from_value (proxy_obj_p->target); continue; } - #endif /* ENABLED (JERRY_BUILTIN_PROXY) */ + #endif /* JERRY_BUILTIN_PROXY */ JERRY_ASSERT (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_BOUND_FUNCTION); ecma_bound_function_t *bound_func_p = (ecma_bound_function_t *) func_obj_p; @@ -839,7 +839,7 @@ ecma_op_function_get_function_realm (ecma_object_t *func_obj_p) /**< function ob } } /* ecma_op_function_get_function_realm */ -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ /** * 15.3.5.3 implementation of [[HasInstance]] for Function objects @@ -894,11 +894,11 @@ ecma_op_function_has_instance (ecma_object_t *func_obj_p, /**< Function object * ecma_object_t *prototype_obj_p = ecma_get_object_from_value (prototype_obj_value); JERRY_ASSERT (prototype_obj_p != NULL); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY ecma_value_t result = ECMA_VALUE_ERROR; -#else /* !ENABLED (JERRY_BUILTIN_PROXY) */ +#else /* !JERRY_BUILTIN_PROXY */ ecma_value_t result = ECMA_VALUE_FALSE; -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ ecma_ref_object (v_obj_p); @@ -909,9 +909,9 @@ ecma_op_function_has_instance (ecma_object_t *func_obj_p, /**< Function object * if (current_proto_p == NULL) { -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY result = ECMA_VALUE_FALSE; -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ break; } else if (current_proto_p == ECMA_OBJECT_POINTER_ERROR) @@ -934,7 +934,7 @@ ecma_op_function_has_instance (ecma_object_t *func_obj_p, /**< Function object * return result; } /* ecma_op_function_has_instance */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * GetSuperConstructor operation for class methods @@ -964,7 +964,7 @@ ecma_op_function_get_super_constructor (ecma_object_t *func_obj_p) /**< function return ecma_make_object_value (super_ctor_p); } /* ecma_op_function_get_super_constructor */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Ordinary internal method: GetPrototypeFromConstructor (constructor, intrinsicDefaultProto) @@ -996,7 +996,7 @@ ecma_op_get_prototype_from_constructor (ecma_object_t *ctor_obj_p, /**< construc { ecma_free_value (proto); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (ctor_obj_p)) { ecma_proxy_object_t *proxy_obj_p = (ecma_proxy_object_t *) ctor_obj_p; @@ -1006,13 +1006,13 @@ ecma_op_get_prototype_from_constructor (ecma_object_t *ctor_obj_p, /**< construc return NULL; } } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS proto_obj_p = ecma_builtin_get_from_realm (ecma_op_function_get_function_realm (ctor_obj_p), default_proto_id); -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ proto_obj_p = ecma_builtin_get (default_proto_id); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ ecma_ref_object (proto_obj_p); } else @@ -1059,12 +1059,12 @@ ecma_op_function_call_simple (ecma_object_t *func_obj_p, /**< Function object */ shared_args.header.bytecode_header_p = bytecode_data_p; -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_global_object_t *realm_p = ecma_op_function_get_realm (bytecode_data_p); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ /* 1. */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (CBC_FUNCTION_IS_ARROW (status_flags))) { ecma_arrow_function_t *arrow_func_p = (ecma_arrow_function_t *) func_obj_p; @@ -1082,7 +1082,7 @@ ecma_op_function_call_simple (ecma_object_t *func_obj_p, /**< Function object */ else { shared_args.header.status_flags |= VM_FRAME_CTX_SHARED_NON_ARROW_FUNC; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (!(status_flags & CBC_CODE_FLAGS_STRICT_MODE)) { @@ -1090,11 +1090,11 @@ ecma_op_function_call_simple (ecma_object_t *func_obj_p, /**< Function object */ || ecma_is_value_null (this_binding)) { /* 2. */ -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS this_binding = realm_p->this_binding; -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ this_binding = ecma_make_object_value (ecma_builtin_get_global ()); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ } else if (!ecma_is_value_object (this_binding)) { @@ -1105,9 +1105,9 @@ ecma_op_function_call_simple (ecma_object_t *func_obj_p, /**< Function object */ JERRY_ASSERT (!ECMA_IS_VALUE_ERROR (this_binding)); } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* 5. */ if (!(status_flags & CBC_CODE_FLAGS_LEXICAL_ENV_NOT_NEEDED)) @@ -1118,7 +1118,7 @@ ecma_op_function_call_simple (ecma_object_t *func_obj_p, /**< Function object */ ecma_value_t ret_value; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (CBC_FUNCTION_GET_TYPE (status_flags) == CBC_FUNCTION_CONSTRUCTOR)) { if (JERRY_CONTEXT (current_new_target_p) == NULL) @@ -1137,20 +1137,20 @@ ecma_op_function_call_simple (ecma_object_t *func_obj_p, /**< Function object */ ecma_op_create_environment_record (scope_p, lexical_this, func_obj_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_global_object_t *saved_global_object_p = JERRY_CONTEXT (global_object_p); JERRY_CONTEXT (global_object_p) = realm_p; -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ ret_value = vm_run (&shared_args.header, this_binding, scope_p); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS JERRY_CONTEXT (global_object_p) = saved_global_object_p; -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* ECMAScript v6, 9.2.2.13 */ if (JERRY_UNLIKELY (shared_args.header.status_flags & VM_FRAME_CTX_SHARED_HERITAGE_PRESENT)) { @@ -1169,7 +1169,7 @@ ecma_op_function_call_simple (ecma_object_t *func_obj_p, /**< Function object */ } exit: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (JERRY_UNLIKELY (shared_args.header.status_flags & VM_FRAME_CTX_SHARED_FREE_LOCAL_ENV)) { @@ -1200,41 +1200,41 @@ ecma_op_function_call_native (ecma_object_t *func_obj_p, /**< Function object */ if (ecma_get_object_is_builtin (func_obj_p)) { -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_global_object_t *saved_global_object_p = JERRY_CONTEXT (global_object_p); ecma_extended_object_t *ext_func_obj_p = (ecma_extended_object_t *) func_obj_p; JERRY_CONTEXT (global_object_p) = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_global_object_t, ext_func_obj_p->u.built_in.realm_value); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ ecma_value_t ret_value = ecma_builtin_dispatch_call (func_obj_p, this_arg_value, arguments_list_p, arguments_list_len); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS JERRY_CONTEXT (global_object_p) = saved_global_object_p; -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ return ret_value; } ecma_native_function_t *native_function_p = (ecma_native_function_t *) func_obj_p; -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_global_object_t *saved_global_object_p = JERRY_CONTEXT (global_object_p); JERRY_CONTEXT (global_object_p) = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_global_object_t, native_function_p->realm_value); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ JERRY_ASSERT (native_function_p->native_handler_cb != NULL); ecma_value_t ret_value = native_function_p->native_handler_cb (ecma_make_object_value (func_obj_p), this_arg_value, arguments_list_p, arguments_list_len); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS JERRY_CONTEXT (global_object_p) = saved_global_object_p; -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ if (JERRY_UNLIKELY (ecma_is_value_error_reference (ret_value))) { @@ -1242,9 +1242,9 @@ ecma_op_function_call_native (ecma_object_t *func_obj_p, /**< Function object */ return ECMA_VALUE_ERROR; } -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER JERRY_DEBUGGER_CLEAR_FLAGS (JERRY_DEBUGGER_VM_EXCEPTION_THROWN); -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ return ret_value; } /* ecma_op_function_call_native */ @@ -1355,20 +1355,20 @@ ecma_op_function_call (ecma_object_t *func_obj_p, /**< Function object */ const ecma_object_type_t type = ecma_get_object_type (func_obj_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_TYPE_IS_PROXY (type)) { return ecma_proxy_object_call (func_obj_p, this_arg_value, arguments_list_p, arguments_list_len); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target_p); if (JERRY_UNLIKELY (!(JERRY_CONTEXT (status_flags) & ECMA_STATUS_DIRECT_EVAL))) { JERRY_CONTEXT (current_new_target_p) = NULL; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t result; @@ -1385,9 +1385,9 @@ ecma_op_function_call (ecma_object_t *func_obj_p, /**< Function object */ result = ecma_op_function_call_bound (func_obj_p, arguments_list_p, arguments_list_len); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_CONTEXT (current_new_target_p) = old_new_target_p; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return result; } /* ecma_op_function_call */ @@ -1453,16 +1453,16 @@ ecma_op_function_construct_native (ecma_object_t *func_obj_p, /**< Function obje ecma_value_t this_arg = ecma_make_object_value (new_this_obj_p); ecma_deref_object (proto_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target_p); JERRY_CONTEXT (current_new_target_p) = new_target_p; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t ret_value = ecma_op_function_call_native (func_obj_p, this_arg, arguments_list_p, arguments_list_len); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_CONTEXT (current_new_target_p) = old_new_target_p; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (ECMA_IS_VALUE_ERROR (ret_value) || ecma_is_value_object (ret_value)) { @@ -1494,7 +1494,7 @@ ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */ const ecma_object_type_t type = ecma_get_object_type (func_obj_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_TYPE_IS_PROXY (type)) { return ecma_proxy_object_construct (func_obj_p, @@ -1502,7 +1502,7 @@ ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */ arguments_list_p, arguments_list_len); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ if (JERRY_UNLIKELY (type == ECMA_OBJECT_TYPE_BOUND_FUNCTION)) { @@ -1513,26 +1513,26 @@ ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */ { if (JERRY_UNLIKELY (ecma_get_object_is_builtin (func_obj_p))) { -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_global_object_t *saved_global_object_p = JERRY_CONTEXT (global_object_p); ecma_value_t realm_value = ((ecma_extended_object_t *) func_obj_p)->u.built_in.realm_value; JERRY_CONTEXT (global_object_p) = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_global_object_t, realm_value); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_object_t *old_new_target = JERRY_CONTEXT (current_new_target_p); JERRY_CONTEXT (current_new_target_p) = new_target_p; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t ret_value = ecma_builtin_dispatch_construct (func_obj_p, arguments_list_p, arguments_list_len); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_CONTEXT (current_new_target_p) = old_new_target; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS JERRY_CONTEXT (global_object_p) = saved_global_object_p; -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ return ret_value; } @@ -1545,13 +1545,13 @@ ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */ ecma_object_t *new_this_obj_p = NULL; ecma_value_t this_arg; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_extended_object_t *ext_func_obj_p = (ecma_extended_object_t *) func_obj_p; /* 5. */ if (!ECMA_GET_THIRD_BIT_FROM_POINTER_TAG (ext_func_obj_p->u.function.scope_cp)) { -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* 5.a */ ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (new_target_p, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE); @@ -1564,7 +1564,7 @@ ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */ new_this_obj_p = ecma_create_object (proto_p, 0, ECMA_OBJECT_TYPE_GENERAL); ecma_deref_object (proto_p); this_arg = ecma_make_object_value (new_this_obj_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT } else { @@ -1574,25 +1574,25 @@ ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */ /* 6. */ ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target_p); JERRY_CONTEXT (current_new_target_p) = new_target_p; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t ret_value = ecma_op_function_call_simple (func_obj_p, this_arg, arguments_list_p, arguments_list_len); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_CONTEXT (current_new_target_p) = old_new_target_p; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* 13.a */ if (ECMA_IS_VALUE_ERROR (ret_value) || ecma_is_value_object (ret_value)) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (new_this_obj_p != NULL) { ecma_deref_object (new_this_obj_p); } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ ecma_deref_object (new_this_obj_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return ret_value; } @@ -1612,7 +1612,7 @@ ecma_op_lazy_instantiate_prototype_object (ecma_object_t *object_p) /**< the fun JERRY_ASSERT (ecma_get_object_type (object_p) == ECMA_OBJECT_TYPE_FUNCTION || ecma_get_object_type (object_p) == ECMA_OBJECT_TYPE_NATIVE_FUNCTION); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_global_object_t *global_object_p; if (ecma_get_object_type (object_p) == ECMA_OBJECT_TYPE_FUNCTION) @@ -1629,14 +1629,14 @@ ecma_op_lazy_instantiate_prototype_object (ecma_object_t *object_p) /**< the fun global_object_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_global_object_t, native_function_p->realm_value); } -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ /* ECMA-262 v5, 13.2, 16-18 */ ecma_object_t *proto_object_p = NULL; bool init_constructor = true; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ecma_get_object_type (object_p) == ECMA_OBJECT_TYPE_FUNCTION) { const ecma_compiled_code_t *byte_code_p = ecma_op_function_get_compiled_code ((ecma_extended_object_t *) object_p); @@ -1650,11 +1650,11 @@ ecma_op_lazy_instantiate_prototype_object (ecma_object_t *object_p) /**< the fun { ecma_object_t *prototype_p; -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS prototype_p = ecma_builtin_get_from_realm (global_object_p, ECMA_BUILTIN_ID_GENERATOR_PROTOTYPE); -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ prototype_p = ecma_builtin_get (ECMA_BUILTIN_ID_GENERATOR_PROTOTYPE); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ proto_object_p = ecma_create_object (prototype_p, 0, ECMA_OBJECT_TYPE_GENERAL); init_constructor = false; @@ -1664,29 +1664,29 @@ ecma_op_lazy_instantiate_prototype_object (ecma_object_t *object_p) /**< the fun { ecma_object_t *prototype_p; -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS prototype_p = ecma_builtin_get_from_realm (global_object_p, ECMA_BUILTIN_ID_ASYNC_GENERATOR_PROTOTYPE); -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ prototype_p = ecma_builtin_get (ECMA_BUILTIN_ID_ASYNC_GENERATOR_PROTOTYPE); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ proto_object_p = ecma_create_object (prototype_p, 0, ECMA_OBJECT_TYPE_GENERAL); init_constructor = false; } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (proto_object_p == NULL) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { ecma_object_t *prototype_p; -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS prototype_p = ecma_builtin_get_from_realm (global_object_p, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE); -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ prototype_p = ecma_builtin_get (ECMA_BUILTIN_ID_OBJECT_PROTOTYPE); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ proto_object_p = ecma_op_create_object_object_noarg_and_set_prototype (prototype_p); } @@ -1735,7 +1735,7 @@ ecma_op_function_try_to_lazy_instantiate_property (ecma_object_t *object_p, /**< { JERRY_ASSERT (!ecma_get_object_is_builtin (object_p)); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ecma_compare_ecma_string_to_magic_id (property_name_p, LIT_MAGIC_STRING_LENGTH)) { ecma_extended_object_t *ext_func_p = (ecma_extended_object_t *) object_p; @@ -1802,7 +1802,7 @@ ecma_op_function_try_to_lazy_instantiate_property (ecma_object_t *object_p, /**< return NULL; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (ecma_compare_ecma_string_to_magic_id (property_name_p, LIT_MAGIC_STRING_PROTOTYPE) && ecma_get_object_type (object_p) == ECMA_OBJECT_TYPE_FUNCTION) @@ -1818,7 +1818,7 @@ ecma_op_function_try_to_lazy_instantiate_property (ecma_object_t *object_p, /**< const ecma_compiled_code_t *bytecode_data_p; bytecode_data_p = ecma_op_function_get_compiled_code ((ecma_extended_object_t *) object_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (!(bytecode_data_p->status_flags & CBC_CODE_FLAGS_STRICT_MODE) && CBC_FUNCTION_GET_TYPE (bytecode_data_p->status_flags) == CBC_FUNCTION_NORMAL) { @@ -1831,7 +1831,7 @@ ecma_op_function_try_to_lazy_instantiate_property (ecma_object_t *object_p, /**< value_p->value = is_arguments ? ECMA_VALUE_NULL : ECMA_VALUE_UNDEFINED; return value_prop_p; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ if (bytecode_data_p->status_flags & CBC_CODE_FLAGS_STRICT_MODE) { ecma_object_t *thrower_p = ecma_builtin_get (ECMA_BUILTIN_ID_TYPE_ERROR_THROWER); @@ -1846,7 +1846,7 @@ ecma_op_function_try_to_lazy_instantiate_property (ecma_object_t *object_p, /**< &caller_prop_p); return caller_prop_p; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } return NULL; @@ -1903,7 +1903,7 @@ ecma_op_bound_function_try_to_lazy_instantiate_property (ecma_object_t *object_p args_length = ecma_get_integer_from_value (args_len_or_this); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ECMA_GET_FIRST_BIT_FROM_POINTER_TAG (bound_func_p->header.u.bound_function.target_function)) { return NULL; @@ -1914,7 +1914,7 @@ ecma_op_bound_function_try_to_lazy_instantiate_property (ecma_object_t *object_p /* Set tag bit to represent initialized 'length' property */ ECMA_SET_FIRST_BIT_TO_POINTER_TAG (bound_func_p->header.u.bound_function.target_function); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ length_attributes = ECMA_PROPERTY_FIXED; ecma_object_t *target_func_p; @@ -1931,7 +1931,7 @@ ecma_op_bound_function_try_to_lazy_instantiate_property (ecma_object_t *object_p length = (ecma_number_t) (ecma_get_integer_from_value (get_len_value) - (args_length - 1)); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (length < 0) { @@ -1948,7 +1948,7 @@ ecma_op_bound_function_try_to_lazy_instantiate_property (ecma_object_t *object_p return len_prop_p; } -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT if (ecma_compare_ecma_string_to_magic_id (property_name_p, LIT_MAGIC_STRING_CALLER) || ecma_compare_ecma_string_to_magic_id (property_name_p, LIT_MAGIC_STRING_ARGUMENTS)) { @@ -1964,7 +1964,7 @@ ecma_op_bound_function_try_to_lazy_instantiate_property (ecma_object_t *object_p &caller_prop_p); return caller_prop_p; } -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ return NULL; } /* ecma_op_bound_function_try_to_lazy_instantiate_property */ @@ -1981,7 +1981,7 @@ ecma_op_function_list_lazy_property_names (ecma_object_t *object_p, /**< functio ecma_collection_t *prop_names_p, /**< prop name collection */ ecma_property_counter_t *prop_counter_p) /**< prop counter */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_extended_object_t *ext_func_p = (ecma_extended_object_t *) object_p; if (!ECMA_GET_FIRST_BIT_FROM_POINTER_TAG (ext_func_p->u.function.scope_cp)) { @@ -1989,31 +1989,31 @@ ecma_op_function_list_lazy_property_names (ecma_object_t *object_p, /**< functio ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_LENGTH)); prop_counter_p->string_named_props++; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ /* 'length' property is non-enumerable (ECMA-262 v5, 13.2.5) */ ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_LENGTH)); prop_counter_p->string_named_props++; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ const ecma_compiled_code_t *bytecode_data_p; bytecode_data_p = ecma_op_function_get_compiled_code ((ecma_extended_object_t *) object_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (!CBC_FUNCTION_HAS_PROTOTYPE (bytecode_data_p->status_flags)) { return; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* 'prototype' property is non-enumerable (ECMA-262 v5, 13.2.18) */ ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_PROTOTYPE)); prop_counter_p->string_named_props++; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT bool append_caller_and_arguments = !(bytecode_data_p->status_flags & CBC_CODE_FLAGS_STRICT_MODE); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ bool append_caller_and_arguments = (bytecode_data_p->status_flags & CBC_CODE_FLAGS_STRICT_MODE); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (append_caller_and_arguments) { @@ -2039,11 +2039,11 @@ ecma_op_external_function_list_lazy_property_names (ecma_object_t *object_p, /** ecma_collection_t *prop_names_p, /**< prop name collection */ ecma_property_counter_t *prop_counter_p) /**< prop counter */ { -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT JERRY_UNUSED (object_p); -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ if (!ecma_op_ordinary_object_has_own_property (object_p, ecma_get_magic_string (LIT_MAGIC_STRING_PROTOTYPE))) -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ { /* 'prototype' property is non-enumerable (ECMA-262 v5, 13.2.18) */ ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_PROTOTYPE)); @@ -2063,7 +2063,7 @@ ecma_op_bound_function_list_lazy_property_names (ecma_object_t *object_p, /**< b ecma_collection_t *prop_names_p, /**< prop name collection */ ecma_property_counter_t *prop_counter_p) /**< prop counter */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* Unintialized 'length' property is non-enumerable (ECMA-262 v6, 19.2.4.1) */ ecma_bound_function_t *bound_func_p = (ecma_bound_function_t *) object_p; if (!ECMA_GET_FIRST_BIT_FROM_POINTER_TAG (bound_func_p->header.u.bound_function.target_function)) @@ -2071,12 +2071,12 @@ ecma_op_bound_function_list_lazy_property_names (ecma_object_t *object_p, /**< b ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_LENGTH)); prop_counter_p->string_named_props++; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_UNUSED (object_p); /* 'length' property is non-enumerable (ECMA-262 v5, 13.2.5) */ ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_LENGTH)); prop_counter_p->string_named_props++; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* 'caller' property is non-enumerable (ECMA-262 v5, 13.2.5) */ ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_CALLER)); diff --git a/jerry-core/ecma/operations/ecma-function-object.h b/jerry-core/ecma/operations/ecma-function-object.h index 6a330e841..19e2a422d 100644 --- a/jerry-core/ecma/operations/ecma-function-object.h +++ b/jerry-core/ecma/operations/ecma-function-object.h @@ -28,9 +28,9 @@ * @{ */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t ecma_op_function_form_name (ecma_string_t *prop_name_p, char *prefix_p, lit_utf8_size_t prefix_size); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ bool ecma_op_is_callable (ecma_value_t value); bool ecma_op_object_is_callable (ecma_object_t *obj_p); @@ -56,20 +56,20 @@ ecma_op_create_external_function_object (ecma_native_handler_t handler_cb); const ecma_compiled_code_t * ecma_op_function_get_compiled_code (ecma_extended_object_t *function_p); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_global_object_t * ecma_op_function_get_realm (const ecma_compiled_code_t *bytecode_header_p); ecma_global_object_t * ecma_op_function_get_function_realm (ecma_object_t *func_obj_p); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ ecma_value_t ecma_op_create_dynamic_function (const ecma_value_t *arguments_list_p, uint32_t arguments_list_len, ecma_parse_opts_t opts); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t ecma_op_function_get_super_constructor (ecma_object_t *func_obj_p); @@ -83,7 +83,7 @@ ecma_op_create_arrow_function_object (ecma_object_t *scope_p, const ecma_compile ecma_object_t * ecma_op_create_native_handler (ecma_native_handler_id_t id, size_t object_size); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_object_t * ecma_op_get_prototype_from_constructor (ecma_object_t *ctor_obj_p, ecma_builtin_id_t default_proto_id); diff --git a/jerry-core/ecma/operations/ecma-get-put-value.c b/jerry-core/ecma/operations/ecma-get-put-value.c index 1f0b61603..fef294074 100644 --- a/jerry-core/ecma/operations/ecma-get-put-value.c +++ b/jerry-core/ecma/operations/ecma-get-put-value.c @@ -64,24 +64,24 @@ ecma_op_get_value_lex_env_base (ecma_object_t *lex_env_p, /**< lexical environme *ref_base_lex_env_p = lex_env_p; ecma_property_value_t *property_value_p = ECMA_PROPERTY_VALUE_PTR (property_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (property_value_p->value == ECMA_VALUE_UNINITIALIZED)) { return ecma_raise_reference_error (ECMA_ERR_MSG ("Variables declared by let/const must be" " initialized before reading their value")); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return ecma_fast_copy_value (property_value_p->value); } break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case ECMA_LEXICAL_ENVIRONMENT_HOME_OBJECT_BOUND: { break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { JERRY_ASSERT (ecma_get_lex_env_type (lex_env_p) == ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND); @@ -108,13 +108,13 @@ ecma_op_get_value_lex_env_base (ecma_object_t *lex_env_p, /**< lexical environme } *ref_base_lex_env_p = NULL; -#if ENABLED (JERRY_ERROR_MESSAGES) +#if JERRY_ERROR_MESSAGES return ecma_raise_standard_error_with_format (ECMA_ERROR_REFERENCE, "% is not defined", ecma_make_string_value (name_p)); -#else /* ENABLED (JERRY_ERROR_MESSAGES) */ +#else /* JERRY_ERROR_MESSAGES */ return ecma_raise_reference_error (NULL); -#endif /* ENABLED (JERRY_ERROR_MESSAGES) */ +#endif /* JERRY_ERROR_MESSAGES */ } /* ecma_op_get_value_lex_env_base */ @@ -158,34 +158,34 @@ ecma_op_get_value_object_base (ecma_value_t base_value, /**< base value */ return ecma_make_string_value (ecma_new_ecma_string_from_code_unit (char_at_idx)); } -#if ENABLED (JERRY_BUILTIN_STRING) +#if JERRY_BUILTIN_STRING id = ECMA_BUILTIN_ID_STRING_PROTOTYPE; -#endif /* ENABLED (JERRY_BUILTIN_STRING) */ +#endif /* JERRY_BUILTIN_STRING */ } else if (ecma_is_value_number (base_value)) { -#if ENABLED (JERRY_BUILTIN_NUMBER) +#if JERRY_BUILTIN_NUMBER id = ECMA_BUILTIN_ID_NUMBER_PROTOTYPE; -#endif /* ENABLED (JERRY_BUILTIN_NUMBER) */ +#endif /* JERRY_BUILTIN_NUMBER */ } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (ecma_is_value_symbol (base_value)) { id = ECMA_BUILTIN_ID_SYMBOL_PROTOTYPE; } -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#endif /* JERRY_ESNEXT */ +#if JERRY_BUILTIN_BIGINT else if (ecma_is_value_bigint (base_value)) { id = ECMA_BUILTIN_ID_BIGINT_PROTOTYPE; } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ else { JERRY_ASSERT (ecma_is_value_boolean (base_value)); -#if ENABLED (JERRY_BUILTIN_BOOLEAN) +#if JERRY_BUILTIN_BOOLEAN id = ECMA_BUILTIN_ID_BOOLEAN_PROTOTYPE; -#endif /* ENABLED (JERRY_BUILTIN_BOOLEAN) */ +#endif /* JERRY_BUILTIN_BOOLEAN */ } obj_p = ecma_builtin_get (id); @@ -225,17 +225,17 @@ ecma_op_put_value_lex_env_base (ecma_object_t *lex_env_p, /**< lexical environme { ecma_property_value_t *property_value_p = ECMA_PROPERTY_VALUE_PTR (property_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (property_value_p->value == ECMA_VALUE_UNINITIALIZED)) { return ecma_raise_reference_error (ECMA_ERR_MSG ("Variables declared by let/const must be" " initialized before writing their value")); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_named_data_property_assign_value (lex_env_p, property_value_p, value); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (ecma_is_property_enumerable (*property_p)) { if (JERRY_UNLIKELY (ECMA_PROPERTY_VALUE_PTR (property_p)->value == ECMA_VALUE_UNINITIALIZED)) @@ -246,7 +246,7 @@ ecma_op_put_value_lex_env_base (ecma_object_t *lex_env_p, /**< lexical environme return ecma_raise_type_error (ECMA_ERR_MSG ("Constant bindings cannot be reassigned")); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ else if (is_strict) { return ecma_raise_type_error (ECMA_ERR_MSG ("Binding cannot be set")); @@ -255,12 +255,12 @@ ecma_op_put_value_lex_env_base (ecma_object_t *lex_env_p, /**< lexical environme } break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case ECMA_LEXICAL_ENVIRONMENT_HOME_OBJECT_BOUND: { break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { JERRY_ASSERT (ecma_get_lex_env_type (lex_env_p) == ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND); @@ -269,12 +269,12 @@ ecma_op_put_value_lex_env_base (ecma_object_t *lex_env_p, /**< lexical environme ecma_value_t has_property = ecma_op_object_has_property (binding_obj_p, name_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (has_property)) { return has_property; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ if (ecma_is_value_true (has_property)) { @@ -308,13 +308,13 @@ ecma_op_put_value_lex_env_base (ecma_object_t *lex_env_p, /**< lexical environme if (is_strict) { -#if ENABLED (JERRY_ERROR_MESSAGES) +#if JERRY_ERROR_MESSAGES return ecma_raise_standard_error_with_format (ECMA_ERROR_REFERENCE, "% is not defined", ecma_make_string_value (name_p)); -#else /* !ENABLED (JERRY_ERROR_MESSAGES) */ +#else /* !JERRY_ERROR_MESSAGES */ return ecma_raise_reference_error (NULL); -#endif /* ENABLED (JERRY_ERROR_MESSAGES) */ +#endif /* JERRY_ERROR_MESSAGES */ } ecma_value_t completion = ecma_op_object_put (ecma_get_lex_env_binding_object (lex_env_p), diff --git a/jerry-core/ecma/operations/ecma-iterator-object.c b/jerry-core/ecma/operations/ecma-iterator-object.c index 38d9e6040..520554e48 100644 --- a/jerry-core/ecma/operations/ecma-iterator-object.c +++ b/jerry-core/ecma/operations/ecma-iterator-object.c @@ -35,7 +35,7 @@ * @{ */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Implementation of 'CreateArrayFromList' specialized for iterators @@ -620,7 +620,7 @@ ecma_op_iterator_do (ecma_iterator_command_type_t command, /**< command to be ex return result; } /* ecma_op_iterator_do */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-iterator-object.h b/jerry-core/ecma/operations/ecma-iterator-object.h index 9febcf183..396b592ba 100644 --- a/jerry-core/ecma/operations/ecma-iterator-object.h +++ b/jerry-core/ecma/operations/ecma-iterator-object.h @@ -18,7 +18,7 @@ #include "ecma-globals.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** \addtogroup ecma ECMA * @{ @@ -74,7 +74,7 @@ ecma_value_t ecma_op_iterator_do (ecma_iterator_command_type_t command, ecma_value_t iterator, ecma_value_t next_method, ecma_value_t value, bool *done_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-jobqueue.c b/jerry-core/ecma/operations/ecma-jobqueue.c index 14acc1713..9c67f723a 100644 --- a/jerry-core/ecma/operations/ecma-jobqueue.c +++ b/jerry-core/ecma/operations/ecma-jobqueue.c @@ -24,7 +24,7 @@ #include "opcodes.h" #include "vm-stack.h" -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE /** * Mask for job queue type. @@ -586,4 +586,4 @@ ecma_free_all_enqueued_jobs (void) * @} * @} */ -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ diff --git a/jerry-core/ecma/operations/ecma-jobqueue.h b/jerry-core/ecma/operations/ecma-jobqueue.h index fb27ba555..544b3eca9 100644 --- a/jerry-core/ecma/operations/ecma-jobqueue.h +++ b/jerry-core/ecma/operations/ecma-jobqueue.h @@ -16,7 +16,7 @@ #ifndef ECMA_JOB_QUEUE_H #define ECMA_JOB_QUEUE_H -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE /** \addtogroup ecma ECMA * @{ @@ -60,5 +60,5 @@ ecma_value_t ecma_process_all_enqueued_jobs (void); * @} * @} */ -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ #endif /* !ECMA_JOB_QUEUE_H */ diff --git a/jerry-core/ecma/operations/ecma-lex-env.c b/jerry-core/ecma/operations/ecma-lex-env.c index 0096b23fd..261f9b5f9 100644 --- a/jerry-core/ecma/operations/ecma-lex-env.c +++ b/jerry-core/ecma/operations/ecma-lex-env.c @@ -67,7 +67,7 @@ ecma_get_global_environment (ecma_object_t *global_object_p) /**< global object return ECMA_GET_NON_NULL_POINTER (ecma_object_t, ((ecma_global_object_t *) global_object_p)->global_env_cp); } /* ecma_get_global_environment */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Create the global lexical block on top of the global environment. */ @@ -86,7 +86,7 @@ ecma_create_global_lexical_block (ecma_object_t *global_object_p) /**< global ob ecma_deref_object (global_scope_p); } } /* ecma_create_global_lexical_block */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Get reference to Global lexical scope @@ -97,12 +97,12 @@ ecma_create_global_lexical_block (ecma_object_t *global_object_p) /**< global ob ecma_object_t * ecma_get_global_scope (ecma_object_t *global_object_p) /**< global object */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_ASSERT (global_object_p != NULL && ecma_builtin_is_global (global_object_p)); return ECMA_GET_NON_NULL_POINTER (ecma_object_t, ((ecma_global_object_t *) global_object_p)->global_scope_cp); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ return ecma_get_global_environment (global_object_p); -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ } /* ecma_get_global_scope */ /** @@ -180,7 +180,7 @@ ecma_op_create_mutable_binding (ecma_object_t *lex_env_p, /**< lexical environme ecma_object_t *binding_obj_p = ecma_get_lex_env_binding_object (lex_env_p); -#if ENABLED (JERRY_BUILTIN_PROXY) && ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_PROXY && JERRY_BUILTIN_REALMS if (ECMA_OBJECT_IS_PROXY (binding_obj_p)) { ecma_value_t result = ecma_proxy_object_is_extensible (binding_obj_p); @@ -199,12 +199,12 @@ ecma_op_create_mutable_binding (ecma_object_t *lex_env_p, /**< lexical environme { return NULL; } -#else /* !ENABLED (JERRY_BUILTIN_PROXY) || !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_PROXY || !JERRY_BUILTIN_REALMS */ if (!ecma_op_ordinary_object_is_extensible (binding_obj_p)) { return NULL; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) && ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_PROXY && JERRY_BUILTIN_REALMS */ const uint32_t flags = ECMA_PROPERTY_ENUMERABLE_WRITABLE | ECMA_IS_THROW; @@ -261,12 +261,12 @@ ecma_op_set_mutable_binding (ecma_object_t *lex_env_p, /**< lexical environment { ecma_named_data_property_assign_value (lex_env_p, ECMA_PROPERTY_VALUE_PTR (property_p), value); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (ecma_is_property_enumerable (*property_p)) { return ecma_raise_type_error (ECMA_ERR_MSG ("Constant bindings cannot be reassigned")); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ else if (is_strict) { return ecma_raise_type_error (ECMA_ERR_MSG ("Binding cannot be set")); @@ -455,7 +455,7 @@ ecma_op_create_immutable_binding (ecma_object_t *lex_env_p, /**< lexical environ prop_value_p->value = ecma_copy_value_if_not_object (value); } /* ecma_op_create_immutable_binding */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * InitializeBinding operation. * @@ -599,7 +599,7 @@ ecma_op_get_this_binding (ecma_object_t *lex_env_p) /**< lexical environment */ return this_value; } /* ecma_op_get_this_binding */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-lex-env.h b/jerry-core/ecma/operations/ecma-lex-env.h index b9275a587..8c6c1915b 100644 --- a/jerry-core/ecma/operations/ecma-lex-env.h +++ b/jerry-core/ecma/operations/ecma-lex-env.h @@ -34,14 +34,14 @@ void ecma_init_global_environment (void); void ecma_finalize_global_environment (void); ecma_object_t *ecma_get_global_environment (ecma_object_t *global_object_p); ecma_object_t *ecma_get_global_scope (ecma_object_t *global_object_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT void ecma_create_global_lexical_block (ecma_object_t *global_object_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM void ecma_module_add_lex_env (ecma_object_t *lex_env_p); void ecma_module_finalize_lex_envs (void); -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ /** * @} @@ -66,7 +66,7 @@ ecma_value_t ecma_op_implicit_this_value (ecma_object_t *lex_env_p); /* ECMA-262 v5, Table 18. Additional methods of Declarative Environment Records */ void ecma_op_create_immutable_binding (ecma_object_t *lex_env_p, ecma_string_t *name_p, ecma_value_t value); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT void ecma_op_initialize_binding (ecma_object_t *lex_env_p, ecma_string_t *name_p, ecma_value_t value); void ecma_op_create_environment_record (ecma_object_t *lex_env_p, ecma_value_t this_binding, @@ -76,7 +76,7 @@ ecma_environment_record_t *ecma_op_get_environment_record (ecma_object_t *lex_en bool ecma_op_this_binding_is_initialized (ecma_environment_record_t *environment_record_p); void ecma_op_bind_this_value (ecma_environment_record_t *environment_record_p, ecma_value_t this_binding); ecma_value_t ecma_op_get_this_binding (ecma_object_t *lex_env_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-number-object.c b/jerry-core/ecma/operations/ecma-number-object.c index eba114c25..ddd02f4e3 100644 --- a/jerry-core/ecma/operations/ecma-number-object.c +++ b/jerry-core/ecma/operations/ecma-number-object.c @@ -53,13 +53,13 @@ ecma_op_create_number_object (ecma_value_t arg) /**< argument passed to the Numb conv_to_num_completion = ecma_make_number_value (num); ecma_builtin_id_t proto_id; -#if ENABLED (JERRY_BUILTIN_NUMBER) +#if JERRY_BUILTIN_NUMBER proto_id = ECMA_BUILTIN_ID_NUMBER_PROTOTYPE; -#else /* ENABLED (JERRY_BUILTIN_NUMBER) */ +#else /* JERRY_BUILTIN_NUMBER */ proto_id = ECMA_BUILTIN_ID_OBJECT_PROTOTYPE; -#endif /* ENABLED (JERRY_BUILTIN_NUMBER) */ +#endif /* JERRY_BUILTIN_NUMBER */ ecma_object_t *prototype_obj_p = ecma_builtin_get (proto_id); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_object_t *new_target = JERRY_CONTEXT (current_new_target_p); if (new_target) { @@ -69,7 +69,7 @@ ecma_op_create_number_object (ecma_value_t arg) /**< argument passed to the Numb return ECMA_VALUE_ERROR; } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_object_t *object_p = ecma_create_object (prototype_obj_p, sizeof (ecma_extended_object_t), ECMA_OBJECT_TYPE_CLASS); @@ -79,12 +79,12 @@ ecma_op_create_number_object (ecma_value_t arg) /**< argument passed to the Numb /* Pass reference (no need to free conv_to_num_completion). */ ext_object_p->u.class_prop.u.value = conv_to_num_completion; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (new_target) { ecma_deref_object (prototype_obj_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return ecma_make_object_value (object_p); } /* ecma_op_create_number_object */ diff --git a/jerry-core/ecma/operations/ecma-objects-general.c b/jerry-core/ecma/operations/ecma-objects-general.c index 68ee54ba1..4f9b12193 100644 --- a/jerry-core/ecma/operations/ecma-objects-general.c +++ b/jerry-core/ecma/operations/ecma-objects-general.c @@ -170,7 +170,7 @@ static const lit_magic_string_id_t to_primitive_non_string_hint_method_names[2] LIT_MAGIC_STRING_TO_STRING_UL, /**< toString operation */ }; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Hints for the ecma general object's toPrimitve operation */ @@ -180,7 +180,7 @@ static const lit_magic_string_id_t hints[3] = LIT_MAGIC_STRING_NUMBER, /**< "number" hint */ LIT_MAGIC_STRING_STRING, /**< "string" hint */ }; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * [[DefaultValue]] ecma general object's operation @@ -199,7 +199,7 @@ ecma_op_general_object_default_value (ecma_object_t *obj_p, /**< the object */ JERRY_ASSERT (obj_p != NULL && !ecma_is_lexical_environment (obj_p)); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t obj_value = ecma_make_object_value (obj_p); ecma_value_t exotic_to_prim = ecma_op_get_method_by_symbol_id (obj_value, @@ -239,7 +239,7 @@ ecma_op_general_object_default_value (ecma_object_t *obj_p, /**< the object */ { hint = ECMA_PREFERRED_TYPE_NUMBER; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ if (hint == ECMA_PREFERRED_TYPE_NO) { if (ecma_object_class_is (obj_p, LIT_MAGIC_STRING_DATE_UL)) @@ -251,7 +251,7 @@ ecma_op_general_object_default_value (ecma_object_t *obj_p, /**< the object */ hint = ECMA_PREFERRED_TYPE_NUMBER; } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return ecma_op_general_object_ordinary_value (obj_p, hint); } /* ecma_op_general_object_default_value */ @@ -335,12 +335,12 @@ ecma_op_general_object_define_own_property (ecma_object_t *object_p, /**< the ob const ecma_property_descriptor_t *property_desc_p) /**< property * descriptor */ { -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (object_p)) { return ecma_proxy_object_define_own_property (object_p, property_name_p, property_desc_p); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ JERRY_ASSERT (object_p != NULL && !ecma_is_lexical_environment (object_p)); @@ -519,26 +519,26 @@ ecma_op_general_object_define_own_property (ecma_object_t *object_p, /**< the ob JERRY_ASSERT (current_prop & ECMA_PROPERTY_FLAG_DATA); ecma_free_value_if_not_object (value_p->value); -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT ecma_getter_setter_pointers_t *getter_setter_pair_p; getter_setter_pair_p = jmem_pools_alloc (sizeof (ecma_getter_setter_pointers_t)); getter_setter_pair_p->getter_cp = JMEM_CP_NULL; getter_setter_pair_p->setter_cp = JMEM_CP_NULL; ECMA_SET_NON_NULL_POINTER (value_p->getter_setter_pair_cp, getter_setter_pair_p); -#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* !JERRY_CPOINTER_32_BIT */ value_p->getter_setter_pair.getter_cp = JMEM_CP_NULL; value_p->getter_setter_pair.setter_cp = JMEM_CP_NULL; -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ } else { JERRY_ASSERT (!(current_prop & ECMA_PROPERTY_FLAG_DATA)); -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT ecma_getter_setter_pointers_t *getter_setter_pair_p; getter_setter_pair_p = ECMA_GET_NON_NULL_POINTER (ecma_getter_setter_pointers_t, value_p->getter_setter_pair_cp); jmem_pools_free (getter_setter_pair_p, sizeof (ecma_getter_setter_pointers_t)); -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ value_p->value = ECMA_VALUE_UNDEFINED; } @@ -600,7 +600,7 @@ ecma_op_general_object_define_own_property (ecma_object_t *object_p, /**< the ob return ECMA_VALUE_TRUE; } /* ecma_op_general_object_define_own_property */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * The IsCompatiblePropertyDescriptor method for Proxy object internal methods * @@ -744,7 +744,7 @@ ecma_op_to_complete_property_descriptor (ecma_property_descriptor_t *desc_p) /** desc_p->flags |= (ECMA_PROP_IS_GET_DEFINED | ECMA_PROP_IS_SET_DEFINED); } } /* ecma_op_to_complete_property_descriptor */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-objects-general.h b/jerry-core/ecma/operations/ecma-objects-general.h index 8936e642d..3a2729600 100644 --- a/jerry-core/ecma/operations/ecma-objects-general.h +++ b/jerry-core/ecma/operations/ecma-objects-general.h @@ -36,13 +36,13 @@ ecma_value_t ecma_op_general_object_ordinary_value (ecma_object_t *obj_p, ecma_p ecma_value_t ecma_op_general_object_define_own_property (ecma_object_t *object_p, ecma_string_t *property_name_p, const ecma_property_descriptor_t *property_desc_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT void ecma_op_to_complete_property_descriptor (ecma_property_descriptor_t *desc_p); bool ecma_op_is_compatible_property_descriptor (const ecma_property_descriptor_t *desc_p, const ecma_property_descriptor_t *current_p, bool is_extensible); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-objects.c b/jerry-core/ecma/operations/ecma-objects.c index 279ec850e..1de91d877 100644 --- a/jerry-core/ecma/operations/ecma-objects.c +++ b/jerry-core/ecma/operations/ecma-objects.c @@ -30,10 +30,10 @@ #include "ecma-proxy-object.h" #include "jcontext.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY #include "ecma-typedarray-object.h" #include "ecma-arraybuffer-object.h" -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ /** \addtogroup ecma ECMA * @{ @@ -76,9 +76,9 @@ ecma_op_object_get_own_property (ecma_object_t *object_p, /**< the object */ { JERRY_ASSERT (object_p != NULL && !ecma_is_lexical_environment (object_p)); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY JERRY_ASSERT (!ECMA_OBJECT_IS_PROXY (object_p)); -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ JERRY_ASSERT (property_name_p != NULL); JERRY_ASSERT (options == ECMA_PROPERTY_GET_NO_OPTIONS || property_ref_p != NULL); @@ -173,7 +173,7 @@ ecma_op_object_get_own_property (ecma_object_t *object_p, /**< the object */ break; } -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY case ECMA_OBJECT_TYPE_PSEUDO_ARRAY: { /* ES2015 9.4.5.1 */ @@ -229,7 +229,7 @@ ecma_op_object_get_own_property (ecma_object_t *object_p, /**< the object */ break; } -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ default: { break; @@ -257,7 +257,7 @@ ecma_op_object_get_own_property (ecma_object_t *object_p, /**< the object */ { case ECMA_OBJECT_TYPE_FUNCTION: { -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT if (ecma_string_is_length (property_name_p)) { if (options & ECMA_PROPERTY_GET_VALUE) @@ -283,7 +283,7 @@ ecma_op_object_get_own_property (ecma_object_t *object_p, /**< the object */ return ECMA_PROPERTY_VIRTUAL; } -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ /* Get prototype physical property. */ property_p = ecma_op_function_try_to_lazy_instantiate_property (object_p, property_name_p); @@ -335,7 +335,7 @@ ecma_op_object_get_own_property (ecma_object_t *object_p, /**< the object */ if (!ecma_is_value_empty (argv_p[index])) { -#if ENABLED (JERRY_LCACHE) +#if JERRY_LCACHE /* Mapped arguments initialized properties MUST not be lcached */ if (ecma_is_property_lcached (property_p)) { @@ -351,7 +351,7 @@ ecma_op_object_get_own_property (ecma_object_t *object_p, /**< the object */ } ecma_lcache_invalidate (object_p, prop_name_cp, property_p); } -#endif /* ENABLED (JERRY_LCACHE) */ +#endif /* JERRY_LCACHE */ ecma_string_t *name_p = ecma_op_arguments_object_get_formal_parameter (mapped_arguments_p, index); ecma_object_t *lex_env_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_object_t, mapped_arguments_p->lex_env); @@ -393,12 +393,12 @@ ecma_op_object_has_property (ecma_object_t *object_p, /**< the object */ { while (true) { -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (object_p)) { return ecma_proxy_object_has (object_p, property_name_p); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ /* 2 - 3. */ if (ecma_op_ordinary_object_has_own_property (object_p, property_name_p)) @@ -527,7 +527,7 @@ ecma_op_object_find_own (ecma_value_t base_value, /**< base value */ } } } -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY /* ES2015 9.4.5.4 */ if (ecma_object_is_typedarray (object_p)) { @@ -563,7 +563,7 @@ ecma_op_object_find_own (ecma_value_t base_value, /**< base value */ ecma_deref_ecma_string (num_to_str); } -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ break; } @@ -594,7 +594,7 @@ ecma_op_object_find_own (ecma_value_t base_value, /**< base value */ { case ECMA_OBJECT_TYPE_FUNCTION: { -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT if (ecma_string_is_length (property_name_p)) { /* Get length virtual property. */ @@ -615,7 +615,7 @@ ecma_op_object_find_own (ecma_value_t base_value, /**< base value */ return ecma_make_uint32_value (len); } -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ /* Get prototype physical property. */ property_p = ecma_op_function_try_to_lazy_instantiate_property (object_p, property_name_p); @@ -715,12 +715,12 @@ ecma_op_object_find (ecma_object_t *object_p, /**< the object */ while (true) { -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (object_p)) { return ecma_proxy_object_find (object_p, property_name_p); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ ecma_value_t value = ecma_op_object_find_own (base_value, object_p, property_name_p); @@ -782,12 +782,12 @@ ecma_op_object_get_with_receiver (ecma_object_t *object_p, /**< the object */ { while (true) { -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (object_p)) { return ecma_proxy_object_get (object_p, property_name_p, receiver); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ ecma_value_t value = ecma_op_object_find_own (receiver, object_p, property_name_p); @@ -879,7 +879,7 @@ ecma_op_object_get_by_magic_id (ecma_object_t *object_p, /**< the object */ return ecma_op_object_get (object_p, ecma_get_magic_string (property_id)); } /* ecma_op_object_get_by_magic_id */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Descriptor string for each global symbol @@ -1046,7 +1046,7 @@ ecma_op_get_method_by_magic_id (ecma_value_t value, /**< ecma value */ { return ecma_op_get_method (value, ecma_get_magic_string (magic_id)); } /* ecma_op_get_method_by_magic_id */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * [[Put]] ecma general object's operation specialized for property index @@ -1108,7 +1108,7 @@ ecma_op_object_put (ecma_object_t *object_p, /**< the object */ is_throw); } /* ecma_op_object_put */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * [[Set]] ( P, V, Receiver) operation part for ordinary objects * @@ -1175,7 +1175,7 @@ ecma_op_object_put_apply_receiver (ecma_value_t receiver, /**< receiver */ return result; } -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (receiver_obj_p)) { ecma_property_descriptor_t desc; @@ -1197,7 +1197,7 @@ ecma_op_object_put_apply_receiver (ecma_value_t receiver, /**< receiver */ return ret_value; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ if (JERRY_UNLIKELY (ecma_op_object_is_fast_array (receiver_obj_p))) { @@ -1215,7 +1215,7 @@ ecma_op_object_put_apply_receiver (ecma_value_t receiver, /**< receiver */ return ECMA_VALUE_TRUE; } /* ecma_op_object_put_apply_receiver */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * [[Put]] ecma general object's operation with given receiver @@ -1247,12 +1247,12 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */ && !ecma_is_lexical_environment (object_p)); JERRY_ASSERT (property_name_p != NULL); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (object_p)) { return ecma_proxy_object_set (object_p, property_name_p, value, receiver, is_throw); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ ecma_object_type_t type = ecma_get_object_type (object_p); @@ -1314,7 +1314,7 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */ } } } -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY /* ES2015 9.4.5.5 */ if (ecma_object_is_typedarray (object_p)) { @@ -1348,7 +1348,7 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */ return ECMA_VALUE_FALSE; } } -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ break; } default: @@ -1399,19 +1399,19 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */ } case ECMA_OBJECT_TYPE_FUNCTION: { - #if ENABLED (JERRY_ESNEXT) + #if JERRY_ESNEXT /* Uninitialized 'length' property is non-writable (ECMA-262 v6, 19.2.4.1) */ if ((ecma_string_is_length (property_name_p)) && (!ECMA_GET_FIRST_BIT_FROM_POINTER_TAG (((ecma_extended_object_t *) object_p)->u.function.scope_cp))) { return ecma_reject (is_throw); } - #else /* !ENABLED (JERRY_ESNEXT) */ + #else /* !JERRY_ESNEXT */ if (ecma_string_is_length (property_name_p)) { return ecma_reject (is_throw); } - #endif /* ENABLED (JERRY_ESNEXT) */ + #endif /* JERRY_ESNEXT */ /* Get prototype physical property. */ property_p = ecma_op_function_try_to_lazy_instantiate_property (object_p, property_name_p); @@ -1453,12 +1453,12 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */ { if (ecma_is_property_writable (*property_p)) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ecma_make_object_value (object_p) != receiver) { return ecma_op_object_put_apply_receiver (receiver, property_name_p, value, is_throw); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* There is no need for special casing arrays here because changing the * value of an existing property never changes the length of an array. */ @@ -1495,7 +1495,7 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */ ecma_property_ref_t property_ref = { NULL }; proto_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, obj_cp); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (proto_p)) { return ecma_op_object_put_with_receiver (proto_p, @@ -1504,7 +1504,7 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */ receiver, is_throw); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ ecma_property_t inherited_property = ecma_op_object_get_own_property (proto_p, property_name_p, @@ -1528,14 +1528,14 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */ } } -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (create_new_property && ecma_is_value_object (receiver) && ECMA_OBJECT_IS_PROXY (ecma_get_object_from_value (receiver))) { return ecma_op_object_put_apply_receiver (receiver, property_name_p, value, is_throw); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ if (create_new_property && ecma_op_ordinary_object_is_extensible (object_p)) @@ -1575,9 +1575,9 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */ } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT return ecma_op_object_put_apply_receiver (receiver, property_name_p, value, is_throw); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_property_value_t *new_prop_value_p; new_prop_value_p = ecma_create_named_data_property (object_p, @@ -1669,12 +1669,12 @@ ecma_op_object_delete (ecma_object_t *obj_p, /**< the object */ } } -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (obj_p)) { return ecma_proxy_object_delete_property (obj_p, property_name_p, is_strict); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ JERRY_ASSERT_OBJECT_TYPE_IS_VALID (ecma_get_object_type (obj_p)); @@ -1741,12 +1741,12 @@ ecma_op_object_define_own_property (ecma_object_t *obj_p, /**< the object */ const ecma_object_type_t type = ecma_get_object_type (obj_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (obj_p)) { return ecma_proxy_object_define_own_property (obj_p, property_name_p, property_desc_p); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ switch (type) { @@ -1774,16 +1774,16 @@ ecma_op_object_define_own_property (ecma_object_t *obj_p, /**< the object */ ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) obj_p; -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY if (ext_object_p->u.pseudo_array.type == ECMA_PSEUDO_ARRAY_ARGUMENTS) { -#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#else /* !JERRY_BUILTIN_TYPEDARRAY */ JERRY_ASSERT (ext_object_p->u.pseudo_array.type == ECMA_PSEUDO_ARRAY_ARGUMENTS); -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ return ecma_op_arguments_object_define_own_property (obj_p, property_name_p, property_desc_p); -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY } /* ES2015 9.4.5.3 */ if (ecma_object_is_typedarray (obj_p)) @@ -1829,9 +1829,9 @@ ecma_op_object_define_own_property (ecma_object_t *obj_p, /**< the object */ return ecma_op_general_object_define_own_property (obj_p, property_name_p, property_desc_p); -#else /* !ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#else /* !JERRY_BUILTIN_TYPEDARRAY */ break; -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ } } } /* ecma_op_object_define_own_property */ @@ -1858,12 +1858,12 @@ ecma_op_object_get_own_property_descriptor (ecma_object_t *object_p, /**< the ob { *prop_desc_p = ecma_make_empty_property_descriptor (); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (object_p)) { return ecma_proxy_object_get_own_property_descriptor (object_p, property_name_p, prop_desc_p); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ ecma_property_ref_t property_ref; @@ -1926,7 +1926,7 @@ ecma_op_object_get_own_property_descriptor (ecma_object_t *object_p, /**< the ob return ECMA_VALUE_TRUE; } /* ecma_op_object_get_own_property_descriptor */ -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY /** * Get property descriptor from a target value for a specified property. * @@ -1947,7 +1947,7 @@ ecma_op_get_own_property_descriptor (ecma_value_t target, /**< target value */ return ecma_op_object_get_own_property_descriptor (ecma_get_object_from_value (target), property_name_p, prop_desc_p); } /* ecma_op_get_own_property_descriptor */ -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ /** * [[HasInstance]] ecma object's operation @@ -1989,7 +1989,7 @@ ecma_op_object_get_prototype_of (ecma_object_t *obj_p) /**< input object */ { JERRY_ASSERT (obj_p != NULL); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (obj_p)) { ecma_value_t proto = ecma_proxy_object_get_prototype_of (obj_p); @@ -2008,7 +2008,7 @@ ecma_op_object_get_prototype_of (ecma_object_t *obj_p) /**< input object */ return ecma_get_object_from_value (proto); } else -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ { jmem_cpointer_t proto_cp = ecma_op_ordinary_object_get_prototype_of (obj_p); @@ -2081,12 +2081,12 @@ ecma_op_object_get_enumerable_property_names (ecma_object_t *obj_p, /**< routine /* 2. */ ecma_collection_t *prop_names_p = ecma_op_object_own_property_keys (obj_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (JERRY_UNLIKELY (prop_names_p == NULL)) { return prop_names_p; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ ecma_value_t *names_buffer_p = prop_names_p->buffer_p; /* 3. */ @@ -2224,12 +2224,12 @@ ecma_object_list_lazy_property_names (ecma_object_t *obj_p, /**< object */ { ecma_op_arguments_object_list_lazy_property_names (obj_p, prop_names_p, prop_counter_p); } -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY if (ecma_object_is_typedarray (obj_p)) { ecma_op_typedarray_list_lazy_property_names (obj_p, prop_names_p, prop_counter_p); } -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ break; } case ECMA_OBJECT_TYPE_FUNCTION: @@ -2281,32 +2281,32 @@ ecma_object_sort_property_names (ecma_collection_t *prop_names_p, /**< prop name ecma_property_counter_t *prop_counter) /**< prop counter */ { uint32_t lazy_string_prop_name_count = prop_counter->lazy_string_named_props; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint32_t lazy_symbol_prop_name_count = prop_counter->lazy_symbol_named_props; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ uint32_t string_name_pos = prop_counter->string_named_props; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint32_t symbol_name_pos = prop_counter->symbol_named_props; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ uint32_t all_prop_count = (prop_counter->array_index_named_props) + (string_name_pos); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT all_prop_count += symbol_name_pos; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t *names_p = jmem_heap_alloc_block (all_prop_count * sizeof (ecma_value_t)); ecma_value_t *string_names_p = names_p + prop_counter->array_index_named_props; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t *symbol_names_p = string_names_p + string_name_pos; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ uint32_t array_index_name_pos = 0; uint32_t lazy_string_name_pos = 0; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint32_t lazy_symbol_name_pos = 0; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ for (uint32_t i = 0; i < prop_names_p->item_count; i++) { @@ -2347,7 +2347,7 @@ ecma_object_sort_property_names (ecma_collection_t *prop_names_p, /**< prop name names_p[insert_pos] = prop_name; } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* sort symbol named properites in creation order */ else if (ecma_prop_name_is_symbol (name_p)) { @@ -2363,7 +2363,7 @@ ecma_object_sort_property_names (ecma_collection_t *prop_names_p, /**< prop name symbol_names_p[--symbol_name_pos] = prop_name; } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* sort string named properties in creation order */ else { @@ -2406,12 +2406,12 @@ ecma_object_sort_property_names (ecma_collection_t *prop_names_p, /**< prop name ecma_collection_t * ecma_op_object_own_property_keys (ecma_object_t *obj_p) /**< object */ { -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (obj_p)) { return ecma_proxy_object_own_property_keys (obj_p); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ if (ecma_op_object_is_fast_array (obj_p)) { @@ -2428,7 +2428,7 @@ ecma_op_object_own_property_keys (ecma_object_t *obj_p) /**< object */ jmem_cpointer_t prop_iter_cp = obj_p->u1.property_list_cp; -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP if (prop_iter_cp != JMEM_CP_NULL) { ecma_property_header_t *prop_iter_p = ECMA_GET_NON_NULL_POINTER (ecma_property_header_t, prop_iter_cp); @@ -2438,7 +2438,7 @@ ecma_op_object_own_property_keys (ecma_object_t *obj_p) /**< object */ prop_iter_cp = prop_iter_p->next_property_cp; } } -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ while (prop_iter_cp != JMEM_CP_NULL) { @@ -2469,12 +2469,12 @@ ecma_op_object_own_property_keys (ecma_object_t *obj_p) /**< object */ { prop_counter.array_index_named_props++; } - #if ENABLED (JERRY_ESNEXT) + #if JERRY_ESNEXT else if (ecma_prop_name_is_symbol (name_p)) { prop_counter.symbol_named_props++; } - #endif /* ENABLED (JERRY_ESNEXT) */ + #endif /* JERRY_ESNEXT */ else { prop_counter.string_named_props++; @@ -2521,7 +2521,7 @@ ecma_op_object_enumerate (ecma_object_t *obj_p) /**< object */ { ecma_collection_t *keys = ecma_op_object_own_property_keys (obj_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (keys == NULL)) { ecma_collection_free (return_names_p); @@ -2529,19 +2529,19 @@ ecma_op_object_enumerate (ecma_object_t *obj_p) /**< object */ ecma_deref_object (obj_p); return keys; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ for (uint32_t i = 0; i < keys->item_count; i++) { ecma_value_t prop_name = keys->buffer_p[i]; ecma_string_t *name_p = ecma_get_prop_name_from_value (prop_name); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ecma_prop_name_is_symbol (name_p)) { continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_property_descriptor_t prop_desc; ecma_value_t get_desc = ecma_op_object_get_own_property_descriptor (obj_p, name_p, &prop_desc); @@ -2616,10 +2616,10 @@ ecma_object_check_class_name_is_object (ecma_object_t *obj_p) /**< object */ { #ifndef JERRY_NDEBUG return (ecma_builtin_is_global (obj_p) -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_PROMISE_PROTOTYPE) -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#endif /* JERRY_BUILTIN_PROMISE */ +#if JERRY_BUILTIN_TYPEDARRAY || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_ARRAYBUFFER_PROTOTYPE) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_TYPEDARRAY_PROTOTYPE) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_INT8ARRAY_PROTOTYPE) @@ -2630,15 +2630,15 @@ ecma_object_check_class_name_is_object (ecma_object_t *obj_p) /**< object */ || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_UINT32ARRAY_PROTOTYPE) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_FLOAT32ARRAY_PROTOTYPE) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_UINT8CLAMPEDARRAY_PROTOTYPE) -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_FLOAT64ARRAY_PROTOTYPE) -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ +#if JERRY_BUILTIN_BIGINT || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_BIGINT64ARRAY_PROTOTYPE) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_BIGUINT64ARRAY_PROTOTYPE) -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ -#if ENABLED (JERRY_ESNEXT) +#endif /* JERRY_BUILTIN_BIGINT */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ +#if JERRY_ESNEXT || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_ARRAY_PROTOTYPE_UNSCOPABLES) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_ARRAY_ITERATOR_PROTOTYPE) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_ITERATOR_PROTOTYPE) @@ -2656,28 +2656,28 @@ ecma_object_check_class_name_is_object (ecma_object_t *obj_p) /**< object */ || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_REGEXP_PROTOTYPE) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_SYMBOL_PROTOTYPE) || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_ASYNC_FUNCTION_PROTOTYPE) -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_BUILTIN_MAP) +#endif /* JERRY_ESNEXT */ +#if JERRY_BUILTIN_MAP || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_MAP_PROTOTYPE) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_MAP_ITERATOR_PROTOTYPE) -#endif /* ENABLED (JERRY_ESNEXT) */ -#endif /* ENABLED (JERRY_BUILTIN_MAP) */ -#if ENABLED (JERRY_BUILTIN_SET) +#endif /* JERRY_ESNEXT */ +#endif /* JERRY_BUILTIN_MAP */ +#if JERRY_BUILTIN_SET || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_SET_PROTOTYPE) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_SET_ITERATOR_PROTOTYPE) -#endif /* ENABLED (JERRY_ESNEXT) */ -#endif /* ENABLED (JERRY_BUILTIN_SET) */ -#if ENABLED (JERRY_BUILTIN_WEAKMAP) +#endif /* JERRY_ESNEXT */ +#endif /* JERRY_BUILTIN_SET */ +#if JERRY_BUILTIN_WEAKMAP || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_WEAKMAP_PROTOTYPE) -#endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) */ -#if ENABLED (JERRY_BUILTIN_WEAKSET) +#endif /* JERRY_BUILTIN_WEAKMAP */ +#if JERRY_BUILTIN_WEAKSET || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_WEAKSET_PROTOTYPE) -#endif /* ENABLED (JERRY_BUILTIN_WEAKSET) */ -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#endif /* JERRY_BUILTIN_WEAKSET */ +#if JERRY_BUILTIN_DATAVIEW || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_DATAVIEW_PROTOTYPE) -#endif /* ENABLED (JERRY_BUILTIN_DATAVIEW) */ +#endif /* JERRY_BUILTIN_DATAVIEW */ || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_OBJECT_PROTOTYPE)); #else /* JERRY_NDEBUG */ JERRY_UNUSED (obj_p); @@ -2713,14 +2713,14 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */ switch (ext_obj_p->u.pseudo_array.type) { -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY case ECMA_PSEUDO_ARRAY_TYPEDARRAY: case ECMA_PSEUDO_ARRAY_TYPEDARRAY_WITH_INFO: { return (lit_magic_string_id_t) ext_obj_p->u.pseudo_array.u1.class_id; } -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ -#if ENABLED (JERRY_ESNEXT) +#endif /* JERRY_BUILTIN_TYPEDARRAY */ +#if JERRY_ESNEXT case ECMA_PSEUDO_ARRAY_ITERATOR: { return LIT_MAGIC_STRING_ARRAY_ITERATOR_UL; @@ -2733,8 +2733,8 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */ { return LIT_MAGIC_STRING_MAP_ITERATOR_UL; } -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_ESNEXT) +#endif /* JERRY_ESNEXT */ +#if JERRY_ESNEXT case ECMA_PSEUDO_STRING_ITERATOR: { return LIT_MAGIC_STRING_STRING_ITERATOR_UL; @@ -2743,7 +2743,7 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */ { return LIT_MAGIC_STRING_REGEXP_STRING_ITERATOR_UL; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { JERRY_ASSERT (ext_obj_p->u.pseudo_array.type == ECMA_PSEUDO_ARRAY_ARGUMENTS); @@ -2760,7 +2760,7 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */ { return LIT_MAGIC_STRING_FUNCTION_UL; } -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY case ECMA_OBJECT_TYPE_PROXY: { ecma_proxy_object_t *proxy_obj_p = (ecma_proxy_object_t *) obj_p; @@ -2772,7 +2772,7 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */ } return LIT_MAGIC_STRING_OBJECT_UL; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ default: { JERRY_ASSERT (type == ECMA_OBJECT_TYPE_GENERAL || type == ECMA_OBJECT_TYPE_PROXY); @@ -2783,19 +2783,19 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */ switch (ext_obj_p->u.built_in.id) { -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH case ECMA_BUILTIN_ID_MATH: { return LIT_MAGIC_STRING_MATH_UL; } -#endif /* ENABLED (JERRY_BUILTIN_MATH) */ -#if ENABLED (JERRY_BUILTIN_REFLECT) +#endif /* JERRY_BUILTIN_MATH */ +#if JERRY_BUILTIN_REFLECT case ECMA_BUILTIN_ID_REFLECT: { return LIT_MAGIC_STRING_REFLECT_UL; } -#endif /* ENABLED (JERRY_BUILTIN_REFLECT) */ -#if ENABLED (JERRY_ESNEXT) +#endif /* JERRY_BUILTIN_REFLECT */ +#if JERRY_ESNEXT case ECMA_BUILTIN_ID_GENERATOR: { return LIT_MAGIC_STRING_GENERATOR_UL; @@ -2804,39 +2804,39 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */ { return LIT_MAGIC_STRING_ASYNC_GENERATOR_UL; } -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_BUILTIN_JSON) +#endif /* JERRY_ESNEXT */ +#if JERRY_BUILTIN_JSON case ECMA_BUILTIN_ID_JSON: { return LIT_MAGIC_STRING_JSON_U; } -#endif /* ENABLED (JERRY_BUILTIN_JSON) */ -#if !ENABLED (JERRY_ESNEXT) -#if ENABLED (JERRY_BUILTIN_ERRORS) +#endif /* JERRY_BUILTIN_JSON */ +#if !JERRY_ESNEXT +#if JERRY_BUILTIN_ERRORS case ECMA_BUILTIN_ID_EVAL_ERROR_PROTOTYPE: case ECMA_BUILTIN_ID_RANGE_ERROR_PROTOTYPE: case ECMA_BUILTIN_ID_REFERENCE_ERROR_PROTOTYPE: case ECMA_BUILTIN_ID_SYNTAX_ERROR_PROTOTYPE: case ECMA_BUILTIN_ID_TYPE_ERROR_PROTOTYPE: case ECMA_BUILTIN_ID_URI_ERROR_PROTOTYPE: -#endif /* ENABLED (JERRY_BUILTIN_ERRORS) */ +#endif /* JERRY_BUILTIN_ERRORS */ case ECMA_BUILTIN_ID_ERROR_PROTOTYPE: { return LIT_MAGIC_STRING_ERROR_UL; } -#endif /* !ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_BUILTIN_PROXY) +#endif /* !JERRY_ESNEXT */ +#if JERRY_BUILTIN_PROXY case ECMA_BUILTIN_ID_PROXY: { return LIT_MAGIC_STRING_FUNCTION_UL; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#endif /* JERRY_BUILTIN_PROXY */ +#if JERRY_BUILTIN_BIGINT case ECMA_BUILTIN_ID_BIGINT: { return LIT_MAGIC_STRING_FUNCTION_UL; } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ default: { JERRY_ASSERT (ecma_object_check_class_name_is_object (obj_p)); @@ -2889,7 +2889,7 @@ ecma_object_is_regexp_object (ecma_value_t arg) /**< argument */ && ecma_object_class_is (ecma_get_object_from_value (arg), LIT_MAGIC_STRING_REGEXP_UL)); } /* ecma_object_is_regexp_object */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Object's IsConcatSpreadable operation, used for Array.prototype.concat * It checks the argument's [Symbol.isConcatSpreadable] property value @@ -3036,7 +3036,7 @@ ecma_op_invoke_by_symbol_id (ecma_value_t object, /**< Object value */ return ret_value; } /* ecma_op_invoke_by_symbol_id */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * 7.3.18 Abstract operation Invoke when property name is a magic string @@ -3074,11 +3074,11 @@ ecma_op_invoke (ecma_value_t object, /**< Object value */ ecma_object_t *object_p = ecma_get_object_from_value (object_value); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t this_arg = object; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ ecma_value_t this_arg = object_value; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t func = ecma_op_object_get_with_receiver (object_p, property_name_p, this_arg); @@ -3186,12 +3186,12 @@ ecma_op_ordinary_object_set_prototype_of (ecma_object_t *obj_p, /**< base object } /* 8.c.i */ -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (iter_p)) { break; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ /* 8.c.ii */ iter_p = ECMA_GET_POINTER (ecma_object_t, ecma_op_ordinary_object_get_prototype_of (iter_p)); diff --git a/jerry-core/ecma/operations/ecma-objects.h b/jerry-core/ecma/operations/ecma-objects.h index bd96d8539..a5783ffa9 100644 --- a/jerry-core/ecma/operations/ecma-objects.h +++ b/jerry-core/ecma/operations/ecma-objects.h @@ -40,12 +40,12 @@ ecma_value_t ecma_op_object_get_with_receiver (ecma_object_t *object_p, ecma_str ecma_value_t ecma_op_object_get_length (ecma_object_t *object_p, ecma_length_t *length_p); ecma_value_t ecma_op_object_get_by_index (ecma_object_t *object_p, ecma_length_t index); ecma_value_t ecma_op_object_get_by_magic_id (ecma_object_t *object_p, lit_magic_string_id_t property_id); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_string_t *ecma_op_get_global_symbol (lit_magic_string_id_t property_id); ecma_value_t ecma_op_object_get_by_symbol_id (ecma_object_t *object_p, lit_magic_string_id_t property_id); ecma_value_t ecma_op_get_method_by_symbol_id (ecma_value_t value, lit_magic_string_id_t symbol_id); ecma_value_t ecma_op_get_method_by_magic_id (ecma_value_t value, lit_magic_string_id_t magic_id); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t ecma_op_object_put_with_receiver (ecma_object_t *object_p, ecma_string_t *property_name_p, ecma_value_t value, ecma_value_t receiver, bool is_throw); ecma_value_t ecma_op_object_put (ecma_object_t *object_p, ecma_string_t *property_name_p, ecma_value_t value, @@ -73,13 +73,13 @@ ecma_collection_t *ecma_op_object_enumerate (ecma_object_t *obj_p); lit_magic_string_id_t ecma_object_get_class_name (ecma_object_t *obj_p); bool ecma_object_class_is (ecma_object_t *object_p, uint32_t class_id); bool ecma_object_is_regexp_object (ecma_value_t arg); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t ecma_op_is_concat_spreadable (ecma_value_t arg); ecma_value_t ecma_op_is_regexp (ecma_value_t arg); ecma_value_t ecma_op_species_constructor (ecma_object_t *this_value, ecma_builtin_id_t default_constructor_id); ecma_value_t ecma_op_invoke_by_symbol_id (ecma_value_t object, lit_magic_string_id_t magic_string_id, ecma_value_t *args_p, uint32_t args_len); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t ecma_op_invoke (ecma_value_t object, ecma_string_t *property_name_p, ecma_value_t *args_p, uint32_t args_len); ecma_value_t ecma_op_invoke_by_magic_id (ecma_value_t object, lit_magic_string_id_t magic_string_id, @@ -90,11 +90,11 @@ ecma_value_t ecma_op_ordinary_object_set_prototype_of (ecma_object_t *base_p, ec bool JERRY_ATTR_PURE ecma_op_ordinary_object_is_extensible (ecma_object_t *object_p); void ecma_op_ordinary_object_prevent_extensions (ecma_object_t *object_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY ecma_value_t ecma_op_get_own_property_descriptor (ecma_value_t target, ecma_string_t *property_name_p, ecma_property_descriptor_t *prop_desc_p); -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-promise-object.c b/jerry-core/ecma/operations/ecma-promise-object.c index b537d74b6..2bb0557f6 100644 --- a/jerry-core/ecma/operations/ecma-promise-object.c +++ b/jerry-core/ecma/operations/ecma-promise-object.c @@ -29,7 +29,7 @@ #include "ecma-promise-object.h" #include "jcontext.h" -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE /** \addtogroup ecma ECMA * @{ @@ -1167,4 +1167,4 @@ ecma_promise_async_await (ecma_extended_object_t *async_generator_object_p, /**< * @} * @} */ -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ diff --git a/jerry-core/ecma/operations/ecma-promise-object.h b/jerry-core/ecma/operations/ecma-promise-object.h index 3a3026a5d..f9508d707 100644 --- a/jerry-core/ecma/operations/ecma-promise-object.h +++ b/jerry-core/ecma/operations/ecma-promise-object.h @@ -16,7 +16,7 @@ #ifndef ECMA_PROMISE_OBJECT_H #define ECMA_PROMISE_OBJECT_H -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE #include "ecma-globals.h" /** \addtogroup ecma ECMA @@ -156,5 +156,5 @@ ecma_value_t ecma_op_get_capabilities_executor_cb (const ecma_value_t function_o * @} */ -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ #endif /* !ECMA_PROMISE_OBJECT_H */ diff --git a/jerry-core/ecma/operations/ecma-proxy-object.c b/jerry-core/ecma/operations/ecma-proxy-object.c index c49dc5cd2..a77da483c 100644 --- a/jerry-core/ecma/operations/ecma-proxy-object.c +++ b/jerry-core/ecma/operations/ecma-proxy-object.c @@ -35,7 +35,7 @@ * @{ */ -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY /** * ProxyCreate operation for create a new proxy object * @@ -1814,7 +1814,7 @@ ecma_proxy_object_construct (ecma_object_t *obj_p, /**< proxy object */ return new_obj; } /* ecma_proxy_object_construct */ -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-proxy-object.h b/jerry-core/ecma/operations/ecma-proxy-object.h index 139a074fe..a3bad09a0 100644 --- a/jerry-core/ecma/operations/ecma-proxy-object.h +++ b/jerry-core/ecma/operations/ecma-proxy-object.h @@ -25,7 +25,7 @@ * @{ */ -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY ecma_object_t * ecma_proxy_create (ecma_value_t target, @@ -107,7 +107,7 @@ ecma_proxy_object_construct (ecma_object_t *obj_p, const ecma_value_t *args_p, uint32_t argc); -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-reference.c b/jerry-core/ecma/operations/ecma-reference.c index 7cc45e37f..f8d64e76f 100644 --- a/jerry-core/ecma/operations/ecma-reference.c +++ b/jerry-core/ecma/operations/ecma-reference.c @@ -47,22 +47,22 @@ ecma_op_resolve_reference_base (ecma_object_t *lex_env_p, /**< starting lexical while (true) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ecma_get_lex_env_type (lex_env_p) == ECMA_LEXICAL_ENVIRONMENT_HOME_OBJECT_BOUND) { JERRY_ASSERT (lex_env_p->u2.outer_reference_cp != JMEM_CP_NULL); lex_env_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, lex_env_p->u2.outer_reference_cp); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t has_binding = ecma_op_has_binding (lex_env_p, name_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (has_binding)) { return ECMA_OBJECT_POINTER_ERROR; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ if (ecma_is_value_true (has_binding)) { @@ -78,7 +78,7 @@ ecma_op_resolve_reference_base (ecma_object_t *lex_env_p, /**< starting lexical } } /* ecma_op_resolve_reference_base */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Check if the passed lexical environment is a global lexical environment @@ -90,14 +90,14 @@ static inline bool JERRY_ATTR_ALWAYS_INLINE ecma_op_is_global_environment (ecma_object_t *lex_env_p) /**< lexical environment */ { JERRY_ASSERT (ecma_get_lex_env_type (lex_env_p) == ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS JERRY_ASSERT (lex_env_p->u2.outer_reference_cp != JMEM_CP_NULL || (ecma_make_object_value (ecma_get_lex_env_binding_object (lex_env_p)) == ((ecma_global_object_t *) ecma_builtin_get_global ())->this_binding)); -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ JERRY_ASSERT (lex_env_p->u2.outer_reference_cp != JMEM_CP_NULL || ecma_get_lex_env_binding_object (lex_env_p) == ecma_builtin_get_global ()); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ return lex_env_p->u2.outer_reference_cp == JMEM_CP_NULL; } /* ecma_op_is_global_environment */ @@ -122,12 +122,12 @@ ecma_op_resolve_super_base (ecma_object_t *lex_env_p) /**< starting lexical envi { ecma_object_t *home_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, lex_env_p->u1.home_object_cp); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (home_p)) { return ecma_proxy_object_get_prototype_of (home_p); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ jmem_cpointer_t proto_cp = ecma_op_ordinary_object_get_prototype_of (home_p); @@ -197,7 +197,7 @@ ecma_op_is_prop_unscopable (ecma_object_t *binding_obj_p, /**< binding object */ return ECMA_VALUE_FALSE; } /* ecma_op_is_prop_unscopable */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Helper method for HasBindig operation @@ -229,7 +229,7 @@ ecma_op_object_bound_environment_resolve_reference_value (ecma_object_t *lex_env ecma_object_t *binding_obj_p = ecma_get_lex_env_binding_object (lex_env_p); ecma_value_t found_binding; -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (binding_obj_p)) { found_binding = ecma_proxy_object_has (binding_obj_p, name_p); @@ -241,7 +241,7 @@ ecma_op_object_bound_environment_resolve_reference_value (ecma_object_t *lex_env } else { -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ found_binding = ecma_op_object_find (binding_obj_p, name_p); if (ECMA_IS_VALUE_ERROR (found_binding) || !ecma_is_value_found (found_binding)) @@ -249,39 +249,39 @@ ecma_op_object_bound_environment_resolve_reference_value (ecma_object_t *lex_env return found_binding; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_LIKELY (ecma_op_is_global_environment (lex_env_p))) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { return found_binding; } -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t blocked = ecma_op_is_prop_unscopable (binding_obj_p, name_p); if (ecma_is_value_false (blocked)) { -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (binding_obj_p)) { return ecma_proxy_object_get (binding_obj_p, name_p, ecma_make_object_value (binding_obj_p)); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ return found_binding; } -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (!ECMA_OBJECT_IS_PROXY (binding_obj_p)) { ecma_free_value (found_binding); } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ return ECMA_IS_VALUE_ERROR (blocked) ? blocked : ECMA_VALUE_NOT_FOUND; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* ecma_op_object_bound_environment_resolve_reference_value */ /** @@ -307,28 +307,28 @@ ecma_op_resolve_reference_value (ecma_object_t *lex_env_p, /**< starting lexical { ecma_property_value_t *property_value_p = ECMA_PROPERTY_VALUE_PTR (property_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (property_value_p->value == ECMA_VALUE_UNINITIALIZED)) { return ecma_raise_reference_error (ECMA_ERR_MSG ("Variables declared by let/const must be" " initialized before reading their value")); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return ecma_fast_copy_value (property_value_p->value); } } else if (lex_env_type == ECMA_LEXICAL_ENVIRONMENT_THIS_OBJECT_BOUND) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT bool lcache_lookup_allowed = ecma_op_is_global_environment (lex_env_p); -#else /* !ENABLED (JERRY_ESNEXT)*/ +#else /* !JERRY_ESNEXT*/ bool lcache_lookup_allowed = true; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (lcache_lookup_allowed) { -#if ENABLED (JERRY_LCACHE) +#if JERRY_LCACHE ecma_object_t *binding_obj_p = ecma_get_lex_env_binding_object (lex_env_p); ecma_property_t *property_p = ecma_lcache_lookup (binding_obj_p, name_p); @@ -355,7 +355,7 @@ ecma_op_resolve_reference_value (ecma_object_t *lex_env_p, /**< starting lexical ecma_value_t base_value = ecma_make_object_value (binding_obj_p); return ecma_op_function_call (getter_p, base_value, NULL, 0); } -#endif /* ENABLED (JERRY_LCACHE) */ +#endif /* JERRY_LCACHE */ } ecma_value_t result = ecma_op_object_bound_environment_resolve_reference_value (lex_env_p, name_p); @@ -368,11 +368,11 @@ ecma_op_resolve_reference_value (ecma_object_t *lex_env_p, /**< starting lexical } else { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_ASSERT (lex_env_type == ECMA_LEXICAL_ENVIRONMENT_HOME_OBJECT_BOUND); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_UNREACHABLE (); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } if (lex_env_p->u2.outer_reference_cp == JMEM_CP_NULL) @@ -383,14 +383,14 @@ ecma_op_resolve_reference_value (ecma_object_t *lex_env_p, /**< starting lexical lex_env_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, lex_env_p->u2.outer_reference_cp); } -#if ENABLED (JERRY_ERROR_MESSAGES) +#if JERRY_ERROR_MESSAGES ecma_value_t name_val = ecma_make_string_value (name_p); ecma_value_t error_value = ecma_raise_standard_error_with_format (ECMA_ERROR_REFERENCE, "% is not defined", name_val); -#else /* ENABLED (JERRY_ERROR_MESSAGES) */ +#else /* JERRY_ERROR_MESSAGES */ ecma_value_t error_value = ecma_raise_reference_error (NULL); -#endif /* !ENABLED (JERRY_ERROR_MESSAGES) */ +#endif /* !JERRY_ERROR_MESSAGES */ return error_value; } /* ecma_op_resolve_reference_value */ diff --git a/jerry-core/ecma/operations/ecma-reference.h b/jerry-core/ecma/operations/ecma-reference.h index a7ea38489..5cf6b415d 100644 --- a/jerry-core/ecma/operations/ecma-reference.h +++ b/jerry-core/ecma/operations/ecma-reference.h @@ -29,9 +29,9 @@ ecma_object_t *ecma_op_resolve_reference_base (ecma_object_t *lex_env_p, ecma_string_t *name_p); ecma_value_t ecma_op_resolve_reference_value (ecma_object_t *lex_env_p, ecma_string_t *name_p); ecma_value_t ecma_op_object_bound_environment_resolve_reference_value (ecma_object_t *lex_env_p, ecma_string_t *name_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t ecma_op_resolve_super_base (ecma_object_t *lex_env_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-regexp-object.c b/jerry-core/ecma/operations/ecma-regexp-object.c index dcab07082..9e5edf7bb 100644 --- a/jerry-core/ecma/operations/ecma-regexp-object.c +++ b/jerry-core/ecma/operations/ecma-regexp-object.c @@ -28,7 +28,7 @@ #include "lit-char-helpers.h" #include "re-compiler.h" -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP #define ECMA_BUILTINS_INTERNAL #include "ecma-builtins-internal.h" @@ -97,13 +97,13 @@ ecma_regexp_parse_flags (ecma_string_t *flags_str_p, /**< Input string with flag flag = RE_FLAG_UNICODE; break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case 's': { flag = RE_FLAG_DOTALL; break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { flag = RE_FLAG_EMPTY; @@ -126,7 +126,7 @@ ecma_regexp_parse_flags (ecma_string_t *flags_str_p, /**< Input string with flag return ret_value; } /* ecma_regexp_parse_flags */ -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT /* * Create the properties of a RegExp instance. */ @@ -199,7 +199,7 @@ ecma_regexp_update_props (ecma_object_t *re_object_p, /**< RegExp object */ prop_value_p = ECMA_PROPERTY_VALUE_PTR (prop_p); prop_value_p->value = ecma_make_boolean_value (flags & RE_FLAG_MULTILINE); } /* ecma_regexp_update_props */ -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ /** * RegExpAlloc method @@ -215,7 +215,7 @@ ecma_regexp_update_props (ecma_object_t *re_object_p, /**< RegExp object */ ecma_object_t * ecma_op_regexp_alloc (ecma_object_t *ctr_obj_p) /**< constructor object pointer */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ctr_obj_p == NULL) { ctr_obj_p = ecma_builtin_get (ECMA_BUILTIN_ID_REGEXP); @@ -229,18 +229,18 @@ ecma_op_regexp_alloc (ecma_object_t *ctr_obj_p) /**< constructor object pointer return proto_obj_p; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_UNUSED (ctr_obj_p); ecma_object_t *proto_obj_p = ecma_builtin_get (ECMA_BUILTIN_ID_REGEXP_PROTOTYPE); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_object_t *new_object_p = ecma_create_object (proto_obj_p, sizeof (ecma_extended_object_t), ECMA_OBJECT_TYPE_CLASS); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_deref_object (proto_obj_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_extended_object_t *regexp_obj_p = (ecma_extended_object_t *) new_object_p; @@ -268,7 +268,7 @@ ecma_op_regexp_initialize (ecma_object_t *regexp_obj_p, /**< RegExp object */ { ecma_extended_object_t *ext_obj_p = (ecma_extended_object_t *) regexp_obj_p; -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT if (ext_obj_p->u.class_prop.class_id == LIT_MAGIC_STRING_UNDEFINED) { /* This instance has not been initialized before. */ @@ -278,12 +278,12 @@ ecma_op_regexp_initialize (ecma_object_t *regexp_obj_p, /**< RegExp object */ { ecma_regexp_update_props (regexp_obj_p, pattern_str_p, flags); } -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_UNUSED (pattern_str_p); JERRY_UNUSED (flags); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ext_obj_p->u.class_prop.class_id = LIT_MAGIC_STRING_REGEXP_UL; ECMA_SET_INTERNAL_VALUE_POINTER (ext_obj_p->u.class_prop.u.value, bc_p); @@ -409,7 +409,7 @@ lit_code_point_t ecma_regexp_canonicalize_char (lit_code_point_t ch, /**< character */ bool unicode) /**< unicode */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (unicode) { /* In unicode mode the mappings contained in the CaseFolding.txt file should be used to canonicalize the character. @@ -433,7 +433,7 @@ ecma_regexp_canonicalize_char (lit_code_point_t ch, /**< character */ return ch; } -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ JERRY_UNUSED (unicode); lit_code_point_t cu = lit_char_to_upper_case (ch, NULL); @@ -523,7 +523,7 @@ ecma_regexp_advance (ecma_regexp_ctx_t *re_ctx_p, /**< regexp context */ JERRY_ASSERT (str_p != NULL); lit_code_point_t cp = lit_cesu8_read_next (str_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (re_ctx_p->flags & RE_FLAG_UNICODE) && lit_is_code_point_utf16_high_surrogate ((ecma_char_t) cp) && *str_p < re_ctx_p->input_end_p) @@ -535,12 +535,12 @@ ecma_regexp_advance (ecma_regexp_ctx_t *re_ctx_p, /**< regexp context */ *str_p += LIT_UTF8_MAX_BYTES_IN_CODE_UNIT; } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return ecma_regexp_canonicalize (cp, re_ctx_p->flags); } /* ecma_regexp_advance */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Helper function to get current full unicode code point and advance the string pointer. * @@ -568,7 +568,7 @@ ecma_regexp_unicode_advance (const lit_utf8_byte_t **str_p, /**< reference to st *str_p = current_p; return ch; } /* ecma_regexp_unicode_advance */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Helper function to revert the string pointer to the previous code point. @@ -580,7 +580,7 @@ ecma_regexp_step_back (ecma_regexp_ctx_t *re_ctx_p, /**< regexp context */ const lit_utf8_byte_t *str_p) /**< reference to string pointer */ { JERRY_ASSERT (str_p != NULL); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT lit_code_point_t ch = lit_cesu8_read_prev (&str_p); if (JERRY_UNLIKELY (re_ctx_p->flags & RE_FLAG_UNICODE) && lit_is_code_point_utf16_low_surrogate (ch) @@ -588,10 +588,10 @@ ecma_regexp_step_back (ecma_regexp_ctx_t *re_ctx_p, /**< regexp context */ { str_p -= LIT_UTF8_MAX_BYTES_IN_CODE_UNIT; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_UNUSED (re_ctx_p); lit_utf8_decr (&str_p); -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ return str_p; } /* ecma_regexp_step_back */ @@ -612,7 +612,7 @@ ecma_regexp_is_word_boundary (ecma_regexp_ctx_t *re_ctx_p, /**< regexp context * { left_cp = LIT_INVALID_CP; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (JERRY_UNLIKELY ((re_ctx_p->flags & (RE_FLAG_UNICODE | RE_FLAG_IGNORE_CASE)) == (RE_FLAG_UNICODE | RE_FLAG_IGNORE_CASE))) { @@ -620,7 +620,7 @@ ecma_regexp_is_word_boundary (ecma_regexp_ctx_t *re_ctx_p, /**< regexp context * left_cp = ecma_regexp_advance (re_ctx_p, &prev_p); JERRY_ASSERT (prev_p == str_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ else { left_cp = str_p[-1]; @@ -630,13 +630,13 @@ ecma_regexp_is_word_boundary (ecma_regexp_ctx_t *re_ctx_p, /**< regexp context * { right_cp = LIT_INVALID_CP; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (JERRY_UNLIKELY ((re_ctx_p->flags & (RE_FLAG_UNICODE | RE_FLAG_IGNORE_CASE)) == (RE_FLAG_UNICODE | RE_FLAG_IGNORE_CASE))) { right_cp = ecma_regexp_advance (re_ctx_p, &str_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ else { right_cp = str_p[0]; @@ -1501,7 +1501,7 @@ class_found: bc_p = bc_p + escape_count + chars_size + ranges_size; continue; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case RE_OP_UNICODE_PERIOD: { if (str_curr_p >= re_ctx_p->input_end_p) @@ -1520,7 +1520,7 @@ class_found: continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case RE_OP_PERIOD: { if (str_curr_p >= re_ctx_p->input_end_p) @@ -1529,11 +1529,11 @@ class_found: } const ecma_char_t ch = lit_cesu8_read_next (&str_curr_p); -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT bool has_dot_all_flag = false; -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ bool has_dot_all_flag = (re_ctx_p->flags & RE_FLAG_DOTALL) != 0; -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ if (!has_dot_all_flag && lit_char_is_line_terminator (ch)) { @@ -1763,10 +1763,10 @@ ecma_regexp_exec_helper (ecma_object_t *regexp_object_p, /**< RegExp object */ ecma_length_t index = 0; ecma_value_t lastindex_value = ecma_op_object_get_by_magic_id (regexp_object_p, LIT_MAGIC_STRING_LASTINDEX_UL); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ret_value = ecma_op_to_length (lastindex_value, &index); ecma_free_value (lastindex_value); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ ecma_number_t lastindex_num = 0.0f; ret_value = ecma_op_to_integer (lastindex_value, &lastindex_num); ecma_free_value (lastindex_value); @@ -1780,7 +1780,7 @@ ecma_regexp_exec_helper (ecma_object_t *regexp_object_p, /**< RegExp object */ } index = ecma_number_to_uint32 (lastindex_num); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (ECMA_IS_VALUE_ERROR (ret_value)) { @@ -1833,13 +1833,13 @@ ecma_regexp_exec_helper (ecma_object_t *regexp_object_p, /**< RegExp object */ goto match_found; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* 12.c.i */ if (re_ctx.flags & RE_FLAG_STICKY) { goto fail_put_lastindex; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* 12.a */ if (input_curr_p >= input_end_p) @@ -1857,7 +1857,7 @@ ecma_regexp_exec_helper (ecma_object_t *regexp_object_p, /**< RegExp object */ /* 12.c.ii */ index++; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (re_ctx.flags & RE_FLAG_UNICODE) { const lit_code_point_t cp = ecma_regexp_unicode_advance (&input_curr_p, input_end_p); @@ -1869,7 +1869,7 @@ ecma_regexp_exec_helper (ecma_object_t *regexp_object_p, /**< RegExp object */ continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lit_utf8_incr (&input_curr_p); } @@ -2097,7 +2097,7 @@ ecma_regexp_split_helper (ecma_value_t this_arg, /**< this value */ ecma_value_t string_arg, /**< string value */ ecma_value_t limit_arg) /**< limit value */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* 2. */ if (!ecma_is_value_object (this_arg)) { @@ -2418,7 +2418,7 @@ cleanup_string: ecma_deref_ecma_string (string_p); return result; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ ecma_value_t result = ECMA_VALUE_ERROR; /* 2. */ @@ -2587,7 +2587,7 @@ cleanup_string: ecma_deref_ecma_string (string_p); return result; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* ecma_regexp_split_helper */ /** @@ -2617,7 +2617,6 @@ ecma_regexp_replace_helper_fast (ecma_replace_context_t *ctx_p, /**flags & RE_FLAG_GLOBAL) == 0 && (re_ctx.flags & RE_FLAG_STICKY) != 0)) { @@ -2686,7 +2685,7 @@ ecma_regexp_replace_helper_fast (ecma_replace_context_t *ctx_p, /**flags & RE_FLAG_GLOBAL)) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY ((re_ctx.flags & RE_FLAG_STICKY) != 0)) { ecma_value_t index_value = ecma_make_length_value (index); @@ -2786,7 +2785,7 @@ ecma_regexp_replace_helper_fast (ecma_replace_context_t *ctx_p, /**= string_end_p) { break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if ((ctx_p->flags & RE_FLAG_UNICODE) != 0) { index++; @@ -2833,7 +2832,7 @@ ecma_regexp_replace_helper_fast (ecma_replace_context_t *ctx_p, /**u.class_prop.class_id = LIT_MAGIC_STRING_STRING_UL; ext_object_p->u.class_prop.u.value = prim_value; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (new_target) { ecma_deref_object (prototype_obj_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return ecma_make_object_value (object_p); } /* ecma_op_create_string_object */ diff --git a/jerry-core/ecma/operations/ecma-symbol-object.c b/jerry-core/ecma/operations/ecma-symbol-object.c index 1c9039b06..f9e116b53 100644 --- a/jerry-core/ecma/operations/ecma-symbol-object.c +++ b/jerry-core/ecma/operations/ecma-symbol-object.c @@ -24,7 +24,7 @@ #include "ecma-symbol-object.h" #include "lit-char-helpers.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** \addtogroup ecma ECMA * @{ @@ -176,7 +176,7 @@ ecma_symbol_this_value (ecma_value_t this_arg) /**< this argument value */ /* 3. */ return ecma_raise_type_error (ECMA_ERR_MSG ("Argument 'this' must be a Symbol")); } /* ecma_symbol_this_value */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} diff --git a/jerry-core/ecma/operations/ecma-symbol-object.h b/jerry-core/ecma/operations/ecma-symbol-object.h index 83dd476a6..013367673 100644 --- a/jerry-core/ecma/operations/ecma-symbol-object.h +++ b/jerry-core/ecma/operations/ecma-symbol-object.h @@ -16,7 +16,7 @@ #ifndef ECMA_SYMBOL_H #define ECMA_SYMBOL_H -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #include "ecma-globals.h" /** \addtogroup ecma ECMA @@ -44,7 +44,7 @@ ecma_symbol_this_value (ecma_value_t this_arg); ecma_value_t ecma_get_symbol_descriptive_string (ecma_value_t symbol_value); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} * @} diff --git a/jerry-core/ecma/operations/ecma-typedarray-object.c b/jerry-core/ecma/operations/ecma-typedarray-object.c index 0e05dca32..51fe1cfd7 100644 --- a/jerry-core/ecma/operations/ecma-typedarray-object.c +++ b/jerry-core/ecma/operations/ecma-typedarray-object.c @@ -30,7 +30,7 @@ #include "ecma-helpers.h" #include "jcontext.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY /** \addtogroup ecma ECMA * @{ @@ -47,11 +47,11 @@ { \ if (JERRY_LIKELY ((((uintptr_t) (src_p)) & (sizeof (type) - 1)) == 0)) \ { \ - num = *(type *) src_p; \ + num = *(type *) ((void*) src_p); \ } \ else \ { \ - memcpy (&num, src_p, sizeof (type)); \ + memcpy (&num, (void *) src_p, sizeof (type)); \ } \ } \ while (0) @@ -64,11 +64,11 @@ { \ if (JERRY_LIKELY ((((uintptr_t) (src_p)) & (sizeof (type) - 1)) == 0)) \ { \ - *(type *) src_p = num; \ + *(type *) ((void*) src_p) = num; \ } \ else \ { \ - memcpy (src_p, &num, sizeof (type)); \ + memcpy ((void*) src_p, &num, sizeof (type)); \ } \ } \ while (0) @@ -159,7 +159,7 @@ ecma_typedarray_get_double_element (lit_utf8_byte_t *src) /**< the location in t return ecma_make_number_value (num); } /* ecma_typedarray_get_double_element */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT /** * Read a bigint64 value from the given arraybuffer */ @@ -188,7 +188,7 @@ ecma_typedarray_get_biguint64_element (lit_utf8_byte_t *src) /**< the location i ECMA_TYPEDARRAY_GET_ELEMENT (src, num, uint64_t); return ecma_bigint_create_from_digits (&num, 1, false); } /* ecma_typedarray_get_biguint64_element */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ /** * Normalize the given ecma_number_t to an uint32_t value @@ -428,7 +428,7 @@ ecma_typedarray_set_float_element (lit_utf8_byte_t *dst_p, /**< the location in return ECMA_VALUE_TRUE; } /* ecma_typedarray_set_float_element */ -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 /** * Write a double value into the given arraybuffer * @@ -451,9 +451,9 @@ ecma_typedarray_set_double_element (lit_utf8_byte_t *dst_p, /**< the location in ECMA_TYPEDARRAY_SET_ELEMENT (dst_p, num, double); return ECMA_VALUE_TRUE; } /* ecma_typedarray_set_double_element */ -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT /** * Write a bigint64/biguint64 value into the given arraybuffer * @@ -486,29 +486,29 @@ ecma_typedarray_set_bigint_element (lit_utf8_byte_t *dst_p, /**< the location in return ECMA_VALUE_TRUE; } /* ecma_typedarray_set_bigint_element */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ /** * Builtin id of the first %TypedArray% builtin routine intrinsic object */ #define ECMA_FIRST_TYPEDARRAY_BUILTIN_ROUTINE_ID ECMA_BUILTIN_ID_INT8ARRAY -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT /** * Builtin id of the last %TypedArray% builtin routine intrinsic object */ #define ECMA_LAST_TYPEDARRAY_BUILTIN_ROUTINE_ID ECMA_BUILTIN_ID_BIGUINT64ARRAY -#elif !ENABLED (JERRY_BUILTIN_BIGINT) && ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#elif !JERRY_BUILTIN_BIGINT && JERRY_NUMBER_TYPE_FLOAT64 /** * Builtin id of the last %TypedArray% builtin routine intrinsic object */ #define ECMA_LAST_TYPEDARRAY_BUILTIN_ROUTINE_ID ECMA_BUILTIN_ID_FLOAT64ARRAY -#else /* !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#else /* !JERRY_NUMBER_TYPE_FLOAT64 */ /** * Builtin id of the last %TypedArray% builtin routine intrinsic object */ #define ECMA_LAST_TYPEDARRAY_BUILTIN_ROUTINE_ID ECMA_BUILTIN_ID_FLOAT32ARRAY -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ /** * Builtin id of the first %TypedArray% builtin prototype intrinsic object @@ -528,13 +528,13 @@ static const ecma_typedarray_getter_fn_t ecma_typedarray_getters[] = ecma_typedarray_get_int32_element, /**< Uint32Array */ ecma_typedarray_get_uint32_element, /**< Uint32Array */ ecma_typedarray_get_float_element, /**< Float32Array */ -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 ecma_typedarray_get_double_element, /**< Float64Array */ -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ +#if JERRY_BUILTIN_BIGINT ecma_typedarray_get_bigint64_element, /**< BigInt64Array*/ ecma_typedarray_get_biguint64_element, /**< BigUint64Array */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ }; /** @@ -550,13 +550,13 @@ static const ecma_typedarray_setter_fn_t ecma_typedarray_setters[] = ecma_typedarray_set_int32_element, /**< Uint32Array */ ecma_typedarray_set_uint32_element, /**< Uint32Array */ ecma_typedarray_set_float_element, /**< Float32Array */ -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 ecma_typedarray_set_double_element, /**< Float64Array */ -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ +#if JERRY_BUILTIN_BIGINT ecma_typedarray_set_bigint_element, /**< BigInt64Array */ ecma_typedarray_set_bigint_element, /**< BigUInt64Array */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ }; /** @@ -572,13 +572,13 @@ static const uint8_t ecma_typedarray_element_shift_sizes[] = 2, /**< Int32Array */ 2, /**< Uint32Array */ 2, /**< Float32Array */ -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 3, /**< Float64Array */ -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ +#if JERRY_BUILTIN_BIGINT 3, /**< BigInt64Array */ 3, /**< BigUInt64Array */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ }; /** @@ -594,13 +594,13 @@ static const uint16_t ecma_typedarray_magic_string_list[] = (uint16_t) LIT_MAGIC_STRING_INT32_ARRAY_UL, /**< Int32Array */ (uint16_t) LIT_MAGIC_STRING_UINT32_ARRAY_UL, /**< Uint32Array */ (uint16_t) LIT_MAGIC_STRING_FLOAT32_ARRAY_UL, /**< Float32Array */ -#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_NUMBER_TYPE_FLOAT64 (uint16_t) LIT_MAGIC_STRING_FLOAT64_ARRAY_UL, /**< Float64Array */ -#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#endif /* JERRY_NUMBER_TYPE_FLOAT64 */ +#if JERRY_BUILTIN_BIGINT (uint16_t) LIT_MAGIC_STRING_BIGINT64_ARRAY_UL, /**< BigInt64Array */ (uint16_t) LIT_MAGIC_STRING_BIGUINT64_ARRAY_UL, /**< BigUInt64Array */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT */ +#endif /* JERRY_BUILTIN_BIGINT */ }; /** @@ -892,13 +892,13 @@ ecma_typedarray_create_object_with_typedarray (ecma_object_t *typedarray_p, /**< } else { -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if ((ECMA_TYPEDARRAY_IS_BIGINT_TYPE (src_id) ^ ECMA_TYPEDARRAY_IS_BIGINT_TYPE (typedarray_id)) == 1) { ecma_deref_object (new_typedarray_p); return ecma_raise_type_error (ECMA_ERR_MSG ("Incompatible TypedArray types")); } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ uint32_t src_element_size = 1u << ecma_typedarray_get_element_size_shift (typedarray_p); uint32_t dst_element_size = 1u << element_size_shift; @@ -1697,7 +1697,7 @@ ecma_typedarray_species_create (ecma_value_t this_arg, /**< this argument */ return result; } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT ecma_object_t *result_p = ecma_get_object_from_value (result); ecma_typedarray_info_t result_info = ecma_typedarray_get_info (result_p); /* @@ -1709,7 +1709,7 @@ ecma_typedarray_species_create (ecma_value_t this_arg, /**< this argument */ ecma_free_value (result); return ecma_raise_type_error (ECMA_ERR_MSG ("TypedArray returned by [[ContentType]] does not match source")); } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ return result; } /* ecma_typedarray_species_create */ @@ -1760,4 +1760,4 @@ ecma_typedarray_get_info (ecma_object_t *typedarray_p) * @} * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ diff --git a/jerry-core/ecma/operations/ecma-typedarray-object.h b/jerry-core/ecma/operations/ecma-typedarray-object.h index 674f776d4..422c4ce84 100644 --- a/jerry-core/ecma/operations/ecma-typedarray-object.h +++ b/jerry-core/ecma/operations/ecma-typedarray-object.h @@ -19,7 +19,7 @@ #include "ecma-globals.h" #include "ecma-builtins.h" -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY /** \addtogroup ecma ECMA * @{ @@ -88,5 +88,5 @@ ecma_value_t ecma_typedarray_species_create (ecma_value_t this_arg, * @} */ -#endif /* ENABLED (JERRY_BUILTIN_TYPEDARRAY) */ +#endif /* JERRY_BUILTIN_TYPEDARRAY */ #endif /* !ECMA_TYPEDARRAY_OBJECT_H */ diff --git a/jerry-core/include/jerryscript-compiler.h b/jerry-core/include/jerryscript-compiler.h index 01c3accdc..0d3339c54 100644 --- a/jerry-core/include/jerryscript-compiler.h +++ b/jerry-core/include/jerryscript-compiler.h @@ -41,8 +41,13 @@ extern "C" #define JERRY_ATTR_PURE __attribute__((pure)) #define JERRY_ATTR_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) +#ifndef JERRY_LIKELY #define JERRY_LIKELY(x) __builtin_expect(!!(x), 1) +#endif /* !JERRY_LIKELY */ + +#ifndef JERRY_UNLIKELY #define JERRY_UNLIKELY(x) __builtin_expect(!!(x), 0) +#endif /* !JERRY_UNLIKELY */ #endif /* __GNUC__ */ diff --git a/jerry-core/jcontext/jcontext.c b/jerry-core/jcontext/jcontext.c index 37f0fe69b..487bd3516 100644 --- a/jerry-core/jcontext/jcontext.c +++ b/jerry-core/jcontext/jcontext.c @@ -118,14 +118,14 @@ jcontext_take_exception (void) return JERRY_CONTEXT (error_value); } /* jcontext_take_exception */ -#if !ENABLED (JERRY_EXTERNAL_CONTEXT) +#if !JERRY_EXTERNAL_CONTEXT /** * Global context. */ jerry_context_t jerry_global_context; -#if !ENABLED (JERRY_SYSTEM_ALLOCATOR) +#if !JERRY_SYSTEM_ALLOCATOR /** * Check size of heap is corresponding to configuration @@ -138,9 +138,9 @@ JERRY_STATIC_ASSERT (sizeof (jmem_heap_t) <= JMEM_HEAP_SIZE, */ jmem_heap_t jerry_global_heap JERRY_ATTR_ALIGNED (JMEM_ALIGNMENT) JERRY_ATTR_GLOBAL_HEAP; -#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */ +#endif /* !JERRY_SYSTEM_ALLOCATOR */ -#endif /* !ENABLED (JERRY_EXTERNAL_CONTEXT) */ +#endif /* !JERRY_EXTERNAL_CONTEXT */ /** * @} diff --git a/jerry-core/jcontext/jcontext.h b/jerry-core/jcontext/jcontext.h index 072fe6a60..e973d6a59 100644 --- a/jerry-core/jcontext/jcontext.h +++ b/jerry-core/jcontext/jcontext.h @@ -75,7 +75,7 @@ */ #define CONFIG_ECMA_GC_NEW_OBJECTS_FRACTION (16) -#if !ENABLED (JERRY_SYSTEM_ALLOCATOR) +#if !JERRY_SYSTEM_ALLOCATOR /** * Heap structure * @@ -89,7 +89,7 @@ * there. */ typedef struct jmem_heap_t jmem_heap_t; -#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */ +#endif /* !JERRY_SYSTEM_ALLOCATOR */ /** * User context item @@ -117,42 +117,42 @@ typedef struct jerry_context_data_header struct jerry_context_t { /* The value of external context members must be preserved across initializations and cleanups. */ -#if ENABLED (JERRY_EXTERNAL_CONTEXT) -#if !ENABLED (JERRY_SYSTEM_ALLOCATOR) +#if JERRY_EXTERNAL_CONTEXT +#if !JERRY_SYSTEM_ALLOCATOR jmem_heap_t *heap_p; /**< point to the heap aligned to JMEM_ALIGNMENT. */ uint32_t heap_size; /**< size of the heap */ -#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */ -#endif /* ENABLED (JERRY_EXTERNAL_CONTEXT) */ +#endif /* !JERRY_SYSTEM_ALLOCATOR */ +#endif /* JERRY_EXTERNAL_CONTEXT */ /* Update JERRY_CONTEXT_FIRST_MEMBER if the first non-external member changes */ ecma_global_object_t *global_object_p; /**< current global object */ jmem_heap_free_t *jmem_heap_list_skip_p; /**< improves deallocation performance */ jmem_pools_chunk_t *jmem_free_8_byte_chunk_p; /**< list of free eight byte pool chunks */ -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP re_compiled_code_t *re_cache[RE_CACHE_SIZE]; /**< regex cache */ -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ -#if ENABLED (JERRY_CPOINTER_32_BIT) +#endif /* JERRY_BUILTIN_REGEXP */ +#if JERRY_CPOINTER_32_BIT jmem_pools_chunk_t *jmem_free_16_byte_chunk_p; /**< list of free sixteen byte pool chunks */ -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ const lit_utf8_byte_t * const *lit_magic_string_ex_array; /**< array of external magic strings */ const lit_utf8_size_t *lit_magic_string_ex_sizes; /**< external magic string lengths */ jmem_cpointer_t ecma_gc_objects_cp; /**< List of currently alive objects. */ jmem_cpointer_t string_list_first_cp; /**< first item of the literal string list */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT jmem_cpointer_t symbol_list_first_cp; /**< first item of the global symbol list */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ jmem_cpointer_t number_list_first_cp; /**< first item of the literal number list */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT jmem_cpointer_t bigint_list_first_cp; /**< first item of the literal bigint list */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ -#if ENABLED (JERRY_ESNEXT) +#endif /* JERRY_BUILTIN_BIGINT */ +#if JERRY_ESNEXT jmem_cpointer_t global_symbols_cp[ECMA_BUILTIN_GLOBAL_SYMBOL_COUNT]; /**< global symbols */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM ecma_module_t *module_list_p; /**< current module context */ ecma_module_t *module_current_p; /**< current module context */ -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ vm_frame_ctx_t *vm_top_context_p; /**< top (current) interpreter context */ jerry_context_data_header_t *context_data_p; /**< linked list of user-provided context-specific pointers */ @@ -171,33 +171,33 @@ struct jerry_context_t uint32_t ecma_gc_mark_recursion_limit; /**< GC mark recursion limit */ #endif /* (JERRY_GC_MARK_LIMIT != 0) */ -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP uint8_t ecma_prop_hashmap_alloc_state; /**< property hashmap allocation state: 0-4, * if !0 property hashmap allocation is disabled */ -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP uint8_t re_cache_idx; /**< evicted item index when regex cache is full (round-robin) */ -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE ecma_job_queue_item_t *job_queue_head_p; /**< points to the head item of the job queue */ ecma_job_queue_item_t *job_queue_tail_p; /**< points to the tail item of the job queue */ -#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */ +#endif /* JERRY_BUILTIN_PROMISE */ -#if ENABLED (JERRY_VM_EXEC_STOP) +#if JERRY_VM_EXEC_STOP uint32_t vm_exec_stop_frequency; /**< reset value for vm_exec_stop_counter */ uint32_t vm_exec_stop_counter; /**< down counter for reducing the calls of vm_exec_stop_cb */ void *vm_exec_stop_user_p; /**< user pointer for vm_exec_stop_cb */ ecma_vm_exec_stop_callback_t vm_exec_stop_cb; /**< user function which returns whether the * ECMAScript execution should be stopped */ -#endif /* ENABLED (JERRY_VM_EXEC_STOP) */ +#endif /* JERRY_VM_EXEC_STOP */ #if (JERRY_STACK_LIMIT != 0) uintptr_t stack_base; /**< stack base marker */ #endif /* (JERRY_STACK_LIMIT != 0) */ -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER uint8_t debugger_send_buffer[JERRY_DEBUGGER_TRANSPORT_MAX_BUFFER_SIZE]; /**< buffer for sending messages */ uint8_t debugger_receive_buffer[JERRY_DEBUGGER_TRANSPORT_MAX_BUFFER_SIZE]; /**< buffer for receiving messages */ jerry_debugger_transport_header_t *debugger_transport_header_p; /**< head of transport protocol chain */ @@ -212,29 +212,29 @@ struct jerry_context_t uint8_t debugger_message_delay; /**< call receive message when reaches zero */ uint8_t debugger_max_send_size; /**< maximum amount of data that can be sent */ uint8_t debugger_max_receive_size; /**< maximum amount of data that can be received */ -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_heap_stats_t jmem_heap_stats; /**< heap's memory usage statistics */ -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ /* This must be at the end of the context for performance reasons */ -#if ENABLED (JERRY_LCACHE) +#if JERRY_LCACHE /** hash table for caching the last access of properties */ ecma_lcache_hash_entry_t lcache[ECMA_LCACHE_HASH_ROWS_COUNT][ECMA_LCACHE_HASH_ROW_LENGTH]; -#endif /* ENABLED (JERRY_LCACHE) */ +#endif /* JERRY_LCACHE */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Allowed values and it's meaning: * * NULL (0x0): the current "new.target" is undefined, that is the execution is inside a normal method. * * Any other valid function object pointer: the current "new.target" is valid and it is constructor call. */ ecma_object_t *current_new_target_p; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ }; -#if ENABLED (JERRY_EXTERNAL_CONTEXT) +#if JERRY_EXTERNAL_CONTEXT /* * This part is for JerryScript which uses external context. @@ -243,7 +243,7 @@ struct jerry_context_t #define JERRY_CONTEXT_STRUCT (*jerry_port_get_current_context ()) #define JERRY_CONTEXT(field) (jerry_port_get_current_context ()->field) -#if !ENABLED (JERRY_SYSTEM_ALLOCATOR) +#if !JERRY_SYSTEM_ALLOCATOR #define JMEM_HEAP_SIZE (JERRY_CONTEXT (heap_size)) @@ -257,9 +257,9 @@ struct jmem_heap_t #define JERRY_HEAP_CONTEXT(field) (JERRY_CONTEXT (heap_p)->field) -#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */ +#endif /* !JERRY_SYSTEM_ALLOCATOR */ -#else /* !ENABLED (JERRY_EXTERNAL_CONTEXT) */ +#else /* !JERRY_EXTERNAL_CONTEXT */ /* * This part is for JerryScript which uses default context. @@ -280,7 +280,7 @@ extern jerry_context_t jerry_global_context; */ #define JERRY_CONTEXT(field) (jerry_global_context.field) -#if !ENABLED (JERRY_SYSTEM_ALLOCATOR) +#if !JERRY_SYSTEM_ALLOCATOR /** * Size of heap @@ -308,9 +308,9 @@ extern jmem_heap_t jerry_global_heap; */ #define JERRY_HEAP_CONTEXT(field) (jerry_global_heap.field) -#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */ +#endif /* !JERRY_SYSTEM_ALLOCATOR */ -#endif /* ENABLED (JERRY_EXTERNAL_CONTEXT) */ +#endif /* JERRY_EXTERNAL_CONTEXT */ void jcontext_set_exception_flag (bool is_exception); diff --git a/jerry-core/jmem/jmem-allocator-internal.h b/jerry-core/jmem/jmem-allocator-internal.h index 3abb1b22c..a3bc57ee9 100644 --- a/jerry-core/jmem/jmem-allocator-internal.h +++ b/jerry-core/jmem/jmem-allocator-internal.h @@ -28,7 +28,7 @@ * @{ * Valgrind-related options and headers */ -#if ENABLED (JERRY_VALGRIND) +#if JERRY_VALGRIND # include "memcheck.h" # define JMEM_VALGRIND_NOACCESS_SPACE(p, s) VALGRIND_MAKE_MEM_NOACCESS((p), (s)) @@ -37,14 +37,14 @@ # define JMEM_VALGRIND_MALLOCLIKE_SPACE(p, s) VALGRIND_MALLOCLIKE_BLOCK((p), (s), 0, 0) # define JMEM_VALGRIND_RESIZE_SPACE(p, o, n) VALGRIND_RESIZEINPLACE_BLOCK((p), (o), (n), 0) # define JMEM_VALGRIND_FREELIKE_SPACE(p) VALGRIND_FREELIKE_BLOCK((p), 0) -#else /* !ENABLED (JERRY_VALGRIND) */ +#else /* !JERRY_VALGRIND */ # define JMEM_VALGRIND_NOACCESS_SPACE(p, s) # define JMEM_VALGRIND_UNDEFINED_SPACE(p, s) # define JMEM_VALGRIND_DEFINED_SPACE(p, s) # define JMEM_VALGRIND_MALLOCLIKE_SPACE(p, s) # define JMEM_VALGRIND_RESIZE_SPACE(p, o, n) # define JMEM_VALGRIND_FREELIKE_SPACE(p) -#endif /* ENABLED (JERRY_VALGRIND) */ +#endif /* JERRY_VALGRIND */ /** @} */ void jmem_heap_init (void); @@ -69,7 +69,7 @@ void jmem_pools_finalize (void); * @{ * Jerry mem-stat definitions */ -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS void jmem_heap_stat_init (void); void jmem_heap_stat_alloc (size_t num); void jmem_heap_stat_free (size_t num); @@ -77,11 +77,11 @@ void jmem_heap_stat_free (size_t num); #define JMEM_HEAP_STAT_INIT() jmem_heap_stat_init () #define JMEM_HEAP_STAT_ALLOC(v1) jmem_heap_stat_alloc (v1) #define JMEM_HEAP_STAT_FREE(v1) jmem_heap_stat_free (v1) -#else /* !ENABLED (JERRY_MEM_STATS) */ +#else /* !JERRY_MEM_STATS */ #define JMEM_HEAP_STAT_INIT() #define JMEM_HEAP_STAT_ALLOC(v1) JERRY_UNUSED (v1) #define JMEM_HEAP_STAT_FREE(v1) JERRY_UNUSED (v1) -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ /** @} */ diff --git a/jerry-core/jmem/jmem-allocator.c b/jerry-core/jmem/jmem-allocator.c index b97752c4e..28178c846 100644 --- a/jerry-core/jmem/jmem-allocator.c +++ b/jerry-core/jmem/jmem-allocator.c @@ -24,7 +24,7 @@ #define JMEM_ALLOCATOR_INTERNAL #include "jmem-allocator-internal.h" -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS /** * Register byte code allocation. */ @@ -141,7 +141,7 @@ jmem_stats_free_property_bytes (size_t property_size) heap_stats->property_bytes -= property_size; } /* jmem_stats_free_property_bytes */ -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ /** * Initialize memory allocators. @@ -160,12 +160,12 @@ jmem_finalize (void) { jmem_pools_finalize (); -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS if (JERRY_CONTEXT (jerry_init_flags) & ECMA_INIT_MEM_STATS) { jmem_heap_stats_print (); } -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ jmem_heap_finalize (); } /* jmem_finalize */ @@ -185,21 +185,21 @@ jmem_compress_pointer (const void *pointer_p) /**< pointer to compress */ JERRY_ASSERT (uint_ptr % JMEM_ALIGNMENT == 0); -#if defined (ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY) && ENABLED (JERRY_CPOINTER_32_BIT) +#if defined (ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY) && JERRY_CPOINTER_32_BIT JERRY_ASSERT (((jmem_cpointer_t) uint_ptr) == uint_ptr); -#else /* !ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY || !ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* !ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY || !JERRY_CPOINTER_32_BIT */ const uintptr_t heap_start = (uintptr_t) &JERRY_HEAP_CONTEXT (first); uint_ptr -= heap_start; uint_ptr >>= JMEM_ALIGNMENT_LOG; -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT JERRY_ASSERT (uint_ptr <= UINT32_MAX); -#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* !JERRY_CPOINTER_32_BIT */ JERRY_ASSERT (uint_ptr <= UINT16_MAX); -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ JERRY_ASSERT (uint_ptr != JMEM_CP_NULL); -#endif /* ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY && ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY && JERRY_CPOINTER_32_BIT */ return (jmem_cpointer_t) uint_ptr; } /* jmem_compress_pointer */ @@ -218,16 +218,16 @@ jmem_decompress_pointer (uintptr_t compressed_pointer) /**< pointer to decompres JERRY_ASSERT (((jmem_cpointer_t) uint_ptr) == uint_ptr); -#if defined (ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY) && ENABLED (JERRY_CPOINTER_32_BIT) +#if defined (ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY) && JERRY_CPOINTER_32_BIT JERRY_ASSERT (uint_ptr % JMEM_ALIGNMENT == 0); -#else /* !ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY || !ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* !ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY || !JERRY_CPOINTER_32_BIT */ const uintptr_t heap_start = (uintptr_t) &JERRY_HEAP_CONTEXT (first); uint_ptr <<= JMEM_ALIGNMENT_LOG; uint_ptr += heap_start; JERRY_ASSERT (jmem_is_heap_pointer ((void *) uint_ptr)); -#endif /* ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY && ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY && JERRY_CPOINTER_32_BIT */ return (void *) uint_ptr; } /* jmem_decompress_pointer */ diff --git a/jerry-core/jmem/jmem-heap.c b/jerry-core/jmem/jmem-heap.c index 65a612845..cad427a5e 100644 --- a/jerry-core/jmem/jmem-heap.c +++ b/jerry-core/jmem/jmem-heap.c @@ -33,7 +33,7 @@ * @{ */ -#if !ENABLED (JERRY_SYSTEM_ALLOCATOR) +#if !JERRY_SYSTEM_ALLOCATOR /** * End of list marker. */ @@ -64,7 +64,7 @@ jmem_heap_get_region_end (jmem_heap_free_t *curr_p) /**< current region */ { return (jmem_heap_free_t *) ((uint8_t *) curr_p + curr_p->size); } /* jmem_heap_get_region_end */ -#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */ +#endif /* !JERRY_SYSTEM_ALLOCATOR */ /** * Startup initialization of heap @@ -72,11 +72,11 @@ jmem_heap_get_region_end (jmem_heap_free_t *curr_p) /**< current region */ void jmem_heap_init (void) { -#if !ENABLED (JERRY_SYSTEM_ALLOCATOR) -#if !ENABLED (JERRY_CPOINTER_32_BIT) +#if !JERRY_SYSTEM_ALLOCATOR +#if !JERRY_CPOINTER_32_BIT /* the maximum heap size for 16bit compressed pointers should be 512K */ JERRY_ASSERT (((UINT16_MAX + 1) << JMEM_ALIGNMENT_LOG) >= JMEM_HEAP_SIZE); -#endif /* !ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* !JERRY_CPOINTER_32_BIT */ JERRY_ASSERT ((uintptr_t) JERRY_HEAP_CONTEXT (area) % JMEM_ALIGNMENT == 0); JERRY_CONTEXT (jmem_heap_limit) = CONFIG_GC_LIMIT; @@ -94,7 +94,7 @@ jmem_heap_init (void) JMEM_VALGRIND_NOACCESS_SPACE (&JERRY_HEAP_CONTEXT (first), sizeof (jmem_heap_free_t)); JMEM_VALGRIND_NOACCESS_SPACE (JERRY_HEAP_CONTEXT (area), JMEM_HEAP_AREA_SIZE); -#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */ +#endif /* !JERRY_SYSTEM_ALLOCATOR */ JMEM_HEAP_STAT_INIT (); } /* jmem_heap_init */ @@ -105,9 +105,9 @@ void jmem_heap_finalize (void) { JERRY_ASSERT (JERRY_CONTEXT (jmem_heap_allocated_size) == 0); -#if !ENABLED (JERRY_SYSTEM_ALLOCATOR) +#if !JERRY_SYSTEM_ALLOCATOR JMEM_VALGRIND_NOACCESS_SPACE (&JERRY_HEAP_CONTEXT (first), JMEM_HEAP_SIZE); -#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */ +#endif /* !JERRY_SYSTEM_ALLOCATOR */ } /* jmem_heap_finalize */ /** @@ -122,7 +122,7 @@ jmem_heap_finalize (void) static void * JERRY_ATTR_HOT jmem_heap_alloc (const size_t size) /**< size of requested block */ { -#if !ENABLED (JERRY_SYSTEM_ALLOCATOR) +#if !JERRY_SYSTEM_ALLOCATOR /* Align size. */ const size_t required_size = ((size + JMEM_ALIGNMENT - 1) / JMEM_ALIGNMENT) * JMEM_ALIGNMENT; jmem_heap_free_t *data_space_p = NULL; @@ -243,7 +243,7 @@ jmem_heap_alloc (const size_t size) /**< size of requested block */ JMEM_VALGRIND_MALLOCLIKE_SPACE (data_space_p, size); return (void *) data_space_p; -#else /* ENABLED (JERRY_SYSTEM_ALLOCATOR) */ +#else /* JERRY_SYSTEM_ALLOCATOR */ JERRY_CONTEXT (jmem_heap_allocated_size) += size; while (JERRY_CONTEXT (jmem_heap_allocated_size) >= JERRY_CONTEXT (jmem_heap_limit)) @@ -252,7 +252,7 @@ jmem_heap_alloc (const size_t size) /**< size of requested block */ } return malloc (size); -#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */ +#endif /* !JERRY_SYSTEM_ALLOCATOR */ } /* jmem_heap_alloc */ /** @@ -278,19 +278,18 @@ jmem_heap_gc_and_alloc_block (const size_t size, /**< required memory size */ jmem_pressure_t pressure = JMEM_PRESSURE_NONE; -#if !ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) +#if !JERRY_MEM_GC_BEFORE_EACH_ALLOC if (JERRY_CONTEXT (jmem_heap_allocated_size) + size >= JERRY_CONTEXT (jmem_heap_limit)) { pressure = JMEM_PRESSURE_LOW; ecma_free_unused_memory (pressure); } -#else /* !ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */ +#else /* !JERRY_MEM_GC_BEFORE_EACH_ALLOC */ ecma_gc_run (); -#endif /* ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */ +#endif /* JERRY_MEM_GC_BEFORE_EACH_ALLOC */ void *data_space_p = jmem_heap_alloc (size); - /* cppcheck-suppress memleak */ while (JERRY_UNLIKELY (data_space_p == NULL) && JERRY_LIKELY (pressure < max_pressure)) { pressure++; @@ -342,17 +341,17 @@ jmem_heap_alloc_block_null_on_error (const size_t size) /**< required memory siz { void *block_p = jmem_heap_gc_and_alloc_block (size, JMEM_PRESSURE_HIGH); -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS if (block_p != NULL) { JMEM_HEAP_STAT_ALLOC (size); } -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ return block_p; } /* jmem_heap_alloc_block_null_on_error */ -#if !ENABLED (JERRY_SYSTEM_ALLOCATOR) +#if !JERRY_SYSTEM_ALLOCATOR /** * Finds the block in the free block list which preceeds the argument block * @@ -446,7 +445,7 @@ jmem_heap_insert_block (jmem_heap_free_t *block_p, /**< block to insert */ JMEM_VALGRIND_NOACCESS_SPACE (block_p, sizeof (jmem_heap_free_t)); JMEM_VALGRIND_NOACCESS_SPACE (next_p, sizeof (jmem_heap_free_t)); } /* jmem_heap_insert_block */ -#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */ +#endif /* !JERRY_SYSTEM_ALLOCATOR */ /** * Internal method for freeing a memory block. @@ -459,7 +458,7 @@ jmem_heap_free_block_internal (void *ptr, /**< pointer to beginning of data spac JERRY_ASSERT (JERRY_CONTEXT (jmem_heap_limit) >= JERRY_CONTEXT (jmem_heap_allocated_size)); JERRY_ASSERT (JERRY_CONTEXT (jmem_heap_allocated_size) > 0); -#if !ENABLED (JERRY_SYSTEM_ALLOCATOR) +#if !JERRY_SYSTEM_ALLOCATOR /* checking that ptr points to the heap */ JERRY_ASSERT (jmem_is_heap_pointer (ptr)); JERRY_ASSERT ((uintptr_t) ptr % JMEM_ALIGNMENT == 0); @@ -473,10 +472,10 @@ jmem_heap_free_block_internal (void *ptr, /**< pointer to beginning of data spac JERRY_CONTEXT (jmem_heap_allocated_size) -= aligned_size; JMEM_VALGRIND_FREELIKE_SPACE (ptr); -#else /* ENABLED (JERRY_SYSTEM_ALLOCATOR) */ +#else /* JERRY_SYSTEM_ALLOCATOR */ JERRY_CONTEXT (jmem_heap_allocated_size) -= size; free (ptr); -#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */ +#endif /* !JERRY_SYSTEM_ALLOCATOR */ while (JERRY_CONTEXT (jmem_heap_allocated_size) + CONFIG_GC_LIMIT <= JERRY_CONTEXT (jmem_heap_limit)) { JERRY_CONTEXT (jmem_heap_limit) -= CONFIG_GC_LIMIT; @@ -495,7 +494,7 @@ jmem_heap_realloc_block (void *ptr, /**< memory region to reallocate */ const size_t old_size, /**< current size of the region */ const size_t new_size) /**< desired new size */ { -#if !ENABLED (JERRY_SYSTEM_ALLOCATOR) +#if !JERRY_SYSTEM_ALLOCATOR JERRY_ASSERT (jmem_is_heap_pointer (ptr)); JERRY_ASSERT ((uintptr_t) ptr % JMEM_ALIGNMENT == 0); JERRY_ASSERT (old_size != 0); @@ -534,14 +533,14 @@ jmem_heap_realloc_block (void *ptr, /**< memory region to reallocate */ void *ret_block_p = NULL; const size_t required_size = aligned_new_size - aligned_old_size; -#if !ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) +#if !JERRY_MEM_GC_BEFORE_EACH_ALLOC if (JERRY_CONTEXT (jmem_heap_allocated_size) + required_size >= JERRY_CONTEXT (jmem_heap_limit)) { ecma_free_unused_memory (JMEM_PRESSURE_LOW); } -#else /* !ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */ +#else /* !JERRY_MEM_GC_BEFORE_EACH_ALLOC */ ecma_gc_run (); -#endif /* ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */ +#endif /* JERRY_MEM_GC_BEFORE_EACH_ALLOC */ jmem_heap_free_t *prev_p = jmem_heap_find_prev (block_p); JMEM_VALGRIND_DEFINED_SPACE (prev_p, sizeof (jmem_heap_free_t)); @@ -652,17 +651,17 @@ jmem_heap_realloc_block (void *ptr, /**< memory region to reallocate */ JMEM_HEAP_STAT_FREE (old_size); JMEM_HEAP_STAT_ALLOC (new_size); return ret_block_p; -#else /* ENABLED (JERRY_SYSTEM_ALLOCATOR) */ +#else /* JERRY_SYSTEM_ALLOCATOR */ const size_t required_size = new_size - old_size; -#if !ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) +#if !JERRY_MEM_GC_BEFORE_EACH_ALLOC if (JERRY_CONTEXT (jmem_heap_allocated_size) + required_size >= JERRY_CONTEXT (jmem_heap_limit)) { ecma_free_unused_memory (JMEM_PRESSURE_LOW); } -#else /* !ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */ +#else /* !JERRY_MEM_GC_BEFORE_EACH_ALLOC */ ecma_gc_run (); -#endif /* ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */ +#endif /* JERRY_MEM_GC_BEFORE_EACH_ALLOC */ JERRY_CONTEXT (jmem_heap_allocated_size) += required_size; @@ -679,7 +678,7 @@ jmem_heap_realloc_block (void *ptr, /**< memory region to reallocate */ JMEM_HEAP_STAT_FREE (old_size); JMEM_HEAP_STAT_ALLOC (new_size); return realloc (ptr, new_size); -#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */ +#endif /* !JERRY_SYSTEM_ALLOCATOR */ } /* jmem_heap_realloc_block */ /** @@ -707,17 +706,17 @@ jmem_heap_free_block (void *ptr, /**< pointer to beginning of data space of the bool jmem_is_heap_pointer (const void *pointer) /**< pointer */ { -#if !ENABLED (JERRY_SYSTEM_ALLOCATOR) +#if !JERRY_SYSTEM_ALLOCATOR return ((uint8_t *) pointer >= JERRY_HEAP_CONTEXT (area) && (uint8_t *) pointer <= (JERRY_HEAP_CONTEXT (area) + JMEM_HEAP_AREA_SIZE)); -#else /* ENABLED (JERRY_SYSTEM_ALLOCATOR) */ +#else /* JERRY_SYSTEM_ALLOCATOR */ JERRY_UNUSED (pointer); return true; -#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */ +#endif /* !JERRY_SYSTEM_ALLOCATOR */ } /* jmem_is_heap_pointer */ #endif /* !JERRY_NDEBUG */ -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS /** * Get heap memory usage statistics */ @@ -738,10 +737,10 @@ jmem_heap_stats_print (void) jmem_heap_stats_t *heap_stats = &JERRY_CONTEXT (jmem_heap_stats); JERRY_DEBUG_MSG ("Heap stats:\n"); -#if !ENABLED (JERRY_SYSTEM_ALLOCATOR) +#if !JERRY_SYSTEM_ALLOCATOR JERRY_DEBUG_MSG (" Heap size = %zu bytes\n", heap_stats->size); -#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */ +#endif /* !JERRY_SYSTEM_ALLOCATOR */ JERRY_DEBUG_MSG (" Allocated = %zu bytes\n" " Peak allocated = %zu bytes\n" " Waste = %zu bytes\n" @@ -774,9 +773,9 @@ jmem_heap_stats_print (void) void jmem_heap_stat_init (void) { -#if !ENABLED (JERRY_SYSTEM_ALLOCATOR) +#if !JERRY_SYSTEM_ALLOCATOR JERRY_CONTEXT (jmem_heap_stats).size = JMEM_HEAP_AREA_SIZE; -#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */ +#endif /* !JERRY_SYSTEM_ALLOCATOR */ } /* jmem_heap_stat_init */ /** @@ -819,7 +818,7 @@ jmem_heap_stat_free (size_t size) /**< Size of freed block */ heap_stats->waste_bytes -= waste_bytes; } /* jmem_heap_stat_free */ -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ /** * @} diff --git a/jerry-core/jmem/jmem-poolman.c b/jerry-core/jmem/jmem-poolman.c index 47281d405..f688f95e6 100644 --- a/jerry-core/jmem/jmem-poolman.c +++ b/jerry-core/jmem/jmem-poolman.c @@ -24,9 +24,9 @@ #define JMEM_ALLOCATOR_INTERNAL #include "jmem-allocator-internal.h" -#if ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) +#if JERRY_MEM_GC_BEFORE_EACH_ALLOC #include "ecma-gc.h" -#endif /* ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */ +#endif /* JERRY_MEM_GC_BEFORE_EACH_ALLOC */ /** \addtogroup mem Memory allocation * @{ @@ -44,9 +44,9 @@ jmem_pools_finalize (void) jmem_pools_collect_empty (); JERRY_ASSERT (JERRY_CONTEXT (jmem_free_8_byte_chunk_p) == NULL); -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT JERRY_ASSERT (JERRY_CONTEXT (jmem_free_16_byte_chunk_p) == NULL); -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ } /* jmem_pools_finalize */ /** @@ -58,16 +58,16 @@ jmem_pools_finalize (void) extern inline void * JERRY_ATTR_HOT JERRY_ATTR_ALWAYS_INLINE jmem_pools_alloc (size_t size) /**< size of the chunk */ { -#if ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) +#if JERRY_MEM_GC_BEFORE_EACH_ALLOC ecma_gc_run (); -#endif /* ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */ +#endif /* JERRY_MEM_GC_BEFORE_EACH_ALLOC */ -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT if (size <= 8) { -#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* !JERRY_CPOINTER_32_BIT */ JERRY_ASSERT (size <= 8); -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ if (JERRY_CONTEXT (jmem_free_8_byte_chunk_p) != NULL) { @@ -87,7 +87,7 @@ jmem_pools_alloc (size_t size) /**< size of the chunk */ return chunk_p; } -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT } JERRY_ASSERT (size <= 16); @@ -109,7 +109,7 @@ jmem_pools_alloc (size_t size) /**< size of the chunk */ JMEM_HEAP_STAT_ALLOC (16); return chunk_p; } -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ } /* jmem_pools_alloc */ /** @@ -126,17 +126,17 @@ jmem_pools_free (void *chunk_p, /**< pointer to the chunk */ JMEM_VALGRIND_DEFINED_SPACE (chunk_to_free_p, size); -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT if (size <= 8) { -#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* !JERRY_CPOINTER_32_BIT */ JERRY_ASSERT (size <= 8); -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ chunk_to_free_p->next_p = JERRY_CONTEXT (jmem_free_8_byte_chunk_p); JERRY_CONTEXT (jmem_free_8_byte_chunk_p) = chunk_to_free_p; -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT } else { @@ -145,7 +145,7 @@ jmem_pools_free (void *chunk_p, /**< pointer to the chunk */ chunk_to_free_p->next_p = JERRY_CONTEXT (jmem_free_16_byte_chunk_p); JERRY_CONTEXT (jmem_free_16_byte_chunk_p) = chunk_to_free_p; } -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ JMEM_VALGRIND_NOACCESS_SPACE (chunk_to_free_p, size); } /* jmem_pools_free */ @@ -169,7 +169,7 @@ jmem_pools_collect_empty (void) chunk_p = next_p; } -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT chunk_p = JERRY_CONTEXT (jmem_free_16_byte_chunk_p); JERRY_CONTEXT (jmem_free_16_byte_chunk_p) = NULL; @@ -182,7 +182,7 @@ jmem_pools_collect_empty (void) jmem_heap_free_block_internal (chunk_p, 16); chunk_p = next_p; } -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ } /* jmem_pools_collect_empty */ /** diff --git a/jerry-core/jmem/jmem.h b/jerry-core/jmem/jmem.h index 960a6bf24..ae2989269 100644 --- a/jerry-core/jmem/jmem.h +++ b/jerry-core/jmem/jmem.h @@ -55,11 +55,11 @@ /** * Shift for tag part in jmem_cpointer_tag_t */ -#if defined (JMEM_CAN_STORE_POINTER_VALUE_DIRECTLY) && ENABLED (JERRY_CPOINTER_32_BIT) +#if defined (JMEM_CAN_STORE_POINTER_VALUE_DIRECTLY) && JERRY_CPOINTER_32_BIT #define JMEM_TAG_SHIFT 0 -#else /* !JMEM_CAN_STORE_POINTER_VALUE_DIRECTLY || !ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* !JMEM_CAN_STORE_POINTER_VALUE_DIRECTLY || !JERRY_CPOINTER_32_BIT */ #define JMEM_TAG_SHIFT 3 -#endif /* JMEM_CAN_STORE_POINTER_VALUE_DIRECTLY && ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JMEM_CAN_STORE_POINTER_VALUE_DIRECTLY && JERRY_CPOINTER_32_BIT */ /** * Bit mask for tag part in jmem_cpointer_tag_t @@ -94,11 +94,11 @@ enum /** * Compressed pointer */ -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT typedef uint32_t jmem_cpointer_t; -#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* !JERRY_CPOINTER_32_BIT */ typedef uint16_t jmem_cpointer_t; -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ /** * Compressed pointer with tag value @@ -147,7 +147,7 @@ void *jmem_heap_alloc_block_null_on_error (const size_t size); void *jmem_heap_realloc_block (void *ptr, const size_t old_size, const size_t new_size); void jmem_heap_free_block (void *ptr, const size_t size); -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS /** * Heap memory usage statistics */ @@ -186,7 +186,7 @@ void jmem_stats_free_property_bytes (size_t property_size); void jmem_heap_get_stats (jmem_heap_stats_t *); void jmem_heap_stats_reset_peak (void); void jmem_heap_stats_print (void); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ jmem_cpointer_t JERRY_ATTR_PURE jmem_compress_pointer (const void *pointer_p); void * JERRY_ATTR_PURE jmem_decompress_pointer (uintptr_t compressed_pointer); diff --git a/jerry-core/jrt/jrt.h b/jerry-core/jrt/jrt.h index e0658a9f9..a87a01c35 100644 --- a/jerry-core/jrt/jrt.h +++ b/jerry-core/jrt/jrt.h @@ -33,14 +33,17 @@ */ #define JERRY_UNUSED(x) ((void) (x)) -#define JERRY_UNUSED_1(_1) JERRY_UNUSED (_1) -#define JERRY_UNUSED_2(_1, _2) JERRY_UNUSED (_1), JERRY_UNUSED_1 (_2) -#define JERRY_UNUSED_3(_1, _2, _3) JERRY_UNUSED (_1), JERRY_UNUSED_2 (_2, _3) -#define JERRY_UNUSED_4(_1, _2, _3, _4) JERRY_UNUSED (_1), JERRY_UNUSED_3 (_2, _3, _4) -#define JERRY_UNUSED_5(_1, _2, _3, _4, _5) JERRY_UNUSED (_1), JERRY_UNUSED_4 (_2, _3, _4, _5) +#define JERRY_UNUSED_1(_1) JERRY_UNUSED (_1) +#define JERRY_UNUSED_2(_1, _2) JERRY_UNUSED (_1), JERRY_UNUSED_1 (_2) +#define JERRY_UNUSED_3(_1, _2, _3) JERRY_UNUSED (_1), JERRY_UNUSED_2 (_2, _3) +#define JERRY_UNUSED_4(_1, _2, _3, _4) JERRY_UNUSED (_1), JERRY_UNUSED_3 (_2, _3, _4) +#define JERRY_UNUSED_5(_1, _2, _3, _4, _5) JERRY_UNUSED (_1), JERRY_UNUSED_4 (_2, _3, _4, _5) +#define JERRY_UNUSED_6(_1, _2, _3, _4, _5, _6) JERRY_UNUSED (_1), JERRY_UNUSED_5 (_2, _3, _4, _5, _6) +#define JERRY_UNUSED_7(_1, _2, _3, _4, _5, _6, _7) JERRY_UNUSED (_1), JERRY_UNUSED_6 (_2, _3, _4, _5, _6, _7) +#define JERRY_UNUSED_8(_1, _2, _3, _4, _5, _6, _7, _8) JERRY_UNUSED (_1), JERRY_UNUSED_7 (_2, _3, _4, _5, _6, _7, _8) -#define JERRY_VA_ARGS_NUM_IMPL(_1, _2, _3, _4, _5, N, ...) N -#define JERRY_VA_ARGS_NUM(...) JERRY_VA_ARGS_NUM_IMPL (__VA_ARGS__, 5, 4, 3, 2, 1, 0) +#define JERRY_VA_ARGS_NUM_IMPL(_1, _2, _3, _4, _5, _6, _7, _8, N, ...) N +#define JERRY_VA_ARGS_NUM(...) JERRY_VA_ARGS_NUM_IMPL (__VA_ARGS__, 8, 7, 6, 5, 4, 3, 2, 1, 0) #define JERRY_UNUSED_ALL_IMPL_(nargs) JERRY_UNUSED_ ## nargs #define JERRY_UNUSED_ALL_IMPL(nargs) JERRY_UNUSED_ALL_IMPL_ (nargs) @@ -111,17 +114,17 @@ void JERRY_ATTR_NORETURN jerry_fatal (jerry_fatal_code_t code); /* * Logging */ -#if ENABLED (JERRY_LOGGING) +#if JERRY_LOGGING #define JERRY_ERROR_MSG(...) jerry_port_log (JERRY_LOG_LEVEL_ERROR, __VA_ARGS__) #define JERRY_WARNING_MSG(...) jerry_port_log (JERRY_LOG_LEVEL_WARNING, __VA_ARGS__) #define JERRY_DEBUG_MSG(...) jerry_port_log (JERRY_LOG_LEVEL_DEBUG, __VA_ARGS__) #define JERRY_TRACE_MSG(...) jerry_port_log (JERRY_LOG_LEVEL_TRACE, __VA_ARGS__) -#else /* !ENABLED (JERRY_LOGGING) */ +#else /* !JERRY_LOGGING */ #define JERRY_ERROR_MSG(...) do { if (false) { JERRY_UNUSED_ALL (__VA_ARGS__); } } while (0) #define JERRY_WARNING_MSG(...) do { if (false) { JERRY_UNUSED_ALL (__VA_ARGS__); } } while (0) #define JERRY_DEBUG_MSG(...) do { if (false) { JERRY_UNUSED_ALL (__VA_ARGS__); } } while (0) #define JERRY_TRACE_MSG(...) do { if (false) { JERRY_UNUSED_ALL (__VA_ARGS__); } } while (0) -#endif /* ENABLED (JERRY_LOGGING) */ +#endif /* JERRY_LOGGING */ /** * Size of struct member diff --git a/jerry-core/lit/lit-char-helpers.c b/jerry-core/lit/lit-char-helpers.c index 3805d7699..8570729db 100644 --- a/jerry-core/lit/lit-char-helpers.c +++ b/jerry-core/lit/lit-char-helpers.c @@ -18,17 +18,17 @@ #include "lit-char-helpers.h" #include "lit-strings.h" #include "lit-unicode-ranges.inc.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #include "lit-unicode-ranges-sup.inc.h" -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_UNICODE_CASE_CONVERSION) +#if JERRY_UNICODE_CASE_CONVERSION #include "lit-unicode-conversions.inc.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #include "lit-unicode-conversions-sup.inc.h" #include "lit-unicode-folding.inc.h" -#endif /* ENABLED (JERRY_ESNEXT) */ -#endif /* ENABLED (JERRY_UNICODE_CASE_CONVERSION) */ +#endif /* JERRY_ESNEXT */ +#endif /* JERRY_UNICODE_CASE_CONVERSION */ #define NUM_OF_ELEMENTS(array) (sizeof (array) / sizeof ((array)[0])) @@ -73,9 +73,9 @@ function_name (char_type c, /**< code unit */ \ LIT_SEARCH_CHAR_IN_ARRAY_FN (lit_search_char_in_array, ecma_char_t, uint16_t) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_SEARCH_CHAR_IN_ARRAY_FN (lit_search_codepoint_in_array, lit_code_point_t, uint32_t) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Binary search algorithm that searches a character in the given intervals. @@ -120,9 +120,9 @@ function_name (char_type c, /**< code unit */ \ LIT_SEARCH_CHAR_IN_INTERVAL_ARRAY_FN (lit_search_char_in_interval_array, ecma_char_t, uint16_t, uint8_t) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_SEARCH_CHAR_IN_INTERVAL_ARRAY_FN (lit_search_codepoint_in_interval_array, lit_code_point_t, uint32_t, uint16_t) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Check if specified character is one of the Whitespace characters including those that fall into @@ -140,10 +140,10 @@ lit_char_is_white_space (lit_code_point_t c) /**< code point */ } if (c == LIT_CHAR_BOM -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT /* Mongolian Vowel Separator (u180e) used to be a whitespace character. */ || c == LIT_CHAR_MVS -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ || c == LIT_CHAR_LS || c == LIT_CHAR_PS) { @@ -185,7 +185,7 @@ lit_char_is_line_terminator (ecma_char_t c) /**< code unit */ static bool lit_char_is_unicode_id_start (lit_code_point_t code_point) /**< code unit */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (code_point >= LIT_UTF8_4_BYTE_CODE_POINT_MIN)) { return (lit_search_codepoint_in_interval_array (code_point, @@ -196,9 +196,9 @@ lit_char_is_unicode_id_start (lit_code_point_t code_point) /**< code unit */ lit_unicode_id_start_chars_sup, NUM_OF_ELEMENTS (lit_unicode_id_start_chars_sup))); } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_ASSERT (code_point < LIT_UTF8_4_BYTE_CODE_POINT_MIN); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_char_t c = (ecma_char_t) code_point; @@ -227,7 +227,7 @@ lit_char_is_unicode_id_continue (lit_code_point_t code_point) /**< code unit */ return true; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (code_point >= LIT_UTF8_4_BYTE_CODE_POINT_MIN)) { return (lit_search_codepoint_in_interval_array (code_point, @@ -238,9 +238,9 @@ lit_char_is_unicode_id_continue (lit_code_point_t code_point) /**< code unit */ lit_unicode_id_continue_chars_sup, NUM_OF_ELEMENTS (lit_unicode_id_continue_chars_sup))); } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_ASSERT (code_point < LIT_UTF8_4_BYTE_CODE_POINT_MIN); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_char_t c = (ecma_char_t) code_point; @@ -329,7 +329,7 @@ lit_char_is_hex_digit (ecma_char_t c) /**< code unit */ && LEXER_TO_ASCII_LOWERCASE (c) <= LIT_CHAR_ASCII_LOWERCASE_LETTERS_HEX_END)); } /* lit_char_is_hex_digit */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Check if specified character is one of BinaryDigits characters (ECMA-262 v6, 11.8.3) * @@ -340,7 +340,7 @@ lit_char_is_binary_digit (ecma_char_t c) /** code unit */ { return (c == LIT_CHAR_0 || c == LIT_CHAR_1); } /* lit_char_is_binary_digit */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * UnicodeEscape abstract method @@ -565,7 +565,7 @@ lit_char_is_word_char (lit_code_point_t c) /**< code point */ || c == LIT_CHAR_UNDERSCORE); } /* lit_char_is_word_char */ -#if ENABLED (JERRY_UNICODE_CASE_CONVERSION) +#if JERRY_UNICODE_CASE_CONVERSION /** * Check if the specified character is in one of those tables which contain bidirectional conversions. @@ -579,14 +579,14 @@ lit_search_in_bidirectional_conversion_tables (lit_code_point_t cp, /**< code { /* 1, Check if the specified character is part of the lit_unicode_character_case_ranges_{sup} table. */ int number_of_case_ranges; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT bool is_supplementary = cp > LIT_UTF16_CODE_UNIT_MAX; if (is_supplementary) { number_of_case_ranges = NUM_OF_ELEMENTS (lit_unicode_character_case_ranges_sup); } else -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { number_of_case_ranges = NUM_OF_ELEMENTS (lit_unicode_character_case_ranges); } @@ -602,14 +602,14 @@ lit_search_in_bidirectional_conversion_tables (lit_code_point_t cp, /**< code size_t range_length; lit_code_point_t start_point; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (is_supplementary) { range_length = lit_unicode_character_case_range_lengths_sup[conv_counter]; start_point = lit_unicode_character_case_ranges_sup[i]; } else -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { range_length = lit_unicode_character_case_range_lengths[conv_counter]; start_point = lit_unicode_character_case_ranges[i]; @@ -641,13 +641,13 @@ lit_search_in_bidirectional_conversion_tables (lit_code_point_t cp, /**< code offset = i - 1; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (is_supplementary) { start_point = lit_unicode_character_case_ranges_sup[offset]; } else -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { start_point = lit_unicode_character_case_ranges[offset]; } @@ -657,12 +657,12 @@ lit_search_in_bidirectional_conversion_tables (lit_code_point_t cp, /**< code /* Note: After this point based on the latest unicode standard(13.0.0.6) no conversion characters are defined for supplementary planes */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (is_supplementary) { return cp; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* 2, Check if the specified character is part of the character_pair_ranges table. */ int bottom = 0; @@ -784,7 +784,7 @@ lit_search_in_conversion_table (ecma_char_t character, /**< code unit return (lit_code_point_t) character; } /* lit_search_in_conversion_table */ -#endif /* ENABLED (JERRY_UNICODE_CASE_CONVERSION) */ +#endif /* JERRY_UNICODE_CASE_CONVERSION */ /** * Append the converted lowercase codeunit sequence of an a given codepoint into the stringbuilder if it is present. @@ -811,7 +811,7 @@ lit_char_to_lower_case (lit_code_point_t cp, /**< code point */ return cp; } -#if ENABLED (JERRY_UNICODE_CASE_CONVERSION) +#if JERRY_UNICODE_CASE_CONVERSION lit_code_point_t lowercase_cp = lit_search_in_bidirectional_conversion_tables (cp, true); if (lowercase_cp != LIT_INVALID_CP) @@ -850,14 +850,14 @@ lit_char_to_lower_case (lit_code_point_t cp, /**< code point */ builder_p, lit_unicode_lower_case_conversions, lit_unicode_lower_case_conversion_counters); -#else /* !ENABLED (JERRY_UNICODE_CASE_CONVERSION) */ +#else /* !JERRY_UNICODE_CASE_CONVERSION */ if (builder_p != NULL) { ecma_stringbuilder_append_codepoint (builder_p, cp); } return cp; -#endif /* ENABLED (JERRY_UNICODE_CASE_CONVERSION) */ +#endif /* JERRY_UNICODE_CASE_CONVERSION */ } /* lit_char_to_lower_case */ /** @@ -885,7 +885,7 @@ lit_char_to_upper_case (lit_code_point_t cp, /**< code point */ return cp; } -#if ENABLED (JERRY_UNICODE_CASE_CONVERSION) +#if JERRY_UNICODE_CASE_CONVERSION lit_code_point_t uppercase_cp = lit_search_in_bidirectional_conversion_tables (cp, false); if (uppercase_cp != LIT_INVALID_CP) @@ -922,17 +922,17 @@ lit_char_to_upper_case (lit_code_point_t cp, /**< code point */ builder_p, lit_unicode_upper_case_conversions, lit_unicode_upper_case_conversion_counters); -#else /* !ENABLED (JERRY_UNICODE_CASE_CONVERSION) */ +#else /* !JERRY_UNICODE_CASE_CONVERSION */ if (builder_p != NULL) { ecma_stringbuilder_append_codepoint (builder_p, cp); } return cp; -#endif /* ENABLED (JERRY_UNICODE_CASE_CONVERSION) */ +#endif /* JERRY_UNICODE_CASE_CONVERSION */ } /* lit_char_to_upper_case */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* * Look up whether the character should be folded to the lowercase variant. * @@ -942,7 +942,7 @@ lit_char_to_upper_case (lit_code_point_t cp, /**< code point */ bool lit_char_fold_to_lower (lit_code_point_t cp) /**< code point */ { -#if ENABLED (JERRY_UNICODE_CASE_CONVERSION) +#if JERRY_UNICODE_CASE_CONVERSION return (cp <= LIT_UTF8_1_BYTE_CODE_POINT_MAX || cp > LIT_UTF16_CODE_UNIT_MAX || (!lit_search_char_in_interval_array ((ecma_char_t) cp, @@ -952,9 +952,9 @@ lit_char_fold_to_lower (lit_code_point_t cp) /**< code point */ && !lit_search_char_in_array ((ecma_char_t) cp, lit_unicode_folding_skip_to_lower_chars, NUM_OF_ELEMENTS (lit_unicode_folding_skip_to_lower_chars)))); -#else /* !ENABLED (JERRY_UNICODE_CASE_CONVERSION) */ +#else /* !JERRY_UNICODE_CASE_CONVERSION */ return true; -#endif /* ENABLED (JERRY_UNICODE_CASE_CONVERSION) */ +#endif /* JERRY_UNICODE_CASE_CONVERSION */ } /* lit_char_fold_to_lower */ /* @@ -966,7 +966,7 @@ lit_char_fold_to_lower (lit_code_point_t cp) /**< code point */ bool lit_char_fold_to_upper (lit_code_point_t cp) /**< code point */ { -#if ENABLED (JERRY_UNICODE_CASE_CONVERSION) +#if JERRY_UNICODE_CASE_CONVERSION return (cp > LIT_UTF8_1_BYTE_CODE_POINT_MAX && cp <= LIT_UTF16_CODE_UNIT_MAX && (lit_search_char_in_interval_array ((ecma_char_t) cp, @@ -976,11 +976,11 @@ lit_char_fold_to_upper (lit_code_point_t cp) /**< code point */ || lit_search_char_in_array ((ecma_char_t) cp, lit_unicode_folding_to_upper_chars, NUM_OF_ELEMENTS (lit_unicode_folding_to_upper_chars)))); -#else /* !ENABLED (JERRY_UNICODE_CASE_CONVERSION) */ +#else /* !JERRY_UNICODE_CASE_CONVERSION */ return false; -#endif /* ENABLED (JERRY_UNICODE_CASE_CONVERSION) */ +#endif /* JERRY_UNICODE_CASE_CONVERSION */ } /* lit_char_fold_to_upper */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Helper method to find a specific character in a string diff --git a/jerry-core/lit/lit-char-helpers.h b/jerry-core/lit/lit-char-helpers.h index 17c5f6e1e..7e970aa6d 100644 --- a/jerry-core/lit/lit-char-helpers.h +++ b/jerry-core/lit/lit-char-helpers.h @@ -221,9 +221,9 @@ bool lit_code_point_is_identifier_part (lit_code_point_t code_point); bool lit_char_is_octal_digit (ecma_char_t c); bool lit_char_is_decimal_digit (ecma_char_t c); bool lit_char_is_hex_digit (ecma_char_t c); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT bool lit_char_is_binary_digit (ecma_char_t c); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ void lit_char_unicode_escape (ecma_stringbuilder_t *builder_p, ecma_char_t c); uint32_t lit_char_hex_to_int (ecma_char_t c); size_t lit_code_point_to_cesu8_bytes (uint8_t *dst_p, lit_code_point_t code_point); @@ -250,9 +250,9 @@ bool lit_char_is_word_char (lit_code_point_t c); lit_code_point_t lit_char_to_lower_case (lit_code_point_t cp, ecma_stringbuilder_t *builder_p); lit_code_point_t lit_char_to_upper_case (lit_code_point_t cp, ecma_stringbuilder_t *builder_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT bool lit_char_fold_to_lower (lit_code_point_t cp); bool lit_char_fold_to_upper (lit_code_point_t cp); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #endif /* !LIT_CHAR_HELPERS_H */ diff --git a/jerry-core/lit/lit-magic-strings.inc.h b/jerry-core/lit/lit-magic-strings.inc.h index 66f2157eb..b3ca28ec6 100644 --- a/jerry-core/lit/lit-magic-strings.inc.h +++ b/jerry-core/lit/lit-magic-strings.inc.h @@ -17,1135 +17,1135 @@ * from lit-magic-strings.ini. Do not edit! */ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING__EMPTY, "") -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SPACE_CHAR, " ") #endif -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ASTERIX_CHAR, "*") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_ARRAY \ +|| JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_COMMA_CHAR, ",") #endif -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_E_U, "E") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LEFT_SQUARE_CHAR, "[") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RIGHT_SQUARE_CHAR, "]") #endif -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PI_U, "PI") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS, "is") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) && ENABLED (JERRY_ESNEXT) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_ARRAY && JERRY_ESNEXT \ +|| JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_OF, "of") #endif -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LN2_U, "LN2") #endif -#if ENABLED (JERRY_BUILTIN_CONTAINER) \ -|| ENABLED (JERRY_BUILTIN_MAP) \ -|| ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_CONTAINER \ +|| JERRY_BUILTIN_MAP \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MAP_UL, "Map") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NAN, "NaN") -#if ENABLED (JERRY_BUILTIN_CONTAINER) \ -|| ENABLED (JERRY_BUILTIN_SET) \ -|| ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_CONTAINER \ +|| JERRY_BUILTIN_SET \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_UL, "Set") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UTC_U, "UTC") #endif -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ABS, "abs") #endif -#if ENABLED (JERRY_BUILTIN_CONTAINER) && ENABLED (JERRY_ESNEXT) \ -|| ENABLED (JERRY_BUILTIN_SET) \ -|| ENABLED (JERRY_BUILTIN_WEAKSET) +#if JERRY_BUILTIN_CONTAINER && JERRY_ESNEXT \ +|| JERRY_BUILTIN_SET \ +|| JERRY_BUILTIN_WEAKSET LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ADD, "add") #endif -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ALL, "all") #endif -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_COS, "cos") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EXP, "exp") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FOR, "for") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET, "get") -#if ENABLED (JERRY_BUILTIN_MAP) \ -|| ENABLED (JERRY_BUILTIN_PROXY) \ -|| ENABLED (JERRY_BUILTIN_REFLECT) \ -|| ENABLED (JERRY_BUILTIN_SET) \ -|| ENABLED (JERRY_BUILTIN_WEAKMAP) \ -|| ENABLED (JERRY_BUILTIN_WEAKSET) +#if JERRY_BUILTIN_MAP \ +|| JERRY_BUILTIN_PROXY \ +|| JERRY_BUILTIN_REFLECT \ +|| JERRY_BUILTIN_SET \ +|| JERRY_BUILTIN_WEAKMAP \ +|| JERRY_BUILTIN_WEAKSET LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_HAS, "has") #endif -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LOG, "log") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_ARRAY \ +|| JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MAP, "map") #endif -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MAX, "max") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MIN, "min") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NOW, "now") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) +#if JERRY_BUILTIN_ARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_POP, "pop") #endif -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_POW, "pow") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RAW, "raw") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET, "set") -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SIN, "sin") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TAN, "tan") #endif -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EMPTY_NON_CAPTURE_GROUP, "(?:)") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DATE_UL, "Date") -#if ENABLED (JERRY_BUILTIN_JSON) +#if JERRY_BUILTIN_JSON LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_JSON_U, "JSON") #endif -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LN10_U, "LN10") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MATH_UL, "Math") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NULL_UL, "Null") -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ACOS, "acos") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ASIN, "asin") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ATAN, "atan") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BIND, "bind") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CALL, "call") -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_MATH && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CBRT, "cbrt") #endif -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CEIL, "ceil") #endif -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_MATH && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_COSH, "cosh") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DONE, "done") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EVAL, "eval") -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EXEC, "exec") #endif -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) \ -|| ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_TYPEDARRAY \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FILL, "fill") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FIND, "find") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FLAT, "flat") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) && ENABLED (JERRY_ESNEXT) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_ARRAY && JERRY_ESNEXT \ +|| JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FROM, "from") #endif -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_MATH && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IMUL, "imul") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_JOIN, "join") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_KEYS, "keys") -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_MATH && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LOG2, "log2") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NAME, "name") -#if ENABLED (JERRY_BUILTIN_MAP) \ -|| ENABLED (JERRY_BUILTIN_SET) \ -|| ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_MAP \ +|| JERRY_BUILTIN_SET \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NEXT, "next") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NULL, "null") -#if ENABLED (JERRY_BUILTIN_ARRAY) +#if JERRY_BUILTIN_ARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PUSH, "push") #endif -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RACE, "race") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SEAL, "seal") -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_MATH && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SIGN, "sign") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SINH, "sinh") #endif -#if ENABLED (JERRY_BUILTIN_MAP) \ -|| ENABLED (JERRY_BUILTIN_SET) +#if JERRY_BUILTIN_MAP \ +|| JERRY_BUILTIN_SET LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SIZE, "size") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_ARRAY \ +|| JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SOME, "some") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SORT, "sort") #endif -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SQRT, "sqrt") #endif -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_MATH && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TANH, "tanh") #endif -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TEST, "test") #endif -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_THEN, "then") #endif -#if ENABLED (JERRY_BUILTIN_STRING) +#if JERRY_BUILTIN_STRING LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TRIM, "trim") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TRUE, "true") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ARRAY_UL, "Array") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ERROR_UL, "Error") -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LOG2E_U, "LOG2E") #endif -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PROXY_UL, "Proxy") #endif -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SQRT2_U, "SQRT2") #endif -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_MATH && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ACOSH, "acosh") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_APPLY, "apply") -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_MATH && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ASINH, "asinh") #endif -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ATAN2, "atan2") #endif -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_MATH && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ATANH, "atanh") #endif -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CATCH, "catch") #endif -#if ENABLED (JERRY_BUILTIN_MAP) \ -|| ENABLED (JERRY_BUILTIN_SET) +#if JERRY_BUILTIN_MAP \ +|| JERRY_BUILTIN_SET LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CLEAR, "clear") #endif -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_MATH && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CLZ32, "clz32") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_ARRAY \ +|| JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EVERY, "every") #endif -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_MATH && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EXPM1, "expm1") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FALSE, "false") -#if ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_REGEXP && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FLAGS, "flags") #endif -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FLOOR, "floor") #endif -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_MATH && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_HYPOT, "hypot") #endif -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_INDEX, "index") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_INPUT, "input") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_NAN, "isNaN") -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_MATH && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LOG10, "log10") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LOG1P, "log1p") #endif -#if ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_BUILTIN_STRING) \ -|| ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_REGEXP && JERRY_BUILTIN_STRING \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MATCH, "match") #endif -#if ENABLED (JERRY_BUILTIN_DATE) \ -|| ENABLED (JERRY_BUILTIN_JSON) +#if JERRY_BUILTIN_DATE \ +|| JERRY_BUILTIN_JSON LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PARSE, "parse") #endif -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PROXY, "proxy") #endif -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ROUND, "round") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) +#if JERRY_BUILTIN_ARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SHIFT, "shift") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_BUILTIN_STRING) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_ARRAY \ +|| JERRY_BUILTIN_STRING \ +|| JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SLICE, "slice") #endif -#if ENABLED (JERRY_BUILTIN_STRING) \ -|| ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_STRING \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SPLIT, "split") #endif -#if ENABLED (JERRY_LINE_INFO) +#if JERRY_LINE_INFO LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_STACK, "stack") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_THROW, "throw") #endif -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_MATH && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TRUNC, "trunc") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_VALUE, "value") -#if ENABLED (JERRY_PARSER) +#if JERRY_PARSER LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RESOURCE_EVAL, "") #endif -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BIGINT_UL, "BigInt") #endif -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LOG10E_U, "LOG10E") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NUMBER_UL, "Number") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_OBJECT_UL, "Object") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REGEXP_UL, "RegExp") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_STRING_UL, "String") -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SYMBOL_UL, "Symbol") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ASSIGN, "assign") #endif -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BIGINT, "bigint") #endif -#if ENABLED (JERRY_BUILTIN_DATAVIEW) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_DATAVIEW \ +|| JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BUFFER, "buffer") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CALLEE, "callee") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CALLER, "caller") -#if ENABLED (JERRY_BUILTIN_STRING) +#if JERRY_BUILTIN_STRING LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CHAR_AT_UL, "charAt") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_BUILTIN_STRING) +#if JERRY_BUILTIN_ARRAY \ +|| JERRY_BUILTIN_STRING LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CONCAT, "concat") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CREATE, "create") -#if ENABLED (JERRY_BUILTIN_MAP) \ -|| ENABLED (JERRY_BUILTIN_SET) \ -|| ENABLED (JERRY_BUILTIN_WEAKMAP) \ -|| ENABLED (JERRY_BUILTIN_WEAKSET) +#if JERRY_BUILTIN_MAP \ +|| JERRY_BUILTIN_SET \ +|| JERRY_BUILTIN_WEAKMAP \ +|| JERRY_BUILTIN_WEAKSET LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DELETE, "delete") #endif -#if ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_REGEXP && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DOTALL, "dotAll") #endif -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ESCAPE, "escape") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_ARRAY \ +|| JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FILTER, "filter") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FREEZE, "freeze") -#if ENABLED (JERRY_BUILTIN_MATH) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_MATH && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FROUND, "fround") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_DAY_UL, "getDay") #endif -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GLOBAL, "global") #endif -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_VIEW_UL, "isView") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_KEY_FOR, "keyFor") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LENGTH, "length") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NUMBER, "number") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_OBJECT, "object") -#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_STRING && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PAD_END, "padEnd") #endif -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RANDOM, "random") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_ARRAY \ +|| JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REDUCE, "reduce") #endif -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REJECT, "reject") #endif -#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_STRING && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REPEAT, "repeat") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RETURN, "return") #endif -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REVOKE, "revoke") #endif -#if ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_BUILTIN_STRING) \ -|| ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_REGEXP && JERRY_BUILTIN_STRING \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SEARCH, "search") #endif -#if !ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_REGEXP) \ -|| ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_ESNEXT) \ -|| ENABLED (JERRY_BUILTIN_REGEXP) && !(ENABLED (JERRY_ESNEXT)) +#if !JERRY_ESNEXT && JERRY_BUILTIN_REGEXP \ +|| JERRY_BUILTIN_REGEXP && JERRY_ESNEXT \ +|| JERRY_BUILTIN_REGEXP && !(JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SOURCE, "source") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) +#if JERRY_BUILTIN_ARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SPLICE, "splice") #endif -#if ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_REGEXP && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_STICKY, "sticky") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_STRING, "string") -#if ENABLED (JERRY_BUILTIN_ANNEXB) && ENABLED (JERRY_BUILTIN_STRING) +#if JERRY_BUILTIN_ANNEXB && JERRY_BUILTIN_STRING LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SUBSTR, "substr") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SYMBOL, "symbol") #endif -#if ENABLED (JERRY_BUILTIN_DATE) \ -|| ENABLED (JERRY_BUILTIN_JSON) +#if JERRY_BUILTIN_DATE \ +|| JERRY_BUILTIN_JSON LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_JSON_UL, "toJSON") #endif -#if ENABLED (JERRY_BUILTIN_MAP) \ -|| ENABLED (JERRY_BUILTIN_SET) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) \ -|| ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_MAP \ +|| JERRY_BUILTIN_SET \ +|| JERRY_BUILTIN_TYPEDARRAY \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_VALUES, "values") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BOOLEAN_UL, "Boolean") -#if ENABLED (JERRY_BUILTIN_NUMBER) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_NUMBER && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EPSILON_U, "EPSILON") #endif -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PROMISE_UL, "Promise") #endif -#if ENABLED (JERRY_BUILTIN_REFLECT) +#if JERRY_BUILTIN_REFLECT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REFLECT_UL, "Reflect") #endif -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SQRT1_2_U, "SQRT1_2") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SYMBOL_DOT_UL, "Symbol.") #endif -#if ENABLED (JERRY_BUILTIN_CONTAINER) \ -|| ENABLED (JERRY_BUILTIN_WEAKMAP) +#if JERRY_BUILTIN_CONTAINER \ +|| JERRY_BUILTIN_WEAKMAP LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_WEAKMAP_UL, "WeakMap") #endif -#if ENABLED (JERRY_BUILTIN_CONTAINER) \ -|| ENABLED (JERRY_BUILTIN_WEAKSET) +#if JERRY_BUILTIN_CONTAINER \ +|| JERRY_BUILTIN_WEAKSET LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_WEAKSET_UL, "WeakSet") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BOOLEAN, "boolean") -#if ENABLED (JERRY_BUILTIN_ANNEXB) && ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_ANNEXB && JERRY_BUILTIN_REGEXP LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_COMPILE, "compile") #endif -#if ENABLED (JERRY_ESNEXT) \ -|| ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_ESNEXT \ +|| JERRY_MODULE_SYSTEM LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DEFAULT, "default") #endif -#if ENABLED (JERRY_BUILTIN_MAP) \ -|| ENABLED (JERRY_BUILTIN_SET) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) \ -|| ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_MAP \ +|| JERRY_BUILTIN_SET \ +|| JERRY_BUILTIN_TYPEDARRAY \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ENTRIES, "entries") #endif -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FINALLY, "finally") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FLATMAP, "flatMap") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_BUILTIN_MAP) \ -|| ENABLED (JERRY_BUILTIN_SET) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_ARRAY \ +|| JERRY_BUILTIN_MAP \ +|| JERRY_BUILTIN_SET \ +|| JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FOR_EACH_UL, "forEach") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_DATE_UL, "getDate") #endif -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_INT8_UL, "getInt8") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_TIME_UL, "getTime") #endif -#if ENABLED (JERRY_BUILTIN_ANNEXB) && ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_ANNEXB && JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_YEAR_UL, "getYear") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_BUILTIN_STRING) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_ARRAY \ +|| JERRY_BUILTIN_STRING \ +|| JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_INDEX_OF_UL, "indexOf") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) +#if JERRY_BUILTIN_ARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_ARRAY_UL, "isArray") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MESSAGE, "message") -#if ENABLED (JERRY_BUILTIN_PROXY) \ -|| ENABLED (JERRY_BUILTIN_REFLECT) +#if JERRY_BUILTIN_PROXY \ +|| JERRY_BUILTIN_REFLECT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_OWN_KEYS_UL, "ownKeys") #endif -#if ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_BUILTIN_STRING) \ -|| ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_REGEXP && JERRY_BUILTIN_STRING \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REPLACE, "replace") #endif -#if ENABLED (JERRY_BUILTIN_PROMISE) +#if JERRY_BUILTIN_PROMISE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RESOLVE, "resolve") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_ARRAY \ +|| JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REVERSE, "reverse") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_DATE_UL, "setDate") #endif -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_INT8_UL, "setInt8") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_TIME_UL, "setTime") #endif -#if ENABLED (JERRY_BUILTIN_ANNEXB) && ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_ANNEXB && JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_YEAR_UL, "setYear") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SPECIES, "species") #endif -#if ENABLED (JERRY_BUILTIN_NUMBER) +#if JERRY_BUILTIN_NUMBER LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_FIXED_UL, "toFixed") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TRIM_END, "trimEnd") #endif -#if ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_REGEXP && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UNICODE, "unicode") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) +#if JERRY_BUILTIN_ARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UNSHIFT, "unshift") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_VALUE_OF_UL, "valueOf") -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DATAVIEW_UL, "DataView") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FUNCTION_UL, "Function") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_INFINITY_UL, "Infinity") -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RUNNABLE_UL, "Runnable") #endif -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_URI_ERROR_UL, "URIError") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_OBJECT_TO_STRING_UL, "[object ") -#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_STRING && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ENDS_WITH, "endsWith") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FUNCTION, "function") -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_HOURS_UL, "getHours") #endif -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_INT16_UL, "getInt16") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_INT32_UL, "getInt32") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_MONTH_UL, "getMonth") #endif -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UINT8_UL, "getUint8") #endif -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) \ -|| ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_TYPEDARRAY \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_INCLUDES, "includes") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_FINITE, "isFinite") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_FROZEN_UL, "isFrozen") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_SEALED_UL, "isSealed") -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ITERATOR, "iterator") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MATCH_ALL, "matchAll") #endif -#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_STRING && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PAD_START, "padStart") #endif -#if ENABLED (JERRY_ESNEXT) \ -|| !(ENABLED (JERRY_ESNEXT)) +#if JERRY_ESNEXT \ +|| !(JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PARSE_INT, "parseInt") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_HOURS_UL, "setHours") #endif -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_INT16_UL, "setInt16") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_INT32_UL, "setInt32") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_MONTH_UL, "setMonth") #endif -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_UINT8_UL, "setUint8") #endif -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SUBARRAY, "subarray") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_STRING_UL, "toString") -#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_STRING && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TRIM_LEFT, "trimLeft") #endif -#if ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_BUILTIN_ANNEXB LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UNESCAPE, "unescape") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_WRITABLE, "writable") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NEGATIVE_INFINITY_UL, "-Infinity") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ARGUMENTS_UL, "Arguments") -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EVAL_ERROR_UL, "EvalError") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GENERATOR_UL, "Generator") #endif -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_INT8_ARRAY_UL, "Int8Array") #endif -#if ENABLED (JERRY_BUILTIN_NUMBER) +#if JERRY_BUILTIN_NUMBER LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MAX_VALUE_U, "MAX_VALUE") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MIN_VALUE_U, "MIN_VALUE") #endif -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TYPE_ERROR_UL, "TypeError") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UNDEFINED_UL, "Undefined") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING__PROTO__, "__proto__") -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ANONYMOUS, "anonymous") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ARGUMENTS, "arguments") -#if ENABLED (JERRY_BUILTIN_PROXY) \ -|| ENABLED (JERRY_BUILTIN_REFLECT) +#if JERRY_BUILTIN_PROXY \ +|| JERRY_BUILTIN_REFLECT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CONSTRUCT, "construct") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DECODE_URI, "decodeURI") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ENCODE_URI, "encodeURI") -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) \ -|| ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_TYPEDARRAY \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FIND_INDEX, "findIndex") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UTC_DAY_UL, "getUTCDay") #endif -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UINT16_UL, "getUint16") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UINT32_UL, "getUint32") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_INTEGER, "isInteger") #endif -#if ENABLED (JERRY_BUILTIN_REGEXP) \ -|| ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_REGEXP \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LASTINDEX_UL, "lastIndex") #endif -#if !ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_REGEXP) \ -|| ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_ESNEXT) \ -|| ENABLED (JERRY_BUILTIN_REGEXP) && !(ENABLED (JERRY_ESNEXT)) +#if !JERRY_ESNEXT && JERRY_BUILTIN_REGEXP \ +|| JERRY_BUILTIN_REGEXP && JERRY_ESNEXT \ +|| JERRY_BUILTIN_REGEXP && !(JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MULTILINE, "multiline") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PROTOTYPE, "prototype") -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REVOCABLE, "revocable") #endif -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_UINT16_UL, "setUint16") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_UINT32_UL, "setUint32") #endif -#if ENABLED (JERRY_BUILTIN_JSON) +#if JERRY_BUILTIN_JSON LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_STRINGIFY, "stringify") #endif -#if ENABLED (JERRY_BUILTIN_STRING) +#if JERRY_BUILTIN_STRING LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SUBSTRING, "substring") #endif -#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_STRING && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TRIM_RIGHT, "trimRight") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TRIM_START, "trimStart") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UNDEFINED, "undefined") -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_INT16_ARRAY_UL, "Int16Array") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_INT32_ARRAY_UL, "Int32Array") #endif -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RANGE_ERROR_UL, "RangeError") #endif -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TYPED_ARRAY_UL, "TypedArray") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UINT8_ARRAY_UL, "Uint8Array") #endif -#if ENABLED (JERRY_BUILTIN_DATAVIEW) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_DATAVIEW \ +|| JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BYTE_LENGTH_UL, "byteLength") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BYTE_OFFSET_UL, "byteOffset") #endif -#if ENABLED (JERRY_BUILTIN_STRING) +#if JERRY_BUILTIN_STRING LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CHAR_CODE_AT_UL, "charCodeAt") #endif -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) \ -|| ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_TYPEDARRAY \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_COPY_WITHIN, "copyWithin") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ENUMERABLE, "enumerable") -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_FLOAT_32_UL, "getFloat32") #endif -#if ENABLED (JERRY_BUILTIN_DATAVIEW) && ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_BUILTIN_DATAVIEW && JERRY_NUMBER_TYPE_FLOAT64 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_FLOAT_64_UL, "getFloat64") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_MINUTES_UL, "getMinutes") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_SECONDS_UL, "getSeconds") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UTC_DATE_UL, "getUTCDate") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GLOBAL_THIS_UL, "globalThis") #endif -#if !ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_REGEXP) \ -|| ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_ESNEXT) \ -|| ENABLED (JERRY_BUILTIN_REGEXP) && !(ENABLED (JERRY_ESNEXT)) +#if !JERRY_ESNEXT && JERRY_BUILTIN_REGEXP \ +|| JERRY_BUILTIN_REGEXP && JERRY_ESNEXT \ +|| JERRY_BUILTIN_REGEXP && !(JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IGNORECASE_UL, "ignoreCase") #endif -#if ENABLED (JERRY_ESNEXT) \ -|| !(ENABLED (JERRY_ESNEXT)) +#if JERRY_ESNEXT \ +|| !(JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PARSE_FLOAT, "parseFloat") #endif -#if ENABLED (JERRY_BUILTIN_REGEXP) && ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_REGEXP && JERRY_BUILTIN_STRING && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REPLACE_ALL, "replaceAll") #endif -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_FLOAT_32_UL, "setFloat32") #endif -#if ENABLED (JERRY_BUILTIN_DATAVIEW) && ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_BUILTIN_DATAVIEW && JERRY_NUMBER_TYPE_FLOAT64 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_FLOAT_64_UL, "setFloat64") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_MINUTES_UL, "setMinutes") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_SECONDS_UL, "setSeconds") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_UTC_DATE_UL, "setUTCDate") #endif -#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_STRING && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_STARTS_WITH, "startsWith") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RESOURCE_ANON, "") -#if ENABLED (JERRY_BUILTIN_DATAVIEW) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_DATAVIEW \ +|| JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ARRAY_BUFFER_UL, "ArrayBuffer") #endif -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SYNTAX_ERROR_UL, "SyntaxError") #endif -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UINT16_ARRAY_UL, "Uint16Array") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UINT32_ARRAY_UL, "Uint32Array") #endif -#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_STRING && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CODE_POINT_AT, "codePointAt") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CONSTRUCTOR, "constructor") -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DESCRIPTION, "description") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_OBJECT_FROM_ENTRIES, "fromEntries") #endif -#if ENABLED (JERRY_BUILTIN_BIGINT) && ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_BIGINT && JERRY_BUILTIN_DATAVIEW LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_BIGINT64, "getBigInt64") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_FULL_YEAR_UL, "getFullYear") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UTC_HOURS_UL, "getUTCHours") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UTC_MONTH_UL, "getUTCMonth") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_HAS_INSTANCE, "hasInstance") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_BUILTIN_STRING) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_ARRAY \ +|| JERRY_BUILTIN_STRING \ +|| JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LAST_INDEX_OF_UL, "lastIndexOf") #endif -#if ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_ARRAY \ +|| JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REDUCE_RIGHT_UL, "reduceRight") #endif -#if ENABLED (JERRY_BUILTIN_BIGINT) && ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_BIGINT && JERRY_BUILTIN_DATAVIEW LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_BIGINT64, "setBigInt64") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_FULL_YEAR_UL, "setFullYear") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_UTC_HOURS_UL, "setUTCHours") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_UTC_MONTH_UL, "setUTCMonth") #endif -#if ENABLED (JERRY_BUILTIN_ANNEXB) && ENABLED (JERRY_BUILTIN_DATE) && ENABLED (JERRY_ESNEXT) \ -|| ENABLED (JERRY_BUILTIN_ANNEXB) && ENABLED (JERRY_BUILTIN_DATE) && !(ENABLED (JERRY_ESNEXT)) +#if JERRY_BUILTIN_ANNEXB && JERRY_BUILTIN_DATE && JERRY_ESNEXT \ +|| JERRY_BUILTIN_ANNEXB && JERRY_BUILTIN_DATE && !(JERRY_ESNEXT) LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_GMT_STRING_UL, "toGMTString") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_ISO_STRING_UL, "toISOString") #endif -#if ENABLED (JERRY_BUILTIN_STRING) +#if JERRY_BUILTIN_STRING LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_LOWER_CASE_UL, "toLowerCase") #endif -#if ENABLED (JERRY_BUILTIN_NUMBER) +#if JERRY_BUILTIN_NUMBER LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_PRECISION_UL, "toPrecision") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_PRIMITIVE, "toPrimitive") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_STRING_TAG, "toStringTag") #endif -#if ENABLED (JERRY_BUILTIN_DATE) && !(ENABLED (JERRY_ESNEXT)) \ -|| ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_DATE && !(JERRY_ESNEXT) \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_UTC_STRING_UL, "toUTCString") #endif -#if ENABLED (JERRY_BUILTIN_STRING) +#if JERRY_BUILTIN_STRING LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_UPPER_CASE_UL, "toUpperCase") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UNSCOPABLES, "unscopables") #endif -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FLOAT32_ARRAY_UL, "Float32Array") #endif -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) && ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#if JERRY_BUILTIN_TYPEDARRAY && JERRY_NUMBER_TYPE_FLOAT64 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FLOAT64_ARRAY_UL, "Float64Array") #endif -#if ENABLED (JERRY_BUILTIN_DATE) \ -|| ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_DATE \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_INVALID_DATE_UL, "Invalid Date") #endif -#if ENABLED (JERRY_BUILTIN_MAP) \ -|| ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_MAP \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MAP_ITERATOR_UL, "Map Iterator") #endif -#if ENABLED (JERRY_BUILTIN_SET) \ -|| ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_SET \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_ITERATOR_UL, "Set Iterator") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CONFIGURABLE, "configurable") -#if ENABLED (JERRY_BUILTIN_STRING) +#if JERRY_BUILTIN_STRING LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FROM_CHAR_CODE_UL, "fromCharCode") #endif -#if ENABLED (JERRY_BUILTIN_BIGINT) && ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_BIGINT && JERRY_BUILTIN_DATAVIEW LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_BIGUINT64, "getBigUint64") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_EXTENSIBLE, "isExtensible") -#if ENABLED (JERRY_BUILTIN_BIGINT) && ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_BIGINT && JERRY_BUILTIN_DATAVIEW LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_BIGUINT64, "setBigUint64") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_DATE_STRING_UL, "toDateString") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_TIME_STRING_UL, "toTimeString") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ASYNC_FUNCTION_UL, "AsyncFunction") #endif -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BIGINT64_ARRAY_UL, "BigInt64Array") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ASYNC_ITERATOR, "asyncIterator") #endif -#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_STRING && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FROM_CODE_POINT_UL, "fromCodePoint") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UTC_MINUTES_UL, "getUTCMinutes") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UTC_SECONDS_UL, "getUTCSeconds") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_PROTOTYPE_OF_UL, "isPrototypeOf") -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_SAFE_INTEGER, "isSafeInteger") #endif -#if ENABLED (JERRY_BUILTIN_STRING) +#if JERRY_BUILTIN_STRING LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LOCALE_COMPARE_UL, "localeCompare") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_UTC_MINUTES_UL, "setUTCMinutes") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_UTC_SECONDS_UL, "setUTCSeconds") #endif -#if ENABLED (JERRY_BUILTIN_NUMBER) +#if JERRY_BUILTIN_NUMBER LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_EXPONENTIAL_UL, "toExponential") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ARRAY_ITERATOR_UL, "Array Iterator") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ASYNC_GENERATOR_UL, "AsyncGenerator") #endif -#if ENABLED (JERRY_BUILTIN_BIGINT) && ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_BIGINT && JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BIGUINT64_ARRAY_UL, "BigUint64Array") #endif -#if ENABLED (JERRY_BUILTIN_ERRORS) +#if JERRY_BUILTIN_ERRORS LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REFERENCE_ERROR_UL, "ReferenceError") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DEFINE_PROPERTY_UL, "defineProperty") -#if ENABLED (JERRY_BUILTIN_PROXY) \ -|| ENABLED (JERRY_BUILTIN_REFLECT) +#if JERRY_BUILTIN_PROXY \ +|| JERRY_BUILTIN_REFLECT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DELETE_PROPERTY_UL, "deleteProperty") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_PROTOTYPE_OF_UL, "getPrototypeOf") -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UTC_FULL_YEAR_UL, "getUTCFullYear") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_HAS_OWN_PROPERTY_UL, "hasOwnProperty") -#if ENABLED (JERRY_BUILTIN_PROXY) \ -|| ENABLED (JERRY_BUILTIN_REFLECT) \ -|| ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_PROXY \ +|| JERRY_BUILTIN_REFLECT \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_PROTOTYPE_OF_UL, "setPrototypeOf") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_UTC_FULL_YEAR_UL, "setUTCFullYear") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_LOCALE_STRING_UL, "toLocaleString") -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_STRING_ITERATOR_UL, "String Iterator") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_MILLISECONDS_UL, "getMilliseconds") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_MILLISECONDS_UL, "setMilliseconds") #endif -#if ENABLED (JERRY_BUILTIN_NUMBER) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_NUMBER && JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MAX_SAFE_INTEGER_U, "MAX_SAFE_INTEGER") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MIN_SAFE_INTEGER_U, "MIN_SAFE_INTEGER") #endif -#if ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_ANNEXB) +#if JERRY_ESNEXT && JERRY_BUILTIN_ANNEXB LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DEFINE_GETTER, "__defineGetter__") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DEFINE_SETTER, "__defineSetter__") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LOOKUP_GETTER, "__lookupGetter__") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LOOKUP_SETTER, "__lookupSetter__") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DEFINE_PROPERTIES_UL, "defineProperties") -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BYTES_PER_ELEMENT_U, "BYTES_PER_ELEMENT") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GENERATOR_FUNCTION_UL, "GeneratorFunction") #endif -#if ENABLED (JERRY_BUILTIN_NUMBER) +#if JERRY_BUILTIN_NUMBER LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NEGATIVE_INFINITY_U, "NEGATIVE_INFINITY") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_POSITIVE_INFINITY_U, "POSITIVE_INFINITY") #endif -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UINT8_CLAMPED_ARRAY_UL, "Uint8ClampedArray") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_TIMEZONE_OFFSET_UL, "getTimezoneOffset") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PREVENT_EXTENSIONS_UL, "preventExtensions") -#if ENABLED (JERRY_BUILTIN_STRING) +#if JERRY_BUILTIN_STRING LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_LOCALE_LOWER_CASE_UL, "toLocaleLowerCase") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_LOCALE_UPPER_CASE_UL, "toLocaleUpperCase") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DECODE_URI_COMPONENT, "decodeURIComponent") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ENCODE_URI_COMPONENT, "encodeURIComponent") -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_UTC_MILLISECONDS_UL, "getUTCMilliseconds") #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_IS_CONCAT_SPREADABLE, "isConcatSpreadable") #endif -#if ENABLED (JERRY_BUILTIN_DATE) +#if JERRY_BUILTIN_DATE LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_UTC_MILLISECONDS_UL, "setUTCMilliseconds") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_LOCALE_DATE_STRING_UL, "toLocaleDateString") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_LOCALE_TIME_STRING_UL, "toLocaleTimeString") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_OWN_PROPERTY_NAMES_UL, "getOwnPropertyNames") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PROPERTY_IS_ENUMERABLE_UL, "propertyIsEnumerable") -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_OWN_PROPERTY_SYMBOLS_UL, "getOwnPropertySymbols") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ASYNC_GENERATOR_FUNCTION_UL, "AsyncGeneratorFunction") LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_REGEXP_STRING_ITERATOR_UL, "RegExp String Iterator") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_OWN_PROPERTY_DESCRIPTOR_UL, "getOwnPropertyDescriptor") -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET_OWN_PROPERTY_DESCRIPTORS_UL, "getOwnPropertyDescriptors") #endif LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING__FUNCTION_TO_STRING, "function(){/* ecmascript */}") LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (0, LIT_MAGIC_STRING__EMPTY) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (1, LIT_MAGIC_STRING_SPACE_CHAR) -#elif ENABLED (JERRY_MODULE_SYSTEM) +#elif JERRY_MODULE_SYSTEM LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (1, LIT_MAGIC_STRING_ASTERIX_CHAR) -#elif ENABLED (JERRY_BUILTIN_ARRAY) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#elif JERRY_BUILTIN_ARRAY \ +|| JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (1, LIT_MAGIC_STRING_COMMA_CHAR) -#elif ENABLED (JERRY_BUILTIN_MATH) +#elif JERRY_BUILTIN_MATH LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (1, LIT_MAGIC_STRING_E_U) -#elif ENABLED (JERRY_ESNEXT) +#elif JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (1, LIT_MAGIC_STRING_LEFT_SQUARE_CHAR) -#elif ENABLED (JERRY_BUILTIN_MATH) +#elif JERRY_BUILTIN_MATH LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (1, LIT_MAGIC_STRING_PI_U) -#elif ENABLED (JERRY_ESNEXT) +#elif JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (1, LIT_MAGIC_STRING_IS) -#elif ENABLED (JERRY_BUILTIN_ARRAY) && ENABLED (JERRY_ESNEXT) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#elif JERRY_BUILTIN_ARRAY && JERRY_ESNEXT \ +|| JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (1, LIT_MAGIC_STRING_OF) -#elif ENABLED (JERRY_BUILTIN_MATH) +#elif JERRY_BUILTIN_MATH LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (1, LIT_MAGIC_STRING_LN2_U) -#elif ENABLED (JERRY_BUILTIN_CONTAINER) \ -|| ENABLED (JERRY_BUILTIN_MAP) \ -|| ENABLED (JERRY_ESNEXT) +#elif JERRY_BUILTIN_CONTAINER \ +|| JERRY_BUILTIN_MAP \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (1, LIT_MAGIC_STRING_MAP_UL) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (1, LIT_MAGIC_STRING_NAN) #endif -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (2, LIT_MAGIC_STRING_PI_U) -#elif ENABLED (JERRY_ESNEXT) +#elif JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (2, LIT_MAGIC_STRING_IS) -#elif ENABLED (JERRY_BUILTIN_ARRAY) && ENABLED (JERRY_ESNEXT) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#elif JERRY_BUILTIN_ARRAY && JERRY_ESNEXT \ +|| JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (2, LIT_MAGIC_STRING_OF) -#elif ENABLED (JERRY_BUILTIN_MATH) +#elif JERRY_BUILTIN_MATH LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (2, LIT_MAGIC_STRING_LN2_U) -#elif ENABLED (JERRY_BUILTIN_CONTAINER) \ -|| ENABLED (JERRY_BUILTIN_MAP) \ -|| ENABLED (JERRY_ESNEXT) +#elif JERRY_BUILTIN_CONTAINER \ +|| JERRY_BUILTIN_MAP \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (2, LIT_MAGIC_STRING_MAP_UL) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (2, LIT_MAGIC_STRING_NAN) #endif -#if ENABLED (JERRY_BUILTIN_MATH) +#if JERRY_BUILTIN_MATH LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (3, LIT_MAGIC_STRING_LN2_U) -#elif ENABLED (JERRY_BUILTIN_CONTAINER) \ -|| ENABLED (JERRY_BUILTIN_MAP) \ -|| ENABLED (JERRY_ESNEXT) +#elif JERRY_BUILTIN_CONTAINER \ +|| JERRY_BUILTIN_MAP \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (3, LIT_MAGIC_STRING_MAP_UL) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (3, LIT_MAGIC_STRING_NAN) #endif -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (4, LIT_MAGIC_STRING_EMPTY_NON_CAPTURE_GROUP) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (4, LIT_MAGIC_STRING_DATE_UL) #endif LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (5, LIT_MAGIC_STRING_ARRAY_UL) -#if ENABLED (JERRY_PARSER) +#if JERRY_PARSER LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (6, LIT_MAGIC_STRING_RESOURCE_EVAL) -#elif ENABLED (JERRY_BUILTIN_BIGINT) +#elif JERRY_BUILTIN_BIGINT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (6, LIT_MAGIC_STRING_BIGINT_UL) -#elif ENABLED (JERRY_BUILTIN_MATH) +#elif JERRY_BUILTIN_MATH LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (6, LIT_MAGIC_STRING_LOG10E_U) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (6, LIT_MAGIC_STRING_NUMBER_UL) #endif LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (7, LIT_MAGIC_STRING_BOOLEAN_UL) -#if ENABLED (JERRY_BUILTIN_DATAVIEW) +#if JERRY_BUILTIN_DATAVIEW LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (8, LIT_MAGIC_STRING_DATAVIEW_UL) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (8, LIT_MAGIC_STRING_FUNCTION_UL) #endif LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (9, LIT_MAGIC_STRING_NEGATIVE_INFINITY_UL) -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (10, LIT_MAGIC_STRING_INT16_ARRAY_UL) -#elif ENABLED (JERRY_BUILTIN_ERRORS) +#elif JERRY_BUILTIN_ERRORS LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (10, LIT_MAGIC_STRING_RANGE_ERROR_UL) -#elif ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#elif JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (10, LIT_MAGIC_STRING_TYPED_ARRAY_UL) -#elif ENABLED (JERRY_BUILTIN_DATAVIEW) \ -|| ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#elif JERRY_BUILTIN_DATAVIEW \ +|| JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (10, LIT_MAGIC_STRING_BYTE_LENGTH_UL) -#elif ENABLED (JERRY_BUILTIN_STRING) +#elif JERRY_BUILTIN_STRING LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (10, LIT_MAGIC_STRING_CHAR_CODE_AT_UL) -#elif ENABLED (JERRY_BUILTIN_TYPEDARRAY) \ -|| ENABLED (JERRY_ESNEXT) +#elif JERRY_BUILTIN_TYPEDARRAY \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (10, LIT_MAGIC_STRING_COPY_WITHIN) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (10, LIT_MAGIC_STRING_ENUMERABLE) #endif LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (11, LIT_MAGIC_STRING_RESOURCE_ANON) -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_FLOAT32_ARRAY_UL) -#elif ENABLED (JERRY_BUILTIN_TYPEDARRAY) && ENABLED (JERRY_NUMBER_TYPE_FLOAT64) +#elif JERRY_BUILTIN_TYPEDARRAY && JERRY_NUMBER_TYPE_FLOAT64 LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_FLOAT64_ARRAY_UL) -#elif ENABLED (JERRY_BUILTIN_DATE) \ -|| ENABLED (JERRY_ESNEXT) +#elif JERRY_BUILTIN_DATE \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_INVALID_DATE_UL) -#elif ENABLED (JERRY_BUILTIN_MAP) \ -|| ENABLED (JERRY_ESNEXT) +#elif JERRY_BUILTIN_MAP \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_MAP_ITERATOR_UL) -#elif ENABLED (JERRY_BUILTIN_SET) \ -|| ENABLED (JERRY_ESNEXT) +#elif JERRY_BUILTIN_SET \ +|| JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_SET_ITERATOR_UL) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_CONFIGURABLE) #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (13, LIT_MAGIC_STRING_ASYNC_FUNCTION_UL) -#elif ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#elif JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (13, LIT_MAGIC_STRING_BIGINT64_ARRAY_UL) -#elif ENABLED (JERRY_ESNEXT) +#elif JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (13, LIT_MAGIC_STRING_ASYNC_ITERATOR) -#elif ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ESNEXT) +#elif JERRY_BUILTIN_STRING && JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (13, LIT_MAGIC_STRING_FROM_CODE_POINT_UL) -#elif ENABLED (JERRY_BUILTIN_DATE) +#elif JERRY_BUILTIN_DATE LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (13, LIT_MAGIC_STRING_GET_UTC_MINUTES_UL) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (13, LIT_MAGIC_STRING_IS_PROTOTYPE_OF_UL) #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (14, LIT_MAGIC_STRING_ARRAY_ITERATOR_UL) -#elif ENABLED (JERRY_BUILTIN_BIGINT) && ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#elif JERRY_BUILTIN_BIGINT && JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (14, LIT_MAGIC_STRING_BIGUINT64_ARRAY_UL) -#elif ENABLED (JERRY_BUILTIN_ERRORS) +#elif JERRY_BUILTIN_ERRORS LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (14, LIT_MAGIC_STRING_REFERENCE_ERROR_UL) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (14, LIT_MAGIC_STRING_DEFINE_PROPERTY_UL) #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (15, LIT_MAGIC_STRING_STRING_ITERATOR_UL) -#elif ENABLED (JERRY_BUILTIN_DATE) +#elif JERRY_BUILTIN_DATE LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (15, LIT_MAGIC_STRING_GET_MILLISECONDS_UL) -#elif ENABLED (JERRY_BUILTIN_NUMBER) && ENABLED (JERRY_ESNEXT) +#elif JERRY_BUILTIN_NUMBER && JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (15, LIT_MAGIC_STRING_MAX_SAFE_INTEGER_U) -#elif ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_ANNEXB) +#elif JERRY_ESNEXT && JERRY_BUILTIN_ANNEXB LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (15, LIT_MAGIC_STRING_DEFINE_GETTER) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (15, LIT_MAGIC_STRING_DEFINE_PROPERTIES_UL) #endif -#if ENABLED (JERRY_BUILTIN_NUMBER) && ENABLED (JERRY_ESNEXT) +#if JERRY_BUILTIN_NUMBER && JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (16, LIT_MAGIC_STRING_MAX_SAFE_INTEGER_U) -#elif ENABLED (JERRY_ESNEXT) && ENABLED (JERRY_BUILTIN_ANNEXB) +#elif JERRY_ESNEXT && JERRY_BUILTIN_ANNEXB LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (16, LIT_MAGIC_STRING_DEFINE_GETTER) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (16, LIT_MAGIC_STRING_DEFINE_PROPERTIES_UL) #endif -#if ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#if JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (17, LIT_MAGIC_STRING_BYTES_PER_ELEMENT_U) -#elif ENABLED (JERRY_ESNEXT) +#elif JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (17, LIT_MAGIC_STRING_GENERATOR_FUNCTION_UL) -#elif ENABLED (JERRY_BUILTIN_NUMBER) +#elif JERRY_BUILTIN_NUMBER LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (17, LIT_MAGIC_STRING_NEGATIVE_INFINITY_U) -#elif ENABLED (JERRY_BUILTIN_TYPEDARRAY) +#elif JERRY_BUILTIN_TYPEDARRAY LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (17, LIT_MAGIC_STRING_UINT8_CLAMPED_ARRAY_UL) -#elif ENABLED (JERRY_BUILTIN_DATE) +#elif JERRY_BUILTIN_DATE LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (17, LIT_MAGIC_STRING_GET_TIMEZONE_OFFSET_UL) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (17, LIT_MAGIC_STRING_PREVENT_EXTENSIONS_UL) @@ -1153,19 +1153,19 @@ LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (17, LIT_MAGIC_STRING_PREVENT_EXTENSIONS LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (18, LIT_MAGIC_STRING_DECODE_URI_COMPONENT) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (19, LIT_MAGIC_STRING_GET_OWN_PROPERTY_NAMES_UL) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (20, LIT_MAGIC_STRING_PROPERTY_IS_ENUMERABLE_UL) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (21, LIT_MAGIC_STRING_GET_OWN_PROPERTY_SYMBOLS_UL) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (21, LIT_MAGIC_STRING_GET_OWN_PROPERTY_DESCRIPTOR_UL) #endif -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (22, LIT_MAGIC_STRING_ASYNC_GENERATOR_FUNCTION_UL) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (22, LIT_MAGIC_STRING_GET_OWN_PROPERTY_DESCRIPTOR_UL) #endif LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (23, LIT_MAGIC_STRING_GET_OWN_PROPERTY_DESCRIPTOR_UL) LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (24, LIT_MAGIC_STRING_GET_OWN_PROPERTY_DESCRIPTOR_UL) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (25, LIT_MAGIC_STRING_GET_OWN_PROPERTY_DESCRIPTORS_UL) #else LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (25, LIT_MAGIC_STRING__FUNCTION_TO_STRING) diff --git a/jerry-core/parser/js/byte-code.c b/jerry-core/parser/js/byte-code.c index c3700d6a6..6ed30959c 100644 --- a/jerry-core/parser/js/byte-code.c +++ b/jerry-core/parser/js/byte-code.c @@ -30,7 +30,7 @@ JERRY_STATIC_ASSERT (CBC_END == 238, JERRY_STATIC_ASSERT (CBC_EXT_END == 147, number_of_cbc_ext_opcodes_changed); -#if ENABLED (JERRY_PARSER) || ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER || JERRY_PARSER_DUMP_BYTE_CODE /** \addtogroup parser Parser * @{ @@ -66,9 +66,9 @@ const uint8_t cbc_ext_flags[] = #undef CBC_OPCODE -#endif /* ENABLED (JERRY_PARSER) || ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER || JERRY_PARSER_DUMP_BYTE_CODE */ -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE #define CBC_OPCODE(arg1, arg2, arg3, arg4) #arg1, @@ -90,7 +90,7 @@ const char * const cbc_ext_names[] = #undef CBC_OPCODE -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ /** * @} diff --git a/jerry-core/parser/js/byte-code.h b/jerry-core/parser/js/byte-code.h index 3ca28c4ee..5277b959a 100644 --- a/jerry-core/parser/js/byte-code.h +++ b/jerry-core/parser/js/byte-code.h @@ -64,19 +64,19 @@ #define CBC_HAS_POP_STACK_BYTE_ARG (CBC_HAS_BYTE_ARG | CBC_POP_STACK_BYTE_ARG) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * CBC_NO_RESULT_OPERATION for ext opcodes */ #define CBC_EXT_NO_RESULT_OPERATION(opcode) \ ((opcode) >= PARSER_TO_EXT_OPCODE (CBC_EXT_SUPER_CALL) \ && (opcode) <= PARSER_TO_EXT_OPCODE (CBC_EXT_SPREAD_CALL_PROP_BLOCK)) -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ /** * CBC_NO_RESULT_OPERATION for ext opcodes */ #define CBC_EXT_NO_RESULT_OPERATION(opcode) false -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* Debug macro. */ #define CBC_ARGS_EQ(op, types) \ @@ -854,9 +854,9 @@ typedef struct uint8_t ident_end; /**< end position of the identifier group */ uint8_t const_literal_end; /**< end position of the const literal group */ uint8_t literal_end; /**< end position of the literal group */ -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_value_t realm_value; /**< realm value */ -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ } cbc_uint8_arguments_t; /** @@ -872,9 +872,9 @@ typedef struct uint16_t const_literal_end; /**< end position of the const literal group */ uint16_t literal_end; /**< end position of the literal group */ uint16_t padding; /**< an unused value */ -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_value_t realm_value; /**< realm value */ -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ } cbc_uint16_arguments_t; /** @@ -995,7 +995,7 @@ typedef enum extern const uint8_t cbc_flags[]; extern const uint8_t cbc_ext_flags[]; -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE /** * Opcode names for debugging. @@ -1003,7 +1003,7 @@ extern const uint8_t cbc_ext_flags[]; extern const char * const cbc_names[]; extern const char * const cbc_ext_names[]; -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ /** * @} diff --git a/jerry-core/parser/js/common.c b/jerry-core/parser/js/common.c index 1fedf65ed..8e1d47845 100644 --- a/jerry-core/parser/js/common.c +++ b/jerry-core/parser/js/common.c @@ -30,7 +30,7 @@ * @{ */ -#if ENABLED (JERRY_PARSER) +#if JERRY_PARSER /** * Free literal. @@ -53,9 +53,9 @@ util_free_literal (lexer_literal_t *literal_p) /**< literal */ } } /* util_free_literal */ -#endif /* ENABLED (JERRY_PARSER) */ +#endif /* JERRY_PARSER */ -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE /** * Debug utility to print a character sequence. @@ -83,7 +83,7 @@ util_print_number (ecma_number_t num_p) /**< number to print */ JERRY_DEBUG_MSG ("%s", str_buf); } /* util_print_number */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT /** * Debug utility to print a bigint. @@ -118,7 +118,7 @@ util_print_bigint (ecma_value_t bigint) /**< bigint to print */ jmem_heap_free_block (string_buffer_p, char_size_p); } /* util_print_bigint */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ /** * Print literal @@ -147,14 +147,14 @@ util_print_literal (lexer_literal_t *literal_p) /**< literal */ } case LEXER_NUMBER_LITERAL: { -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (ecma_is_value_bigint (literal_p->u.value)) { JERRY_DEBUG_MSG ("bigint("); util_print_bigint (literal_p->u.value); break; } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ JERRY_DEBUG_MSG ("number("); util_print_number (ecma_get_number_from_value (literal_p->u.value)); break; @@ -240,13 +240,13 @@ util_print_literal_value (ecma_compiled_code_t *compiled_code_p, /**< compiled c JERRY_DEBUG_MSG ("number("); util_print_number (ecma_get_number_from_value (value)); } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT else if (ecma_is_value_bigint (value)) { JERRY_DEBUG_MSG ("bigint("); util_print_bigint (value); } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ else { ecma_string_t *literal_p = ecma_get_string_from_value (value); @@ -347,7 +347,7 @@ util_print_cbc (ecma_compiled_code_t *compiled_code_p) /**< compiled code */ JERRY_DEBUG_MSG (",no_lexical_env"); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT switch (CBC_FUNCTION_GET_TYPE (compiled_code_p->status_flags)) { case CBC_FUNCTION_CONSTRUCTOR: @@ -386,7 +386,7 @@ util_print_cbc (ecma_compiled_code_t *compiled_code_p) /**< compiled code */ break; } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ JERRY_DEBUG_MSG ("]\n"); @@ -396,7 +396,7 @@ util_print_cbc (ecma_compiled_code_t *compiled_code_p) /**< compiled code */ JERRY_DEBUG_MSG (" Const literal range end: %d\n", (int) const_literal_end); JERRY_DEBUG_MSG (" Literal range end: %d\n\n", (int) literal_end); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (compiled_code_p->status_flags & CBC_CODE_FLAGS_HAS_EXTENDED_INFO) { uint32_t extended_info = ecma_compiled_code_resolve_extended_info (compiled_code_p); @@ -405,7 +405,7 @@ util_print_cbc (ecma_compiled_code_t *compiled_code_p) /**< compiled code */ size -= sizeof (ecma_value_t); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ byte_code_start_p = (uint8_t *) compiled_code_p; @@ -463,7 +463,7 @@ util_print_cbc (ecma_compiled_code_t *compiled_code_p) /**< compiled code */ JERRY_DEBUG_MSG (" %3d : %s", (int) cbc_offset, cbc_ext_names[ext_opcode]); byte_code_p += 2; -#if ENABLED (JERRY_LINE_INFO) +#if JERRY_LINE_INFO if (ext_opcode == CBC_EXT_LINE) { uint32_t value = 0; @@ -479,7 +479,7 @@ util_print_cbc (ecma_compiled_code_t *compiled_code_p) /**< compiled code */ JERRY_DEBUG_MSG (" %d\n", (int) value); continue; } -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ } if (flags & (CBC_HAS_LITERAL_ARG | CBC_HAS_LITERAL_ARG2)) @@ -546,7 +546,7 @@ util_print_cbc (ecma_compiled_code_t *compiled_code_p) /**< compiled code */ #undef PARSER_READ_IDENTIFIER_INDEX -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ /** * @} diff --git a/jerry-core/parser/js/common.h b/jerry-core/parser/js/common.h index 366b884be..9baffab97 100644 --- a/jerry-core/parser/js/common.h +++ b/jerry-core/parser/js/common.h @@ -74,19 +74,19 @@ typedef enum LEXER_FLAG_SOURCE_PTR = (1 << 2), /**< the literal is directly referenced in the source code * (no need to allocate memory) */ LEXER_FLAG_LATE_INIT = (1 << 3), /**< initialize this variable after the byte code is freed */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LEXER_FLAG_GLOBAL = (1 << 4), /**< this local identifier is not a let or const declaration */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } lexer_literal_status_flags_t; /** * Type of property length. */ -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT typedef uint32_t prop_length_t; -#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* !JERRY_CPOINTER_32_BIT */ typedef uint16_t prop_length_t; -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ /** * Literal data. @@ -101,11 +101,11 @@ typedef struct uint32_t source_data; /**< encoded source literal */ } u; -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE struct -#else /* !ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#else /* !JERRY_PARSER_DUMP_BYTE_CODE */ union -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ { prop_length_t length; /**< length of ident / string literal */ uint16_t index; /**< real index during post processing */ @@ -117,9 +117,9 @@ typedef struct void util_free_literal (lexer_literal_t *literal_p); -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE void util_print_literal (lexer_literal_t *); -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ /* TRY/CATCH block */ diff --git a/jerry-core/parser/js/js-lexer.c b/jerry-core/parser/js/js-lexer.c index 2e6f90846..1dc4a574b 100644 --- a/jerry-core/parser/js/js-lexer.c +++ b/jerry-core/parser/js/js-lexer.c @@ -22,7 +22,7 @@ #include "lit-char-helpers.h" #include "jcontext.h" -#if ENABLED (JERRY_PARSER) +#if JERRY_PARSER /** \addtogroup parser Parser * @{ @@ -93,7 +93,7 @@ lexer_hex_to_code_point (const uint8_t *source_p, /**< current source position * return result; } /* lexer_hex_to_code_point */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Parse hexadecimal character sequence enclosed in braces @@ -147,7 +147,7 @@ lexer_hex_in_braces_to_code_point (const uint8_t *source_p, /**< current source return result; } /* lexer_hex_in_braces_to_code_point */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Parse hexadecimal character sequence @@ -161,13 +161,13 @@ lexer_unchecked_hex_to_character (const uint8_t **source_p) /**< [in, out] curre const uint8_t *char_p = *source_p; uint32_t length = (char_p[-1] == LIT_CHAR_LOWERCASE_U) ? 4 : 2; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (char_p[0] == LIT_CHAR_LEFT_BRACE) { length = 0; char_p++; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ while (true) { @@ -189,7 +189,7 @@ lexer_unchecked_hex_to_character (const uint8_t **source_p) /**< [in, out] curre JERRY_ASSERT (result <= LIT_UNICODE_CODE_POINT_MAX); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (length == 0) { if (*char_p != LIT_CHAR_RIGHT_BRACE) @@ -199,7 +199,7 @@ lexer_unchecked_hex_to_character (const uint8_t **source_p) /**< [in, out] curre *source_p = char_p + 1; return result; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (--length == 0) { @@ -396,7 +396,7 @@ lexer_skip_spaces (parser_context_t *context_p) /**< context */ } } /* lexer_skip_spaces */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Skip all the continuous empty statements. @@ -416,22 +416,22 @@ lexer_skip_empty_statements (parser_context_t *context_p) /**< context */ context_p->token.flags = (uint8_t) (context_p->token.flags | LEXER_NO_SKIP_SPACES); } /* lexer_skip_empty_statements */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Checks whether the keyword has escape sequences. */ #define LEXER_CHECK_INVALID_KEYWORD(ident_start_p, buffer_p) \ (JERRY_UNLIKELY ((ident_start_p) == (buffer_p)) \ && !(context_p->global_status_flags & ECMA_PARSE_INTERNAL_PRE_SCANNING)) -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ /** * Checks whether the keyword has escape sequences. */ #define LEXER_CHECK_INVALID_KEYWORD(ident_start_p, buffer_p) \ (JERRY_UNLIKELY ((ident_start_p) == (buffer_p))) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Keyword data. @@ -503,10 +503,10 @@ static const keyword_string_t keywords_with_length_4[] = */ static const keyword_string_t keywords_with_length_5[] = { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LEXER_KEYWORD ("async", LEXER_KEYW_ASYNC), LEXER_KEYWORD ("await", LEXER_KEYW_AWAIT), -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ LEXER_KEYWORD ("break", LEXER_KEYW_BREAK), LEXER_KEYWORD ("catch", LEXER_KEYW_CATCH), LEXER_KEYWORD ("class", LEXER_KEYW_CLASS), @@ -659,7 +659,7 @@ lexer_parse_identifier (parser_context_t *context_p, /**< context */ has_escape = true; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (source_p + 5 <= source_end_p && source_p[1] == LIT_CHAR_LOWERCASE_U) { if (source_p[2] == LIT_CHAR_LEFT_BRACE) @@ -671,12 +671,12 @@ lexer_parse_identifier (parser_context_t *context_p, /**< context */ code_point = lexer_hex_to_code_point (source_p + 2, 4); } } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ if (source_p + 6 <= source_end_p && source_p[1] == LIT_CHAR_LOWERCASE_U) { code_point = lexer_hex_to_code_point (source_p + 2, 4); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (code_point == UINT32_MAX) { @@ -711,7 +711,7 @@ lexer_parse_identifier (parser_context_t *context_p, /**< context */ if (JERRY_UNLIKELY (code_point >= LIT_UTF8_2_BYTE_MARKER)) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT utf8_length = lit_read_code_point_from_utf8 (source_p, (lit_utf8_size_t) (source_end_p - source_p), &code_point); @@ -740,7 +740,7 @@ lexer_parse_identifier (parser_context_t *context_p, /**< context */ decoded_length = 2 * 3; has_escape = true; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ if (code_point < LIT_UTF8_4_BYTE_MARKER) { utf8_length = lit_read_code_point_from_utf8 (source_p, @@ -752,7 +752,7 @@ lexer_parse_identifier (parser_context_t *context_p, /**< context */ { code_point = 0; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } if (length == 0) @@ -834,7 +834,7 @@ lexer_parse_identifier (parser_context_t *context_p, /**< context */ if (JERRY_LIKELY (keyword_p->type < LEXER_FIRST_NON_RESERVED_KEYWORD)) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (keyword_p->type == LEXER_KEYW_AWAIT)) { if (!(context_p->status_flags & PARSER_IS_ASYNC_FUNCTION) @@ -855,7 +855,7 @@ lexer_parse_identifier (parser_context_t *context_p, /**< context */ context_p->token.type = (uint8_t) LEXER_KEYW_AWAIT; break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (LEXER_CHECK_INVALID_KEYWORD (ident_start_p, buffer_p)) { @@ -867,7 +867,7 @@ lexer_parse_identifier (parser_context_t *context_p, /**< context */ break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (keyword_p->type == LEXER_KEYW_LET && (context_p->status_flags & PARSER_IS_STRICT)) { if (LEXER_CHECK_INVALID_KEYWORD (ident_start_p, buffer_p)) @@ -898,7 +898,7 @@ lexer_parse_identifier (parser_context_t *context_p, /**< context */ { parser_raise_error (context_p, PARSER_ERR_ARGUMENTS_IN_CLASS_FIELD); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (keyword_p->type >= LEXER_FIRST_FUTURE_STRICT_RESERVED_WORD && (context_p->status_flags & PARSER_IS_STRICT)) @@ -938,11 +938,11 @@ void lexer_parse_string (parser_context_t *context_p, /**< context */ lexer_string_options_t opts) /**< options */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT int32_t raw_length_adjust = 0; -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ JERRY_UNUSED (opts); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ uint8_t str_end_character = context_p->source_p[0]; const uint8_t *source_p = context_p->source_p + 1; @@ -955,12 +955,12 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ size_t length = 0; uint8_t has_escape = false; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (str_end_character == LIT_CHAR_RIGHT_BRACE) { str_end_character = LIT_CHAR_GRAVE_ACCENT; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ while (true) { @@ -995,9 +995,9 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ if (source_p < source_end_p && *source_p == LIT_CHAR_LF) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT raw_length_adjust--; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ source_p++; } @@ -1020,7 +1020,7 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ continue; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (opts & LEXER_STRING_RAW) { if ((*source_p == LIT_CHAR_GRAVE_ACCENT) || (*source_p == LIT_CHAR_BACKSLASH)) @@ -1031,7 +1031,7 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ } continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (*source_p == LIT_CHAR_0 && source_p + 1 < source_end_p @@ -1047,7 +1047,7 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ * converted to a character which has the same byte length. */ if (*source_p >= LIT_CHAR_0 && *source_p <= LIT_CHAR_3) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (str_end_character == LIT_CHAR_GRAVE_ACCENT) { parser_raise_error (context_p, PARSER_ERR_TEMPLATE_STR_OCTAL_ESCAPE); @@ -1112,7 +1112,7 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ uint32_t escape_length = (*source_p == LIT_CHAR_LOWERCASE_X) ? 3 : 5; lit_code_point_t code_point = UINT32_MAX; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (source_p + 4 <= source_end_p && source_p[0] == LIT_CHAR_LOWERCASE_U && source_p[1] == LIT_CHAR_LEFT_BRACE) @@ -1122,14 +1122,14 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ } else { -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (source_p + escape_length <= source_end_p) { code_point = lexer_hex_to_code_point (source_p + 1, escape_length - 1); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (code_point == UINT32_MAX) { @@ -1145,7 +1145,7 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ continue; } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (str_end_character == LIT_CHAR_GRAVE_ACCENT && source_p[0] == LIT_CHAR_DOLLAR_SIGN && source_p + 1 < source_end_p && @@ -1155,7 +1155,7 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ source_p++; break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (*source_p >= LIT_UTF8_4_BYTE_MARKER) { @@ -1165,9 +1165,9 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ length += 2 * 3; has_escape = true; source_p += 4; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT raw_length_adjust += 2; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ column++; continue; } @@ -1177,7 +1177,7 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ /* Subtract -1 because column is increased below. */ column--; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (*source_p == LEXER_NEWLINE_LS_PS_BYTE_1 && LEXER_NEWLINE_LS_PS_BYTE_23 (source_p)) { source_p += 3; @@ -1214,11 +1214,11 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ continue; } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ else if (*source_p == LIT_CHAR_CR -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT || (*source_p == LEXER_NEWLINE_LS_PS_BYTE_1 && LEXER_NEWLINE_LS_PS_BYTE_23 (source_p)) -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ || *source_p == LIT_CHAR_LF) { context_p->token.line = line; @@ -1238,24 +1238,24 @@ lexer_parse_string (parser_context_t *context_p, /**< context */ } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (opts & LEXER_STRING_RAW) { length = (size_t) ((source_p - string_start_p) + raw_length_adjust); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (length > PARSER_MAXIMUM_STRING_LENGTH) { parser_raise_error (context_p, PARSER_ERR_STRING_TOO_LONG); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT context_p->token.type = ((str_end_character != LIT_CHAR_GRAVE_ACCENT) ? LEXER_LITERAL : LEXER_TEMPLATE_LITERAL); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ context_p->token.type = LEXER_LITERAL; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* Fill literal data. */ context_p->token.lit_location.char_p = string_start_p; @@ -1278,10 +1278,10 @@ lexer_check_numbers (parser_context_t *context_p, /**< context */ const ecma_char_t digit_max, /**< maximum of the number range */ const bool is_legacy) /**< is legacy octal number */ { -#if ENABLED (!JERRY_ESNEXT) +#if !JERRY_ESNEXT JERRY_UNUSED (context_p); JERRY_UNUSED (is_legacy); -#endif /* ENABLED (!JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ while (true) { while (*source_p < source_end_p @@ -1290,7 +1290,7 @@ lexer_check_numbers (parser_context_t *context_p, /**< context */ { *source_p += 1; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (*source_p != source_end_p && *source_p[0] == LIT_CHAR_UNDERSCORE) { *source_p += 1; @@ -1304,7 +1304,7 @@ lexer_check_numbers (parser_context_t *context_p, /**< context */ } continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ break; } @@ -1319,9 +1319,9 @@ lexer_parse_number (parser_context_t *context_p) /**< context */ const uint8_t *source_p = context_p->source_p; const uint8_t *source_end_p = context_p->source_end_p; bool can_be_float = false; -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT bool can_be_bigint = true; -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ size_t length; context_p->token.type = LEXER_LITERAL; @@ -1333,12 +1333,12 @@ lexer_parse_number (parser_context_t *context_p) /**< context */ if (source_p[0] == LIT_CHAR_0 && source_p + 1 < source_end_p) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (source_p[1] == LIT_CHAR_UNDERSCORE) { parser_raise_error (context_p, PARSER_ERR_INVALID_UNDERSCORE_IN_NUMBER); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (LEXER_TO_ASCII_LOWERCASE (source_p[1]) == LIT_CHAR_LOWERCASE_X) { context_p->token.extra_value = LEXER_NUMBER_HEXADECIMAL; @@ -1353,7 +1353,7 @@ lexer_parse_number (parser_context_t *context_p) /**< context */ do { source_p++; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (source_p < source_end_p && source_p[0] == LIT_CHAR_UNDERSCORE) { source_p++; @@ -1362,12 +1362,12 @@ lexer_parse_number (parser_context_t *context_p) /**< context */ parser_raise_error (context_p, PARSER_ERR_INVALID_UNDERSCORE_IN_NUMBER); } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } while (source_p < source_end_p && lit_char_is_hex_digit (source_p[0])); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (LEXER_TO_ASCII_LOWERCASE (source_p[1]) == LIT_CHAR_LOWERCASE_O) { context_p->token.extra_value = LEXER_NUMBER_OCTAL; @@ -1381,14 +1381,14 @@ lexer_parse_number (parser_context_t *context_p) /**< context */ lexer_check_numbers (context_p, &source_p, source_end_p, LIT_CHAR_7, false); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ else if (source_p[1] >= LIT_CHAR_0 && source_p[1] <= LIT_CHAR_9) { context_p->token.extra_value = LEXER_NUMBER_OCTAL; -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT can_be_bigint = false; -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ if (context_p->status_flags & PARSER_IS_STRICT) { @@ -1401,15 +1401,15 @@ lexer_parse_number (parser_context_t *context_p) /**< context */ && source_p[0] >= LIT_CHAR_8 && source_p[0] <= LIT_CHAR_9) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT lexer_check_numbers (context_p, &source_p, source_end_p, LIT_CHAR_9, true); context_p->token.extra_value = LEXER_NUMBER_DECIMAL; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ parser_raise_error (context_p, PARSER_ERR_INVALID_NUMBER); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (LEXER_TO_ASCII_LOWERCASE (source_p[1]) == LIT_CHAR_LOWERCASE_B) { context_p->token.extra_value = LEXER_NUMBER_BINARY; @@ -1438,7 +1438,7 @@ lexer_parse_number (parser_context_t *context_p) /**< context */ while (source_p < source_end_p && lit_char_is_binary_digit (source_p[0])); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ else { can_be_float = true; @@ -1457,16 +1457,16 @@ lexer_parse_number (parser_context_t *context_p) /**< context */ && source_p[0] == LIT_CHAR_DOT) { source_p++; -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT can_be_bigint = false; -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (source_p < source_end_p && source_p[0] == LIT_CHAR_UNDERSCORE) { parser_raise_error (context_p, PARSER_ERR_INVALID_UNDERSCORE_IN_NUMBER); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_check_numbers (context_p, &source_p, source_end_p, LIT_CHAR_9, false); } @@ -1474,9 +1474,9 @@ lexer_parse_number (parser_context_t *context_p) /**< context */ && LEXER_TO_ASCII_LOWERCASE (source_p[0]) == LIT_CHAR_LOWERCASE_E) { source_p++; -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT can_be_bigint = false; -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ if (source_p < source_end_p && (source_p[0] == LIT_CHAR_PLUS || source_p[0] == LIT_CHAR_MINUS)) @@ -1495,7 +1495,7 @@ lexer_parse_number (parser_context_t *context_p) /**< context */ } } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (source_p < source_end_p && source_p[0] == LIT_CHAR_LOWERCASE_N) { if (!can_be_bigint) @@ -1505,7 +1505,7 @@ lexer_parse_number (parser_context_t *context_p) /**< context */ context_p->token.extra_value = LEXER_NUMBER_BIGINT; source_p++; } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ length = (size_t) (source_p - context_p->source_p); if (length > PARSER_MAXIMUM_STRING_LENGTH) @@ -1647,7 +1647,7 @@ lexer_next_token (parser_context_t *context_p) /**< context */ return; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (length >= 3 && context_p->source_p[1] == LIT_CHAR_DOT && context_p->source_p[2] == LIT_CHAR_DOT) @@ -1656,7 +1656,7 @@ lexer_next_token (parser_context_t *context_p) /**< context */ length = 3; break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ context_p->token.type = LEXER_DOT; length = 1; @@ -1760,14 +1760,14 @@ lexer_next_token (parser_context_t *context_p) /**< context */ break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->source_p[1] == (uint8_t) LIT_CHAR_GREATER_THAN) { context_p->token.type = LEXER_ARROW; length = 2; break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } context_p->token.type = LEXER_ASSIGN; @@ -1812,7 +1812,7 @@ lexer_next_token (parser_context_t *context_p) /**< context */ break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->source_p[1] == (uint8_t) LIT_CHAR_ASTERISK) { if (length >= 3 && context_p->source_p[2] == (uint8_t) LIT_CHAR_EQUALS) @@ -1826,7 +1826,7 @@ lexer_next_token (parser_context_t *context_p) /**< context */ length = 2; break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } context_p->token.type = LEXER_MULTIPLY; @@ -1850,7 +1850,7 @@ lexer_next_token (parser_context_t *context_p) /**< context */ LEXER_TYPE_A_TOKEN (LIT_CHAR_TILDE, LEXER_BIT_NOT); case (uint8_t) (LIT_CHAR_QUESTION): { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (length >= 2) { if (context_p->source_p[1] == (uint8_t) LIT_CHAR_QUESTION) @@ -1860,7 +1860,7 @@ lexer_next_token (parser_context_t *context_p) /**< context */ break; } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ context_p->token.type = LEXER_QUESTION_MARK; length = 1; break; @@ -1870,9 +1870,9 @@ lexer_next_token (parser_context_t *context_p) /**< context */ case LIT_CHAR_SINGLE_QUOTE: case LIT_CHAR_DOUBLE_QUOTE: -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LIT_CHAR_GRAVE_ACCENT: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { lexer_parse_string (context_p, LEXER_STRING_NO_OPTS); return; @@ -1979,9 +1979,9 @@ lexer_check_post_primary_exp (parser_context_t *context_p) /**< context */ case LIT_CHAR_DOT: case LIT_CHAR_LEFT_PAREN: case LIT_CHAR_LEFT_SQUARE: -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LIT_CHAR_GRAVE_ACCENT: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { return true; } @@ -1992,19 +1992,19 @@ lexer_check_post_primary_exp (parser_context_t *context_p) /**< context */ && context_p->source_p + 1 < context_p->source_end_p && context_p->source_p[1] == context_p->source_p[0]); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LIT_CHAR_ASTERISK: { return (context_p->source_p + 1 < context_p->source_end_p && context_p->source_p[1] == (uint8_t) LIT_CHAR_ASTERISK); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } return false; } /* lexer_check_post_primary_exp */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Checks whether the next token is a type used for detecting arrow functions. @@ -2189,7 +2189,7 @@ lexer_update_await_yield (parser_context_t *context_p, /**< context */ } } /* lexer_update_await_yield */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Convert an ident with escapes to a utf8 string. @@ -2213,7 +2213,7 @@ lexer_convert_ident_to_cesu8 (uint8_t *destination_p, /**< destination string */ continue; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (*source_p >= LIT_UTF8_4_BYTE_MARKER) { lit_four_byte_utf8_char_to_cesu8 (destination_p, source_p); @@ -2222,7 +2222,7 @@ lexer_convert_ident_to_cesu8 (uint8_t *destination_p, /**< destination string */ source_p += 4; continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ *destination_p++ = *source_p++; } @@ -2268,17 +2268,17 @@ lexer_convert_literal_to_chars (parser_context_t *context_p, /**< context */ uint8_t str_end_character = source_p[-1]; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (str_end_character == LIT_CHAR_RIGHT_BRACE) { str_end_character = LIT_CHAR_GRAVE_ACCENT; } bool is_raw = (opts & LEXER_STRING_RAW) != 0; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_UNUSED (opts); bool is_raw = false; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ while (true) { @@ -2410,7 +2410,7 @@ lexer_convert_literal_to_chars (parser_context_t *context_p, /**< context */ continue; } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (str_end_character == LIT_CHAR_GRAVE_ACCENT) { if (source_p[0] == LIT_CHAR_DOLLAR_SIGN @@ -2442,7 +2442,7 @@ lexer_convert_literal_to_chars (parser_context_t *context_p, /**< context */ } } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (*source_p >= LIT_UTF8_4_BYTE_MARKER) { @@ -2623,23 +2623,24 @@ lexer_construct_number_object (parser_context_t *context_p, /**< context */ parser_list_iterator_t literal_iterator; lexer_literal_t *literal_p; ecma_value_t lit_value; - ecma_number_t num; uint32_t literal_index = 0; prop_length_t length = context_p->token.lit_location.length; -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (JERRY_LIKELY (context_p->token.extra_value != LEXER_NUMBER_BIGINT)) { -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ + ecma_number_t num; + if (context_p->token.extra_value < LEXER_NUMBER_OCTAL) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT num = ecma_utf8_string_to_number (context_p->token.lit_location.char_p, length, ECMA_CONVERSION_ALLOW_UNDERSCORE); #else num = ecma_utf8_string_to_number (context_p->token.lit_location.char_p, length, 0); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } else { @@ -2649,7 +2650,7 @@ lexer_construct_number_object (parser_context_t *context_p, /**< context */ JERRY_ASSERT (src_p[0] == LIT_CHAR_0); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->token.extra_value == LEXER_NUMBER_BINARY) { src_p++; @@ -2659,7 +2660,7 @@ lexer_construct_number_object (parser_context_t *context_p, /**< context */ { src_p++; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ num = 0; do @@ -2692,7 +2693,7 @@ lexer_construct_number_object (parser_context_t *context_p, /**< context */ } lit_value = ecma_find_or_create_literal_number (num); -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT } else { @@ -2719,7 +2720,7 @@ lexer_construct_number_object (parser_context_t *context_p, /**< context */ lit_value = ecma_find_or_create_literal_bigint (lit_value); } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ parser_list_iterator_init (&context_p->literal_pool, &literal_iterator); @@ -2860,7 +2861,7 @@ lexer_construct_function_object (parser_context_t *context_p, /**< context */ parser_flush_cbc (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_LIKELY (!(extra_status_flags & PARSER_IS_ARROW_FUNCTION))) { compiled_code_p = parser_parse_function (context_p, extra_status_flags); @@ -2869,9 +2870,9 @@ lexer_construct_function_object (parser_context_t *context_p, /**< context */ { compiled_code_p = parser_parse_arrow_function (context_p, extra_status_flags); } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ compiled_code_p = parser_parse_function (context_p, extra_status_flags); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ literal_p->u.bytecode_p = compiled_code_p; literal_p->type = LEXER_FUNCTION_LITERAL; @@ -2890,7 +2891,7 @@ void lexer_construct_regexp_object (parser_context_t *context_p, /**< context */ bool parse_only) /**< parse only */ { -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP const uint8_t *source_p = context_p->source_p; const uint8_t *regex_start_p = context_p->source_p; const uint8_t *regex_end_p = regex_start_p; @@ -3003,12 +3004,12 @@ lexer_construct_regexp_object (parser_context_t *context_p, /**< context */ { flag = RE_FLAG_STICKY; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (source_p[0] == LIT_CHAR_LOWERCASE_S) { flag = RE_FLAG_DOTALL; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (flag == 0) { @@ -3084,10 +3085,10 @@ lexer_construct_regexp_object (parser_context_t *context_p, /**< context */ context_p->lit_object.literal_p = literal_p; context_p->lit_object.index = context_p->literal_count++; -#else /* !ENABLED (JERRY_BUILTIN_REGEXP) */ +#else /* !JERRY_BUILTIN_REGEXP */ JERRY_UNUSED (parse_only); parser_raise_error (context_p, PARSER_ERR_UNSUPPORTED_REGEXP); -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ } /* lexer_construct_regexp_object */ /** @@ -3133,7 +3134,7 @@ lexer_expect_identifier (parser_context_t *context_p, /**< context */ return; } } -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM else if (context_p->status_flags & PARSER_MODULE_DEFAULT_CLASS_OR_FUNC) { /* When parsing default exports for modules, it is not required by functions or classes to have identifiers. @@ -3144,9 +3145,9 @@ lexer_expect_identifier (parser_context_t *context_p, /**< context */ context_p->status_flags &= (uint32_t) ~(PARSER_MODULE_DEFAULT_CLASS_OR_FUNC); return; } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->token.type == LEXER_KEYW_YIELD) { parser_raise_error (context_p, PARSER_ERR_YIELD_NOT_ALLOWED); @@ -3155,7 +3156,7 @@ lexer_expect_identifier (parser_context_t *context_p, /**< context */ { parser_raise_error (context_p, PARSER_ERR_AWAIT_NOT_ALLOWED); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_raise_error (context_p, PARSER_ERR_IDENTIFIER_EXPECTED); } /* lexer_expect_identifier */ @@ -3189,13 +3190,13 @@ lexer_expect_object_literal_id (parser_context_t *context_p, /**< context */ context_p->token.flags = (uint8_t) (context_p->token.flags | LEXER_NO_SKIP_SPACES); if (context_p->source_p < context_p->source_end_p -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT && context_p->source_p[0] != LIT_CHAR_COMMA && context_p->source_p[0] != LIT_CHAR_RIGHT_BRACE && context_p->source_p[0] != LIT_CHAR_LEFT_PAREN && context_p->source_p[0] != LIT_CHAR_SEMICOLON && context_p->source_p[0] != LIT_CHAR_EQUALS -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ && context_p->source_p[0] != LIT_CHAR_COLON) { if (lexer_compare_literal_to_string (context_p, "get", 3)) @@ -3210,7 +3211,7 @@ lexer_expect_object_literal_id (parser_context_t *context_p, /**< context */ return; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (lexer_compare_literal_to_string (context_p, "async", 5)) { context_p->token.type = LEXER_KEYW_ASYNC; @@ -3225,7 +3226,7 @@ lexer_expect_object_literal_id (parser_context_t *context_p, /**< context */ } return; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } } @@ -3242,7 +3243,7 @@ lexer_expect_object_literal_id (parser_context_t *context_p, /**< context */ create_literal_object = true; break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LIT_CHAR_LEFT_SQUARE: { lexer_consume_next_character (context_p); @@ -3283,7 +3284,7 @@ lexer_expect_object_literal_id (parser_context_t *context_p, /**< context */ context_p->source_p += 3; return; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case LIT_CHAR_RIGHT_BRACE: { if (ident_opts & LEXER_OBJ_IDENT_ONLY_IDENTIFIERS) @@ -3323,12 +3324,12 @@ lexer_expect_object_literal_id (parser_context_t *context_p, /**< context */ if (create_literal_object) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ident_opts & LEXER_OBJ_IDENT_CLASS_IDENTIFIER) { return; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_construct_literal_object (context_p, &context_p->token.lit_location, @@ -3377,12 +3378,12 @@ lexer_check_property_modifier (parser_context_t *context_p) /**< context */ context_p->token.flags = (uint8_t) (context_p->token.flags | LEXER_NO_SKIP_SPACES); if (context_p->source_p >= context_p->source_end_p -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT || context_p->source_p[0] == LIT_CHAR_COMMA || context_p->source_p[0] == LIT_CHAR_RIGHT_BRACE || context_p->source_p[0] == LIT_CHAR_LEFT_PAREN || context_p->source_p[0] == LIT_CHAR_EQUALS -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ || context_p->source_p[0] == LIT_CHAR_COLON) { return; @@ -3400,13 +3401,13 @@ lexer_check_property_modifier (parser_context_t *context_p) /**< context */ return; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (lexer_compare_literal_to_string (context_p, "async", 5)) { context_p->token.type = LEXER_KEYW_ASYNC; return; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* lexer_check_property_modifier */ /** @@ -3527,10 +3528,9 @@ lexer_compare_identifiers (parser_context_t *context_p, /**< context */ return lexer_compare_identifier_to_chars (left_p->char_p, right_p->char_p, length); } - uint8_t buf_p[64]; - if (length <= 64) { + uint8_t buf_p[64]; lexer_convert_ident_to_cesu8 (buf_p, left_p->char_p, length); return lexer_compare_identifier_to_chars (right_p->char_p, buf_p, length); } @@ -3613,7 +3613,7 @@ lexer_string_is_directive (parser_context_t *context_p) /**< context */ && context_p->token.type != LEXER_DOT)); } /* lexer_string_is_directive */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Compares the current token to an expected identifier. @@ -3670,7 +3670,7 @@ lexer_token_is_async (parser_context_t *context_p) /**< context */ && !context_p->token.lit_location.has_escape); } /* lexer_token_is_async */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Compares the current identifier or string to an expected string. @@ -3707,17 +3707,17 @@ lexer_convert_binary_lvalue_token_to_binary (uint8_t token) /**< binary lvalue t JERRY_ASSERT (LEXER_IS_BINARY_LVALUE_OP_TOKEN (token)); JERRY_ASSERT (token != LEXER_ASSIGN); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (token <= LEXER_ASSIGN_EXPONENTIATION) { return (uint8_t) (LEXER_ADD + (token - LEXER_ASSIGN_ADD)); } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ if (token <= LEXER_ASSIGN_MODULO) { return (uint8_t) (LEXER_ADD + (token - LEXER_ASSIGN_ADD)); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (token <= LEXER_ASSIGN_UNS_RIGHT_SHIFT) { @@ -3748,4 +3748,4 @@ lexer_convert_binary_lvalue_token_to_binary (uint8_t token) /**< binary lvalue t * @} */ -#endif /* ENABLED (JERRY_PARSER) */ +#endif /* JERRY_PARSER */ diff --git a/jerry-core/parser/js/js-lexer.h b/jerry-core/parser/js/js-lexer.h index 927723102..0f298f6db 100644 --- a/jerry-core/parser/js/js-lexer.h +++ b/jerry-core/parser/js/js-lexer.h @@ -41,10 +41,10 @@ typedef enum LEXER_LIT_TRUE, /**< true (not a keyword!) */ LEXER_LIT_FALSE, /**< false (not a keyword!) */ LEXER_LIT_NULL, /**< null (not a keyword!) */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LEXER_TEMPLATE_LITERAL, /**< multi segment template literal */ LEXER_THREE_DOTS, /**< ... (rest or spread operator) */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* Unary operators * IMPORTANT: update CBC_UNARY_OP_TOKEN_TO_OPCODE and @@ -60,9 +60,9 @@ typedef enum LEXER_BIT_NOT, /**< "~" */ LEXER_KEYW_VOID, /**< void */ LEXER_KEYW_TYPEOF, /**< typeof */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LEXER_KEYW_AWAIT, /**< await */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ LEXER_KEYW_DELETE, /**< delete */ LEXER_INCREASE, /**< "++" */ LEXER_DECREASE, /**< "--" */ @@ -75,17 +75,17 @@ typedef enum * Index of first binary operation opcode. */ #define LEXER_FIRST_BINARY_OP LEXER_ASSIGN -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Index of last binary operation opcode. */ #define LEXER_LAST_BINARY_OP LEXER_EXPONENTIATION -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ /** * Index of last binary operation opcode. */ #define LEXER_LAST_BINARY_OP LEXER_MODULO -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Checks whether the token is a binary operation token. @@ -109,9 +109,9 @@ typedef enum LEXER_ASSIGN_MULTIPLY, /**< "*=" (prec: 3) */ LEXER_ASSIGN_DIVIDE, /**< "/=" (prec: 3) */ LEXER_ASSIGN_MODULO, /**< "%=" (prec: 3) */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LEXER_ASSIGN_EXPONENTIATION, /**< "**=" (prec: 3) */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ LEXER_ASSIGN_LEFT_SHIFT, /**< "<<=" (prec: 3) */ LEXER_ASSIGN_RIGHT_SHIFT, /**< ">>=" (prec: 3) */ LEXER_ASSIGN_UNS_RIGHT_SHIFT, /**< ">>>=" (prec: 3) */ @@ -119,9 +119,9 @@ typedef enum LEXER_ASSIGN_BIT_OR, /**< "|=" (prec: 3) */ LEXER_ASSIGN_BIT_XOR, /**< "^=" (prec: 3) */ LEXER_QUESTION_MARK, /**< "?" (prec: 4) */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LEXER_NULLISH_COALESCING, /**< "??" (prec: 5) */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ LEXER_LOGICAL_OR, /**< "||" (prec: 6) */ LEXER_LOGICAL_AND, /**< "&&" (prec: 7) */ LEXER_BIT_OR, /**< "|" (prec: 8) */ @@ -145,9 +145,9 @@ typedef enum LEXER_MULTIPLY, /**< "*" (prec: 15) */ LEXER_DIVIDE, /**< "/" (prec: 15) */ LEXER_MODULO, /**< "%" (prec: 15) */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LEXER_EXPONENTIATION, /**< "**" (prec: 16) */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ LEXER_LEFT_BRACE, /**< "{" */ LEXER_LEFT_PAREN, /**< "(" */ @@ -159,9 +159,9 @@ typedef enum LEXER_SEMICOLON, /**< ";" */ LEXER_COLON, /**< ":" */ LEXER_COMMA, /**< "," */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LEXER_ARROW, /**< "=>" */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ LEXER_KEYW_BREAK, /**< break */ LEXER_KEYW_DO, /**< do */ @@ -197,20 +197,20 @@ typedef enum LEXER_PROPERTY_GETTER, /**< property getter function */ LEXER_PROPERTY_SETTER, /**< property setter function */ LEXER_COMMA_SEP_LIST, /**< comma separated bracketed expression list */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT LEXER_ASSIGN_GROUP_EXPR, /**< indetifier for the assignment is located in a group expression */ LEXER_ASSIGN_CONST, /**< a const binding is reassigned */ LEXER_INVALID_PATTERN, /**< special value for invalid destructuring pattern */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* Keywords which are not keyword tokens. */ #define LEXER_FIRST_NON_RESERVED_KEYWORD LEXER_KEYW_ASYNC LEXER_KEYW_ASYNC, /**< async */ -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ /* Keywords which are not keyword tokens. */ #define LEXER_FIRST_NON_RESERVED_KEYWORD LEXER_KEYW_EVAL -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* Keywords which cannot be assigned in strict mode. */ #define LEXER_FIRST_NON_STRICT_ARGUMENTS LEXER_KEYW_EVAL @@ -300,9 +300,9 @@ typedef enum LEXER_NUMBER_HEXADECIMAL, /**< hexadecimal number */ LEXER_NUMBER_OCTAL, /**< octal number */ LEXER_NUMBER_BINARY, /**< binary number */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT LEXER_NUMBER_BIGINT, /**< bigint number */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ } lexer_number_type_t; /** diff --git a/jerry-core/parser/js/js-parser-expr.c b/jerry-core/parser/js/js-parser-expr.c index 5851d85a7..fbfc42805 100644 --- a/jerry-core/parser/js/js-parser-expr.c +++ b/jerry-core/parser/js/js-parser-expr.c @@ -15,7 +15,7 @@ #include "js-parser-internal.h" -#if ENABLED (JERRY_PARSER) +#if JERRY_PARSER #include "jcontext.h" #include "ecma-helpers.h" @@ -72,13 +72,13 @@ static const uint8_t parser_binary_precedence_table[] = 3, /**< "&=" */ 3, /**< "|=" */ 3, /**< "^=" */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT 3, /**< "**=" */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ 4, /**< "?"*/ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT 5, /**< "??" */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ 6, /**< "||" */ 7, /**< "&&" */ 8, /**< "|" */ @@ -102,18 +102,18 @@ static const uint8_t parser_binary_precedence_table[] = 15, /**< "*" */ 15, /**< "/" */ 15, /**< "%" */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT 16, /**< "**" */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ }; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_STATIC_ASSERT (sizeof (parser_binary_precedence_table) == 39, parser_binary_precedence_table_should_have_39_values_in_es2015); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_STATIC_ASSERT (sizeof (parser_binary_precedence_table) == 36, parser_binary_precedence_table_should_have_36_values_in_es51); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Generate byte code for operators with lvalue. @@ -167,7 +167,7 @@ parser_check_invalid_assign (parser_context_t *context_p) /**< context */ } } /* parser_check_invalid_assign */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Check and throw an error if the "new.target" is invalid as a left-hand side expression. @@ -190,7 +190,7 @@ parser_check_invalid_new_target (parser_context_t *context_p, /**< parser contex } } /* parser_check_invalid_new_target */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Emit identifier reference @@ -258,7 +258,7 @@ parser_emit_unary_lvalue_opcode (parser_context_t *context_p, /**< context */ parser_emit_ident_reference (context_p, unary_opcode); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (unary_opcode != CBC_DELETE_IDENT_PUSH_RESULT && scanner_literal_is_const_reg (context_p, context_p->last_cbc.literal_index)) { @@ -266,7 +266,7 @@ parser_emit_unary_lvalue_opcode (parser_context_t *context_p, /**< context */ context_p->last_cbc_opcode = CBC_PUSH_LITERAL; parser_emit_cbc_ext (context_p, CBC_EXT_THROW_ASSIGN_CONST_ERROR); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return; } @@ -286,7 +286,7 @@ parser_emit_unary_lvalue_opcode (parser_context_t *context_p, /**< context */ /* Invalid LeftHandSide expression. */ if (opcode == CBC_DELETE_PUSH_RESULT) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->last_cbc_opcode == PARSER_TO_EXT_OPCODE (CBC_EXT_PUSH_SUPER_PROP_LITERAL) || context_p->last_cbc_opcode == PARSER_TO_EXT_OPCODE (CBC_EXT_PUSH_SUPER_PROP)) { @@ -294,18 +294,18 @@ parser_emit_unary_lvalue_opcode (parser_context_t *context_p, /**< context */ parser_emit_cbc (context_p, CBC_POP); return; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_emit_cbc (context_p, CBC_POP); parser_emit_cbc (context_p, CBC_PUSH_TRUE); return; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT parser_check_invalid_new_target (context_p, opcode); parser_raise_error (context_p, PARSER_ERR_INVALID_LHS_POSTFIX_OP); -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ parser_emit_cbc_ext (context_p, CBC_EXT_THROW_REFERENCE_ERROR); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } parser_emit_cbc (context_p, (uint16_t) opcode); @@ -345,7 +345,7 @@ parser_parse_array_literal (parser_context_t *context_p) /**< context */ } else { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->token.type == LEXER_THREE_DOTS) { opcode = (uint16_t) (PARSER_TO_EXT_OPCODE (CBC_EXT_SPREAD_ARRAY_APPEND)); @@ -353,7 +353,7 @@ parser_parse_array_literal (parser_context_t *context_p) /**< context */ lexer_next_token (context_p); parser_emit_cbc_ext (context_p, CBC_EXT_PUSH_SPREAD_ELEMENT); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_parse_expression (context_p, PARSE_EXPR_NO_COMMA); @@ -375,15 +375,15 @@ parser_parse_array_literal (parser_context_t *context_p) /**< context */ if (pushed_items >= 64) { parser_emit_cbc_call (context_p, opcode, pushed_items); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT opcode = (uint16_t) CBC_ARRAY_APPEND; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ pushed_items = 0; } } } /* parser_parse_array_literal */ -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT /** * Object literal item types. */ @@ -480,9 +480,9 @@ parser_append_object_literal_item (parser_context_t *context_p, /**< context */ context_p->stack_top_uint8 = PARSER_OBJECT_PROPERTY_BOTH_ACCESSORS; } } /* parser_append_object_literal_item */ -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** Forward definition of parse array initializer. */ static void parser_parse_array_initializer (parser_context_t *context_p, parser_pattern_flags_t flags); @@ -958,10 +958,10 @@ parser_parse_class (parser_context_t *context_p, /**< context */ context_p->lit_object.literal_p->status_flags |= LEXER_FLAG_USED; class_name_index = context_p->lit_object.index; -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM parser_module_append_export_name (context_p); context_p->status_flags &= (uint32_t) ~(PARSER_MODULE_STORE_IDENT); -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ lexer_next_token (context_p); } @@ -1064,9 +1064,9 @@ parser_parse_class (parser_context_t *context_p, /**< context */ lexer_next_token (context_p); } /* parser_parse_class */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Parse object initializer method definition. * @@ -1124,7 +1124,7 @@ parser_reparse_as_common_identifier (parser_context_t *context_p, /**< context * LEXER_IDENT_LITERAL); } /* parser_reparse_as_common_identifier */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Parse object literal. @@ -1136,11 +1136,11 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ parser_emit_cbc (context_p, CBC_CREATE_OBJECT); -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT parser_stack_push_uint8 (context_p, PARSER_OBJECT_PROPERTY_START); -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT bool proto_seen = false; bool has_super_env = false; @@ -1156,7 +1156,7 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ scanner_release_next (context_p, sizeof (scanner_info_t)); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ while (true) { @@ -1173,38 +1173,38 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ { uint32_t status_flags; cbc_ext_opcode_t opcode; -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT parser_object_literal_item_types_t item_type; -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ bool is_getter = context_p->token.type == LEXER_PROPERTY_GETTER; if (is_getter) { status_flags = PARSER_FUNCTION_CLOSURE | PARSER_IS_PROPERTY_GETTER; opcode = CBC_EXT_SET_GETTER; -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT item_type = PARSER_OBJECT_PROPERTY_GETTER; -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ } else { status_flags = PARSER_FUNCTION_CLOSURE | PARSER_IS_PROPERTY_SETTER; opcode = CBC_EXT_SET_SETTER; -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT item_type = PARSER_OBJECT_PROPERTY_SETTER; -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT status_flags |= PARSER_ALLOW_SUPER; -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ lexer_expect_object_literal_id (context_p, LEXER_OBJ_IDENT_ONLY_IDENTIFIERS); /* This assignment is a nop for computed getters/setters. */ uint16_t literal_index = context_p->lit_object.index; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT bool is_computed = context_p->token.type == LEXER_RIGHT_SQUARE; if (is_computed) @@ -1212,18 +1212,18 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ opcode = ((opcode == CBC_EXT_SET_GETTER) ? CBC_EXT_SET_COMPUTED_GETTER : CBC_EXT_SET_COMPUTED_SETTER); } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ parser_append_object_literal_item (context_p, literal_index, item_type); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ uint16_t function_literal_index = lexer_construct_function_object (context_p, status_flags); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (opcode >= CBC_EXT_SET_COMPUTED_GETTER) { literal_index = function_literal_index; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_emit_cbc_literal (context_p, CBC_PUSH_LITERAL, @@ -1231,7 +1231,7 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ JERRY_ASSERT (context_p->last_cbc_opcode == CBC_PUSH_LITERAL); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (is_computed) { parser_emit_cbc_ext (context_p, is_getter ? CBC_EXT_SET_COMPUTED_GETTER_NAME @@ -1257,7 +1257,7 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ : CBC_EXT_SET_COMPUTED_SETTER); } else -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { context_p->last_cbc_opcode = PARSER_TO_EXT_OPCODE (opcode); context_p->last_cbc.value = function_literal_index; @@ -1266,7 +1266,7 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ lexer_next_token (context_p); break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LEXER_RIGHT_SQUARE: { lexer_next_token (context_p); @@ -1392,10 +1392,10 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ lexer_next_token (context_p); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const lexer_lit_location_t *literal_p = (const lexer_lit_location_t *) context_p->lit_object.literal_p; bool is_proto = ((context_p->token.lit_location.type == LEXER_IDENT_LITERAL || context_p->token.lit_location.type == LEXER_STRING_LITERAL) @@ -1410,22 +1410,22 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ proto_seen = true; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ uint16_t literal_index = context_p->lit_object.index; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT parser_line_counter_t start_line = context_p->token.line; parser_line_counter_t start_column = context_p->token.column; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ parser_append_object_literal_item (context_p, literal_index, PARSER_OBJECT_PROPERTY_VALUE); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_next_token (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->token.type == LEXER_LEFT_PAREN && !is_proto) { parser_parse_object_method (context_p); @@ -1457,7 +1457,7 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ lexer_next_token (context_p); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (context_p->token.type != LEXER_COLON) { @@ -1467,34 +1467,34 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ lexer_next_token (context_p); parser_parse_expression (context_p, PARSE_EXPR_NO_COMMA); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (is_proto) { parser_emit_cbc_ext (context_p, CBC_EXT_SET__PROTO__); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (context_p->last_cbc_opcode == CBC_PUSH_LITERAL) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->last_cbc.literal_type == LEXER_FUNCTION_LITERAL) { parser_set_function_name (context_p, context_p->last_cbc.literal_index, literal_index, 0); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ context_p->last_cbc_opcode = CBC_SET_LITERAL_PROPERTY; context_p->last_cbc.value = literal_index; } else { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->last_cbc_opcode == PARSER_TO_EXT_OPCODE (CBC_EXT_FINALIZE_ANONYMOUS_CLASS)) { uint16_t name_index = scanner_save_literal (context_p, literal_index); parser_emit_cbc_ext_literal (context_p, CBC_EXT_SET_CLASS_NAME, name_index); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_emit_cbc_literal (context_p, CBC_SET_PROPERTY, literal_index); } @@ -1512,19 +1512,19 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */ } } -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT while (context_p->stack_top_uint8 != PARSER_OBJECT_PROPERTY_START) { parser_stack_pop (context_p, NULL, 3); } parser_stack_pop_uint8 (context_p); -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ if (has_super_env) { parser_emit_cbc_ext (context_p, CBC_EXT_POP_OBJECT_SUPER_ENVIRONMENT); } -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ } /* parser_parse_object_literal */ /** @@ -1540,21 +1540,21 @@ parser_parse_function_expression (parser_context_t *context_p, /**< context */ uint16_t function_literal_index; int32_t function_name_index = -1; -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT JERRY_ASSERT (status_flags & PARSER_IS_FUNC_EXPRESSION); -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (status_flags & PARSER_IS_FUNC_EXPRESSION) { -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER parser_line_counter_t debugger_line = context_p->token.line; parser_line_counter_t debugger_column = context_p->token.column; -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint32_t parent_status_flags = context_p->status_flags; context_p->status_flags &= (uint32_t) ~(PARSER_IS_ASYNC_FUNCTION @@ -1573,7 +1573,7 @@ parser_parse_function_expression (parser_context_t *context_p, /**< context */ context_p->status_flags |= PARSER_IS_GENERATOR_FUNCTION | PARSER_DISALLOW_AWAIT_YIELD; status_flags |= PARSER_IS_GENERATOR_FUNCTION | PARSER_DISALLOW_AWAIT_YIELD; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (!lexer_check_next_character (context_p, LIT_CHAR_LEFT_PAREN)) { @@ -1589,7 +1589,7 @@ parser_parse_function_expression (parser_context_t *context_p, /**< context */ lexer_construct_literal_object (context_p, &context_p->token.lit_location, LEXER_STRING_LITERAL); -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) { jerry_debugger_send_string (JERRY_DEBUGGER_FUNCTION_NAME, @@ -1601,7 +1601,7 @@ parser_parse_function_expression (parser_context_t *context_p, /**< context */ context_p->token.line = debugger_line; context_p->token.column = debugger_column; } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ if (context_p->token.keyword_type >= LEXER_FIRST_NON_STRICT_ARGUMENTS) { @@ -1611,10 +1611,10 @@ parser_parse_function_expression (parser_context_t *context_p, /**< context */ function_name_index = context_p->lit_object.index; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT context_p->status_flags = parent_status_flags; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (context_p->last_cbc_opcode == CBC_PUSH_LITERAL) { @@ -1634,12 +1634,12 @@ parser_parse_function_expression (parser_context_t *context_p, /**< context */ JERRY_ASSERT (context_p->last_cbc_opcode == PARSER_CBC_UNAVAILABLE); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (function_name_index != -1) { parser_set_function_name (context_p, function_literal_index, (uint16_t) function_name_index, 0); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (literals == 1) { @@ -1671,7 +1671,7 @@ parser_parse_function_expression (parser_context_t *context_p, /**< context */ context_p->last_cbc.literal_keyword_type = LEXER_EOS; } /* parser_parse_function_expression */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Parse template literal. @@ -1875,7 +1875,7 @@ parser_abort_parsing_after_assignment_expression (parser_context_t *context_p) && context_p->token.type != LEXER_COMMA); } /* parser_abort_parsing_after_assignment_expression */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Parse and record unary operators, and parse the primary literal. @@ -1904,16 +1904,16 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ context_p->token.type = LEXER_NEGATE; break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LEXER_KEYW_AWAIT: { -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM if ((context_p->global_status_flags & ECMA_PARSE_MODULE) && !(context_p->status_flags & PARSER_IS_ASYNC_FUNCTION)) { parser_raise_error (context_p, PARSER_ERR_AWAIT_NOT_ALLOWED); } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ if (JERRY_UNLIKELY (context_p->token.lit_location.has_escape)) { @@ -1921,7 +1921,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ } break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* Bracketed expressions are primary expressions. At this @@ -1929,13 +1929,13 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ * they are processed when their closing paren is reached. */ if (context_p->token.type == LEXER_LEFT_PAREN) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->next_scanner_info_p->source_p == context_p->source_p) { JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_FUNCTION); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ (*grouping_level_p) += PARSER_GROUPING_LEVEL_INCREASE; new_was_seen = false; } @@ -1944,7 +1944,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ /* After 'new' unary operators are not allowed. */ new_was_seen = true; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* Check if "new.target" is written here. */ if (scanner_try_scan_new_target (context_p)) { @@ -1958,7 +1958,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ /* Found "new.target" return here */ return false; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } else if (new_was_seen || (*grouping_level_p == PARSE_EXPR_LEFT_HAND_SIDE) @@ -1974,7 +1974,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ /* Parse primary expression. */ switch (context_p->token.type) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LEXER_TEMPLATE_LITERAL: { if (context_p->source_p[-1] != LIT_CHAR_GRAVE_ACCENT) @@ -1986,10 +1986,10 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ /* The string is a normal string literal. */ /* FALLTHRU */ } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case LEXER_LITERAL: { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (context_p->next_scanner_info_p->source_p == context_p->source_p)) { JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_FUNCTION); @@ -2029,7 +2029,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ parser_parse_function_expression (context_p, arrow_status_flags); return parser_abort_parsing_after_assignment_expression (context_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ uint8_t type = context_p->token.lit_location.type; @@ -2039,14 +2039,14 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ &context_p->token.lit_location, context_p->token.lit_location.type); -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM if ((context_p->status_flags & PARSER_MODULE_STORE_IDENT) && type == LEXER_IDENT_LITERAL) { context_p->module_identifier_lit_p = context_p->lit_object.literal_p; context_p->status_flags &= (uint32_t) ~(PARSER_MODULE_STORE_IDENT); } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ } else if (type == LEXER_NUMBER_LITERAL) { @@ -2061,12 +2061,12 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ { is_negative_number = !is_negative_number; } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT else if (JERRY_LIKELY (context_p->token.extra_value == LEXER_NUMBER_BIGINT)) { break; } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ parser_stack_pop_uint8 (context_p); } while (context_p->stack_top_uint8 == LEXER_PLUS @@ -2121,7 +2121,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ } case LEXER_LEFT_BRACE: { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->next_scanner_info_p->source_p == context_p->source_p && context_p->next_scanner_info_p->type == SCANNER_TYPE_INITIALIZER) { @@ -2140,14 +2140,14 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ scanner_release_next (context_p, sizeof (scanner_location_info_t)); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_parse_object_literal (context_p); break; } case LEXER_LEFT_SQUARE: { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->next_scanner_info_p->source_p == context_p->source_p) { if (context_p->next_scanner_info_p->type == SCANNER_TYPE_INITIALIZER) @@ -2168,7 +2168,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ scanner_release_next (context_p, sizeof (scanner_info_t)); } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_parse_array_literal (context_p); break; @@ -2200,18 +2200,18 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ } case LEXER_KEYW_THIS: { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->status_flags & PARSER_ALLOW_SUPER_CALL) { parser_emit_cbc_ext (context_p, CBC_EXT_RESOLVE_LEXICAL_THIS); } else { -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_emit_cbc (context_p, CBC_PUSH_THIS); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ break; } case LEXER_LIT_TRUE: @@ -2229,7 +2229,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ parser_emit_cbc (context_p, CBC_PUSH_NULL); break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LEXER_KEYW_CLASS: { parser_parse_class (context_p, false); @@ -2304,7 +2304,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */ return (context_p->token.type != LEXER_RIGHT_PAREN && context_p->token.type != LEXER_COMMA); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { bool is_left_hand_side = (*grouping_level_p == PARSE_EXPR_LEFT_HAND_SIDE); @@ -2354,13 +2354,13 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ context_p->last_cbc_opcode = PARSER_CBC_UNAVAILABLE; parser_emit_cbc_literal_from_token (context_p, CBC_PUSH_PROP_THIS_LITERAL); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (context_p->last_cbc_opcode == PARSER_TO_EXT_OPCODE (CBC_EXT_PUSH_SUPER)) { context_p->last_cbc_opcode = PARSER_TO_EXT_OPCODE (CBC_EXT_PUSH_SUPER_PROP_LITERAL); context_p->last_cbc.literal_index = context_p->lit_object.index; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ else { parser_emit_cbc_literal_from_token (context_p, CBC_PUSH_PROP_LITERAL); @@ -2373,14 +2373,14 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ { parser_push_result (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint16_t last_cbc_opcode = context_p->last_cbc_opcode; if (last_cbc_opcode == PARSER_TO_EXT_OPCODE (CBC_EXT_PUSH_SUPER)) { context_p->last_cbc_opcode = PARSER_CBC_UNAVAILABLE; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_next_token (context_p); parser_parse_expression (context_p, PARSE_EXPR); @@ -2390,13 +2390,13 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ } lexer_next_token (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (last_cbc_opcode == PARSER_TO_EXT_OPCODE (CBC_EXT_PUSH_SUPER)) { parser_emit_cbc_ext (context_p, CBC_EXT_PUSH_SUPER_PROP); continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (PARSER_IS_MUTABLE_PUSH_LITERAL (context_p->last_cbc_opcode)) { @@ -2409,9 +2409,9 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ continue; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LEXER_TEMPLATE_LITERAL: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case LEXER_LEFT_PAREN: { size_t call_arguments = 0; @@ -2422,9 +2422,9 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ if (context_p->stack_top_uint8 == LEXER_KEYW_NEW) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->token.type == LEXER_LEFT_PAREN) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { parser_stack_pop_uint8 (context_p); opcode = CBC_NEW; @@ -2444,7 +2444,7 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ opcode = CBC_CALL_PROP; context_p->last_cbc_opcode = PARSER_PUSH_PROP_TO_PUSH_PROP_REFERENCE (context_p->last_cbc_opcode); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (context_p->last_cbc_opcode == PARSER_TO_EXT_OPCODE (CBC_EXT_PUSH_SUPER_CONSTRUCTOR)) { opcode = PARSER_TO_EXT_OPCODE (CBC_EXT_SUPER_CALL); @@ -2459,7 +2459,7 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ context_p->last_cbc_opcode = PARSER_TO_EXT_OPCODE (CBC_EXT_SUPER_PROP_REFERENCE); opcode = CBC_CALL_PROP; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ else if (JERRY_UNLIKELY (context_p->status_flags & PARSER_INSIDE_WITH) && PARSER_IS_PUSH_LITERALS_WITH_THIS (context_p->last_cbc_opcode) && context_p->last_cbc.literal_type == LEXER_IDENT_LITERAL) @@ -2470,7 +2470,7 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT bool has_spread_element = false; if (context_p->token.type == LEXER_TEMPLATE_LITERAL) @@ -2512,7 +2512,7 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ break; } } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ lexer_next_token (context_p); if (context_p->token.type != LEXER_RIGHT_PAREN) @@ -2538,7 +2538,7 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ parser_raise_error (context_p, PARSER_ERR_RIGHT_PAREN_EXPECTED); } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_next_token (context_p); @@ -2546,7 +2546,7 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ { context_p->status_flags |= PARSER_LEXICAL_ENV_NEEDED; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint16_t eval_flags = PARSER_SAVE_STATUS_FLAGS (context_p->status_flags); const uint32_t required_flags = PARSER_IS_FUNCTION | PARSER_LEXICAL_BLOCK_NEEDED; @@ -2567,14 +2567,14 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ } else { -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_emit_cbc (context_p, CBC_EVAL); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (has_spread_element) { uint16_t spread_opcode; @@ -2601,7 +2601,7 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ parser_emit_cbc_ext_call (context_p, spread_opcode, call_arguments); continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (call_arguments <= 1) { @@ -2668,9 +2668,9 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint8_t last_unary_token = LEXER_INCREASE; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* Generate byte code for the unary operators. */ while (true) @@ -2678,20 +2678,20 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ uint8_t token = context_p->stack_top_uint8; if (!LEXER_IS_UNARY_OP_TOKEN (token)) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->token.type == LEXER_EXPONENTIATION && last_unary_token != LEXER_INCREASE && last_unary_token != LEXER_DECREASE) { parser_raise_error (context_p, PARSER_ERR_INVALID_EXPONENTIATION); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT last_unary_token = token; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_push_result (context_p); parser_stack_pop_uint8 (context_p); @@ -2708,14 +2708,14 @@ parser_process_unary_expression (parser_context_t *context_p, /**< context */ } parser_emit_unary_lvalue_opcode (context_p, (cbc_opcode_t) token); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (JERRY_UNLIKELY (token == LEXER_KEYW_AWAIT)) { cbc_ext_opcode_t opcode = ((context_p->status_flags & PARSER_IS_GENERATOR_FUNCTION) ? CBC_EXT_GENERATOR_AWAIT : CBC_EXT_AWAIT); parser_emit_cbc_ext (context_p, opcode); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ else { token = (uint8_t) (LEXER_UNARY_OP_TOKEN_TO_OPCODE (token)); @@ -2806,7 +2806,7 @@ parser_append_binary_single_assignment_token (parser_context_t *context_p, /**< assign_opcode = CBC_ASSIGN_SET_IDENT; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (!(pattern_flags & (PARSER_PATTERN_LET | PARSER_PATTERN_CONST | PARSER_PATTERN_LOCAL))) { if (scanner_literal_is_const_reg (context_p, literal_index)) @@ -2831,7 +2831,7 @@ parser_append_binary_single_assignment_token (parser_context_t *context_p, /**< assign_opcode = CBC_INIT_ARG_OR_CATCH; } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_stack_push_uint16 (context_p, literal_index); JERRY_ASSERT (CBC_SAME_ARGS (CBC_PUSH_LITERAL, assign_opcode)); @@ -2874,7 +2874,7 @@ parser_append_binary_single_assignment_token (parser_context_t *context_p, /**< context_p->last_cbc_opcode = CBC_PUSH_THIS_LITERAL; } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (context_p->last_cbc_opcode == PARSER_TO_EXT_OPCODE (CBC_EXT_PUSH_SUPER_PROP_LITERAL)) { context_p->last_cbc_opcode = PARSER_TO_EXT_OPCODE (CBC_EXT_SUPER_PROP_LITERAL_ASSIGNMENT_REFERENCE); @@ -2885,23 +2885,23 @@ parser_append_binary_single_assignment_token (parser_context_t *context_p, /**< context_p->last_cbc_opcode = PARSER_TO_EXT_OPCODE (CBC_EXT_SUPER_PROP_ASSIGNMENT_REFERENCE); assign_opcode = CBC_ASSIGN_SUPER; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ else { /* Invalid LeftHandSide expression. */ //3820, 3815 -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT parser_check_invalid_new_target (context_p, CBC_ASSIGN); parser_raise_error (context_p, PARSER_ERR_INVALID_LHS_ASSIGNMENT); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ parser_emit_cbc_ext (context_p, CBC_EXT_THROW_REFERENCE_ERROR); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } parser_stack_push_uint8 (context_p, assign_opcode); parser_stack_push_uint8 (context_p, LEXER_ASSIGN); } /* parser_append_binary_single_assignment_token */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Check for invalid chain of logical operators @@ -2932,7 +2932,7 @@ parser_check_invalid_logical_op (parser_context_t *context_p, /**< context */ } } /* parser_check_invalid_logical_op */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Append a binary token. @@ -2958,12 +2958,12 @@ parser_append_binary_token (parser_context_t *context_p) /**< context */ parser_emit_ident_reference (context_p, CBC_PUSH_IDENT_REFERENCE); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (scanner_literal_is_const_reg (context_p, context_p->last_cbc.literal_index)) { parser_stack_push_uint8 (context_p, LEXER_ASSIGN_CONST); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } else if (PARSER_IS_PUSH_PROP (context_p->last_cbc_opcode)) { @@ -2972,12 +2972,12 @@ parser_append_binary_token (parser_context_t *context_p) /**< context */ else { /* Invalid LeftHandSide expression. */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT parser_check_invalid_new_target (context_p, CBC_ASSIGN); parser_raise_error (context_p, PARSER_ERR_INVALID_LHS_ASSIGNMENT); -#else /* !ENABLED (JERRY_ES2015) */ +#else /* !JERRY_ES2015 */ parser_emit_cbc_ext (context_p, CBC_EXT_THROW_REFERENCE_ERROR); -#endif /* ENABLED (JERRY_ES2015) */ +#endif /* JERRY_ES2015 */ parser_emit_cbc (context_p, CBC_PUSH_PROP_REFERENCE); } @@ -2993,16 +2993,16 @@ parser_append_binary_token (parser_context_t *context_p) /**< context */ opcode = CBC_BRANCH_IF_LOGICAL_FALSE; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT parser_check_invalid_logical_op (context_p, LEXER_NULLISH_COALESCING, LEXER_NULLISH_COALESCING); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_emit_cbc_forward_branch (context_p, opcode, &branch); parser_stack_push (context_p, &branch, sizeof (parser_branch_t)); parser_stack_push_uint8 (context_p, context_p->token.type); return; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (context_p->token.type == LEXER_NULLISH_COALESCING) { parser_branch_t branch; @@ -3013,7 +3013,7 @@ parser_append_binary_token (parser_context_t *context_p) /**< context */ parser_stack_push_uint8 (context_p, context_p->token.type); return; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_stack_push_uint8 (context_p, context_p->token.type); } /* parser_append_binary_token */ @@ -3065,7 +3065,7 @@ parser_process_binary_opcodes (parser_context_t *context_p, /**< context */ index = parser_stack_pop_uint16 (context_p); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT bool group_expr_assingment = false; if (JERRY_UNLIKELY (context_p->stack_top_uint8 == LEXER_ASSIGN_GROUP_EXPR)) @@ -3079,11 +3079,11 @@ parser_process_binary_opcodes (parser_context_t *context_p, /**< context */ parser_stack_pop_uint8 (context_p); parser_emit_cbc_ext (context_p, CBC_EXT_THROW_ASSIGN_CONST_ERROR); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (index != PARSER_INVALID_LITERAL_INDEX) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (!group_expr_assingment) { uint16_t function_literal_index = parser_check_anonymous_function_declaration (context_p); @@ -3098,7 +3098,7 @@ parser_process_binary_opcodes (parser_context_t *context_p, /**< context */ parser_set_function_name (context_p, function_literal_index, (uint16_t) index, 0); } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (context_p->last_cbc_opcode == CBC_PUSH_LITERAL && opcode == CBC_ASSIGN_SET_IDENT) @@ -3143,7 +3143,7 @@ parser_process_binary_opcodes (parser_context_t *context_p, /**< context */ parser_set_branch_to_current_position (context_p, &branch); continue; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (token == LEXER_NULLISH_COALESCING) { parser_branch_t branch; @@ -3151,7 +3151,7 @@ parser_process_binary_opcodes (parser_context_t *context_p, /**< context */ parser_set_branch_to_current_position (context_p, &branch); continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ else { opcode = LEXER_BINARY_OP_TOKEN_TO_OPCODE (token); @@ -3179,7 +3179,7 @@ parser_process_binary_opcodes (parser_context_t *context_p, /**< context */ } } /* parser_process_binary_opcodes */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * End position marker of a pattern. */ @@ -3357,7 +3357,7 @@ parser_pattern_form_assignment (parser_context_t *context_p, /**< context */ JERRY_ASSERT (context_p->stack_top_uint8 == LEXER_EXPRESSION_START); parser_stack_pop_uint8 (context_p); -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if ((JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) && ident_line_counter != context_p->last_breakpoint_line) { @@ -3368,14 +3368,14 @@ parser_pattern_form_assignment (parser_context_t *context_p, /**< context */ context_p->last_breakpoint_line = ident_line_counter; } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ -#if ENABLED (JERRY_LINE_INFO) +#if JERRY_LINE_INFO if (ident_line_counter != context_p->last_line_info_line) { parser_emit_line_info (context_p, ident_line_counter, false); } -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ } /* parser_pattern_form_assignment */ /** @@ -3494,9 +3494,9 @@ parser_pattern_process_assignment (parser_context_t *context_p, /**< context */ } context_p->lit_object.literal_p->status_flags |= LEXER_FLAG_FUNCTION_ARGUMENT; } -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM parser_module_append_export_name (context_p); -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ parser_emit_cbc_literal_from_token (context_p, CBC_PUSH_LITERAL); lexer_next_token (context_p); @@ -3689,9 +3689,9 @@ parser_parse_object_initializer (parser_context_t *context_p, /**< context */ context_p->lit_object.literal_p->status_flags |= LEXER_FLAG_FUNCTION_ARGUMENT; } -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM parser_module_append_export_name (context_p); -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ parser_emit_cbc_literal_from_token (context_p, CBC_PUSH_LITERAL); @@ -3777,7 +3777,7 @@ parser_parse_initializer_by_next_char (parser_context_t *context_p, /**< context } } /* parser_parse_initializer_by_next_char */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Process ternary expression. @@ -3874,7 +3874,7 @@ parser_process_group_expression (parser_context_t *context_p, /**< context */ parser_stack_pop_uint8 (context_p); lexer_next_token (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* Lookahead for anonymous function declaration after '=' token when the assignment base is LHS expression with a single indentifier in it. e.g.: (a) = function () {} */ if (JERRY_UNLIKELY (context_p->token.type == LEXER_ASSIGN @@ -3885,7 +3885,7 @@ parser_process_group_expression (parser_context_t *context_p, /**< context */ { parser_stack_push_uint8 (context_p, LEXER_ASSIGN_GROUP_EXPR); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* parser_process_group_expression */ /** @@ -3963,16 +3963,16 @@ process_unary_expression: if (LEXER_IS_BINARY_OP_TOKEN (context_p->token.type)) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (context_p->token.type == LEXER_NULLISH_COALESCING)) { parser_check_invalid_logical_op (context_p, LEXER_LOGICAL_OR, LEXER_LOGICAL_AND); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ min_prec_treshold = parser_binary_precedence_table[context_p->token.type - LEXER_FIRST_BINARY_OP]; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* Check for BINARY_LVALUE tokens + LEXER_LOGICAL_OR + LEXER_LOGICAL_AND + LEXER_EXPONENTIATION */ if ((min_prec_treshold == PARSER_RIGHT_TO_LEFT_ORDER_EXPONENTIATION) || (min_prec_treshold <= PARSER_RIGHT_TO_LEFT_ORDER_MAX_PRECEDENCE @@ -3981,7 +3981,7 @@ process_unary_expression: /* Right-to-left evaluation order. */ min_prec_treshold++; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ /* Check for BINARY_LVALUE tokens + LEXER_LOGICAL_OR + LEXER_LOGICAL_AND */ if (min_prec_treshold <= PARSER_RIGHT_TO_LEFT_ORDER_MAX_PRECEDENCE && min_prec_treshold != PARSER_RIGHT_TO_LEFT_ORDER_TERNARY_PRECEDENCE) @@ -3989,7 +3989,7 @@ process_unary_expression: /* Right-to-left evaluation order. */ min_prec_treshold++; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } parser_process_binary_opcodes (context_p, min_prec_treshold); @@ -4056,4 +4056,4 @@ process_unary_expression: * @} */ -#endif /* ENABLED (JERRY_PARSER) */ +#endif /* JERRY_PARSER */ diff --git a/jerry-core/parser/js/js-parser-internal.h b/jerry-core/parser/js/js-parser-internal.h index 561806c50..28c233be6 100644 --- a/jerry-core/parser/js/js-parser-internal.h +++ b/jerry-core/parser/js/js-parser-internal.h @@ -57,7 +57,7 @@ typedef enum * after the last byte code */ PARSER_DEBUGGER_BREAKPOINT_APPENDED = (1u << 11), /**< pending (unsent) breakpoint * info is available */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT PARSER_LEXICAL_BLOCK_NEEDED = (1u << 12), /**< global script: needs a lexical environment for let and const * function: needs a lexical environment for arguments */ PARSER_IS_ARROW_FUNCTION = (1u << 13), /**< an arrow function is parsed */ @@ -76,11 +76,11 @@ typedef enum PARSER_INSIDE_CLASS_FIELD = (1u << 23), /**< a class field is being parsed */ PARSER_ALLOW_NEW_TARGET = (1u << 24), /**< allow new.target parsing in the current context */ PARSER_IS_METHOD = (1u << 25), /**< method is parsed */ -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_MODULE_SYSTEM) +#endif /* JERRY_ESNEXT */ +#if JERRY_MODULE_SYSTEM PARSER_MODULE_DEFAULT_CLASS_OR_FUNC = (1u << 26), /**< parsing a function or class default export */ PARSER_MODULE_STORE_IDENT = (1u << 27), /**< store identifier of the current export statement */ -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ PARSER_HAS_LATE_LIT_INIT = (1u << 30), /**< there are identifier or string literals which construction * is postponed after the local parser data is freed */ #ifndef JERRY_NDEBUG @@ -125,13 +125,13 @@ typedef enum typedef enum { PARSER_CHECK_BLOCK_CONTEXT, /**< check block context */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT PARSER_CHECK_GLOBAL_CONTEXT, /**< check global context */ PARSER_CHECK_FUNCTION_CONTEXT, /**< check function context */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } parser_check_context_type_t; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Class field bits. @@ -144,7 +144,7 @@ typedef enum PARSER_CLASS_FIELD_STATIC = (1u << 3), /**< static class field */ } parser_class_field_type_t; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Mask for strict mode code @@ -168,7 +168,7 @@ typedef enum #define PARSER_MAX_BRANCH_LENGTH 3 #endif /* PARSER_MAXIMUM_CODE_SIZE <= UINT16_MAX */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Offset of PARSER_ALLOW_SUPER */ @@ -223,7 +223,7 @@ typedef enum #define PARSER_IS_NORMAL_ASYNC_FUNCTION(status_flags) \ (((status_flags) & (PARSER_IS_GENERATOR_FUNCTION | PARSER_IS_ASYNC_FUNCTION)) == PARSER_IS_ASYNC_FUNCTION) -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ /** * All flags that affect exotic arguments object creation. @@ -231,7 +231,7 @@ typedef enum #define PARSER_ARGUMENTS_RELATED_FLAGS \ (PARSER_ARGUMENTS_NEEDED | PARSER_IS_STRICT) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* Checks whether unmapped arguments are needed. */ #define PARSER_NEEDS_MAPPED_ARGUMENTS(status_flags) \ @@ -419,7 +419,7 @@ typedef struct */ #define PARSER_SCOPE_STACK_FUNC 0xffff -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Mask for decoding the register index of map_to @@ -442,7 +442,7 @@ typedef struct */ #define PARSER_SCOPE_STACK_IS_LOCAL_CREATED (PARSER_SCOPE_STACK_IS_CONST_REG) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Starting literal index for registers. @@ -473,7 +473,7 @@ typedef struct struct scanner_context_t; typedef struct scanner_context_t scanner_context_t; -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER /** * Extra information for each breakpoint. */ @@ -488,7 +488,7 @@ typedef struct #define PARSER_MAX_BREAKPOINT_INFO_COUNT \ (JERRY_DEBUGGER_TRANSPORT_MAX_BUFFER_SIZE / sizeof (parser_breakpoint_info_t)) -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ /** * Those members of a context which needs @@ -505,9 +505,9 @@ typedef struct parser_saved_context_t /* Literal types */ uint16_t argument_count; /**< number of function arguments */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint16_t argument_length; /**< length property of arguments */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ uint16_t register_count; /**< number of registers */ uint16_t literal_count; /**< number of literals */ @@ -519,10 +519,10 @@ typedef struct parser_saved_context_t uint16_t scope_stack_size; /**< size of scope stack */ uint16_t scope_stack_top; /**< preserved top of scope stack */ uint16_t scope_stack_reg_top; /**< preserved top register of scope stack */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint16_t scope_stack_global_end; /**< end of global declarations of a function */ ecma_value_t tagged_template_literal_cp; /**< compessed pointer to the tagged template literal collection */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #ifndef JERRY_NDEBUG uint16_t context_stack_depth; /**< current context stack depth */ @@ -553,10 +553,10 @@ typedef struct parser_saved_context_t *last_context_p; /**< last saved context */ parser_stack_iterator_t last_statement; /**< last statement position */ -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM ecma_module_node_t *module_current_node_p; /**< import / export node that is being processed */ lexer_literal_t *module_identifier_lit_p; /**< the literal for the identifier of the current element */ -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ /* Lexer members. */ lexer_token_t token; /**< current token */ @@ -578,9 +578,9 @@ typedef struct /* Literal types */ uint16_t argument_count; /**< number of function arguments */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint16_t argument_length; /**< length property of arguments */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ uint16_t register_count; /**< number of registers */ uint16_t literal_count; /**< number of literals */ @@ -594,10 +594,10 @@ typedef struct uint16_t scope_stack_size; /**< size of scope stack */ uint16_t scope_stack_top; /**< current top of scope stack */ uint16_t scope_stack_reg_top; /**< current top register of scope stack */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint16_t scope_stack_global_end; /**< end of global declarations of a function */ ecma_value_t tagged_template_literal_cp; /**< compessed pointer to the tagged template literal collection */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ uint8_t stack_top_uint8; /**< top byte stored on the stack */ #ifndef JERRY_NDEBUG @@ -605,24 +605,24 @@ typedef struct uint16_t context_stack_depth; /**< current context stack depth */ #endif /* !JERRY_NDEBUG */ -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE int is_show_opcodes; /**< show opcodes */ uint32_t total_byte_code_size; /**< total byte code size */ -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER parser_breakpoint_info_t breakpoint_info[PARSER_MAX_BREAKPOINT_INFO_COUNT]; /**< breakpoint info list */ uint16_t breakpoint_info_count; /**< current breakpoint index */ parser_line_counter_t last_breakpoint_line; /**< last line where breakpoint has been inserted */ -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ -#if ENABLED (JERRY_RESOURCE_NAME) +#if JERRY_RESOURCE_NAME ecma_value_t resource_name; /**< resource name */ -#endif /* ENABLED (JERRY_RESOURCE_NAME) */ +#endif /* JERRY_RESOURCE_NAME */ -#if ENABLED (JERRY_LINE_INFO) +#if JERRY_LINE_INFO parser_line_counter_t last_line_info_line; /**< last line where line info has been inserted */ -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ } parser_context_t; /** @@ -728,9 +728,9 @@ void parser_set_continues_to_current_position (parser_context_t *context_p, pars #define parser_emit_cbc_ext_backward_branch(context_p, opcode, offset) \ parser_emit_cbc_backward_branch ((context_p), PARSER_TO_EXT_OPCODE (opcode), (offset)) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT void parser_reverse_class_fields (parser_context_t *context_p, size_t fields_size); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} @@ -747,7 +747,7 @@ bool lexer_check_next_characters (parser_context_t *context_p, lit_utf8_byte_t c lit_utf8_byte_t character2); uint8_t lexer_consume_next_character (parser_context_t *context_p); bool lexer_check_post_primary_exp (parser_context_t *context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT void lexer_skip_empty_statements (parser_context_t *context_p); bool lexer_check_arrow (parser_context_t *context_p); bool lexer_check_arrow_param (parser_context_t *context_p); @@ -755,7 +755,7 @@ bool lexer_check_yield_no_arg (parser_context_t *context_p); bool lexer_consume_generator (parser_context_t *context_p); bool lexer_consume_assign (parser_context_t *context_p); void lexer_update_await_yield (parser_context_t *context_p, uint32_t status_flags); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ void lexer_parse_string (parser_context_t *context_p, lexer_string_options_t opts); void lexer_expect_identifier (parser_context_t *context_p, uint8_t literal_type); bool lexer_scan_identifier (parser_context_t *context_p); @@ -778,12 +778,12 @@ bool lexer_compare_identifiers (parser_context_t *context_p, const lexer_lit_loc bool lexer_current_is_literal (parser_context_t *context_p, const lexer_lit_location_t *right_ident_p); bool lexer_string_is_use_strict (parser_context_t *context_p); bool lexer_string_is_directive (parser_context_t *context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT bool lexer_token_is_identifier (parser_context_t *context_p, const char *identifier_p, size_t identifier_length); bool lexer_token_is_let (parser_context_t *context_p); bool lexer_token_is_async (parser_context_t *context_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ bool lexer_compare_literal_to_string (parser_context_t *context_p, const char *string_p, size_t string_length); uint8_t lexer_convert_binary_lvalue_token_to_binary (uint8_t token); @@ -799,11 +799,11 @@ uint8_t lexer_convert_binary_lvalue_token_to_binary (uint8_t token); void parser_parse_block_expression (parser_context_t *context_p, int options); void parser_parse_expression_statement (parser_context_t *context_p, int options); void parser_parse_expression (parser_context_t *context_p, int options); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT void parser_parse_class (parser_context_t *context_p, bool is_statement); void parser_parse_initializer (parser_context_t *context_p, parser_pattern_flags_t flags); void parser_parse_initializer_by_next_char (parser_context_t *context_p, parser_pattern_flags_t flags); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} @@ -822,21 +822,21 @@ void scanner_reverse_info_list (parser_context_t *context_p); void scanner_cleanup (parser_context_t *context_p); bool scanner_is_context_needed (parser_context_t *context_p, parser_check_context_type_t check_type); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT bool scanner_try_scan_new_target (parser_context_t *context_p); void scanner_check_variables (parser_context_t *context_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ void scanner_create_variables (parser_context_t *context_p, uint32_t option_flags); void scanner_get_location (scanner_location_t *location_p, parser_context_t *context_p); void scanner_set_location (parser_context_t *context_p, scanner_location_t *location_p); uint16_t scanner_decode_map_to (parser_scope_stack_t *stack_item_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint16_t scanner_save_literal (parser_context_t *context_p, uint16_t ident_index); bool scanner_literal_is_const_reg (parser_context_t *context_p, uint16_t literal_index); bool scanner_literal_is_created (parser_context_t *context_p, uint16_t literal_index); bool scanner_literal_exists (parser_context_t *context_p, uint16_t literal_index); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ void scanner_scan_all (parser_context_t *context_p, const uint8_t *arg_list_p, const uint8_t *arg_list_end_p, const uint8_t *source_p, const uint8_t *source_end_p); @@ -851,7 +851,7 @@ void scanner_scan_all (parser_context_t *context_p, const uint8_t *arg_list_p, c void parser_parse_statements (parser_context_t *context_p); void parser_free_jumps (parser_stack_iterator_t iterator); -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM /** * @} * @@ -877,7 +877,7 @@ void parser_module_add_names_to_node (parser_context_t *context_p, ecma_string_t *imex_name_p, ecma_string_t *local_name_p); -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ /** * @} @@ -887,7 +887,7 @@ void parser_module_add_names_to_node (parser_context_t *context_p, */ ecma_compiled_code_t *parser_parse_function (parser_context_t *context_p, uint32_t status_flags); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_compiled_code_t *parser_parse_arrow_function (parser_context_t *context_p, uint32_t status_flags); ecma_compiled_code_t *parser_parse_class_fields (parser_context_t *context_p); void parser_set_function_name (parser_context_t *context_p, uint16_t function_literal_index, uint16_t name_index, @@ -895,7 +895,7 @@ void parser_set_function_name (parser_context_t *context_p, uint16_t function_li void parser_compiled_code_set_function_name (parser_context_t *context_p, ecma_compiled_code_t *bytecode_p, uint16_t name_index, uint32_t status_flags); uint16_t parser_check_anonymous_function_declaration (parser_context_t *context_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* Error management. */ @@ -903,21 +903,21 @@ void parser_raise_error (parser_context_t *context_p, parser_error_t error); /* Debug functions. */ -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER void parser_append_breakpoint_info (parser_context_t *context_p, jerry_debugger_header_type_t type, uint32_t value); -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ -#if ENABLED (JERRY_LINE_INFO) +#if JERRY_LINE_INFO void parser_emit_line_info (parser_context_t *context_p, uint32_t line, bool flush_cbc); -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE void util_print_cbc (ecma_compiled_code_t *compiled_code_p); -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ /** * @} diff --git a/jerry-core/parser/js/js-parser-limits.h b/jerry-core/parser/js/js-parser-limits.h index b150b2e80..0eb9b5387 100644 --- a/jerry-core/parser/js/js-parser-limits.h +++ b/jerry-core/parser/js/js-parser-limits.h @@ -38,11 +38,11 @@ * Maximum string limit. * Limit: 2147483647 / 65535. */ -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT #define PARSER_MAXIMUM_STRING_LIMIT 2147483647 -#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* !JERRY_CPOINTER_32_BIT */ #define PARSER_MAXIMUM_STRING_LIMIT 65535 -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ /** * Maximum string length. diff --git a/jerry-core/parser/js/js-parser-mem.c b/jerry-core/parser/js/js-parser-mem.c index d49134bb0..38fe55bfb 100644 --- a/jerry-core/parser/js/js-parser-mem.c +++ b/jerry-core/parser/js/js-parser-mem.c @@ -15,7 +15,7 @@ #include "js-parser-internal.h" -#if ENABLED (JERRY_PARSER) +#if JERRY_PARSER /** \addtogroup mem Memory allocation * @{ @@ -753,4 +753,4 @@ parser_stack_iterator_write (parser_stack_iterator_t *iterator, /**< iterator */ * @} */ -#endif /* ENABLED (JERRY_PARSER) */ +#endif /* JERRY_PARSER */ diff --git a/jerry-core/parser/js/js-parser-module.c b/jerry-core/parser/js/js-parser-module.c index d8fb7b9af..9ddce8078 100644 --- a/jerry-core/parser/js/js-parser-module.c +++ b/jerry-core/parser/js/js-parser-module.c @@ -15,7 +15,7 @@ #include "js-parser-internal.h" -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM #include "jcontext.h" #include "jerryscript-port.h" @@ -574,4 +574,4 @@ module_found: lexer_next_token (context_p); } /* parser_module_handle_module_specifier */ -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ diff --git a/jerry-core/parser/js/js-parser-statm.c b/jerry-core/parser/js/js-parser-statm.c index cbacf63df..054dae177 100644 --- a/jerry-core/parser/js/js-parser-statm.c +++ b/jerry-core/parser/js/js-parser-statm.c @@ -15,7 +15,7 @@ #include "js-parser-internal.h" -#if ENABLED (JERRY_PARSER) +#if JERRY_PARSER #include "jcontext.h" #include "ecma-helpers.h" @@ -43,12 +43,12 @@ typedef enum { PARSER_STATEMENT_START, PARSER_STATEMENT_BLOCK, -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT PARSER_STATEMENT_BLOCK_SCOPE, PARSER_STATEMENT_PRIVATE_SCOPE, PARSER_STATEMENT_BLOCK_CONTEXT, PARSER_STATEMENT_PRIVATE_CONTEXT, -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ PARSER_STATEMENT_LABEL, PARSER_STATEMENT_IF, PARSER_STATEMENT_ELSE, @@ -58,10 +58,10 @@ typedef enum PARSER_STATEMENT_WHILE, PARSER_STATEMENT_FOR, PARSER_STATEMENT_FOR_IN, -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT PARSER_STATEMENT_FOR_OF, PARSER_STATEMENT_FOR_AWAIT_OF, -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ PARSER_STATEMENT_WITH, PARSER_STATEMENT_TRY, } parser_statement_type_t; @@ -89,7 +89,7 @@ static const uint8_t parser_statement_flags[] = PARSER_STATM_HAS_BLOCK, /* PARSER_STATEMENT_BLOCK, */ PARSER_STATM_HAS_BLOCK, -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* PARSER_STATEMENT_BLOCK_SCOPE, */ PARSER_STATM_HAS_BLOCK, /* PARSER_STATEMENT_PRIVATE_SCOPE, */ @@ -98,7 +98,7 @@ static const uint8_t parser_statement_flags[] = PARSER_STATM_HAS_BLOCK | PARSER_STATM_CONTEXT_BREAK, /* PARSER_STATEMENT_PRIVATE_CONTEXT, */ PARSER_STATM_CONTEXT_BREAK, -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* PARSER_STATEMENT_LABEL */ PARSER_STATM_SINGLE_STATM, /* PARSER_STATEMENT_IF */ @@ -117,19 +117,19 @@ static const uint8_t parser_statement_flags[] = PARSER_STATM_BREAK_TARGET | PARSER_STATM_CONTINUE_TARGET | PARSER_STATM_SINGLE_STATM, /* PARSER_STATEMENT_FOR_IN */ PARSER_STATM_BREAK_TARGET | PARSER_STATM_CONTINUE_TARGET | PARSER_STATM_SINGLE_STATM | PARSER_STATM_CONTEXT_BREAK, -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* PARSER_STATEMENT_FOR_OF */ PARSER_STATM_BREAK_TARGET | PARSER_STATM_CONTINUE_TARGET | PARSER_STATM_SINGLE_STATM | PARSER_STATM_CONTEXT_BREAK, /* PARSER_STATEMENT_FOR_AWAIT_OF */ PARSER_STATM_BREAK_TARGET | PARSER_STATM_CONTINUE_TARGET | PARSER_STATM_SINGLE_STATM | PARSER_STATM_CONTEXT_BREAK, -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* PARSER_STATEMENT_WITH */ PARSER_STATM_CONTEXT_BREAK | PARSER_STATM_SINGLE_STATM, /* PARSER_STATEMENT_TRY */ PARSER_STATM_HAS_BLOCK | PARSER_STATM_CONTEXT_BREAK }; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Block statement. */ @@ -147,7 +147,7 @@ typedef struct parser_branch_t branch; /**< branch to the end */ } parser_block_context_t; -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ /** * Loop statement. @@ -263,7 +263,7 @@ parser_statement_length (uint8_t type) /**< type of statement */ { /* PARSER_STATEMENT_BLOCK */ 1, -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* PARSER_STATEMENT_BLOCK_SCOPE */ (uint8_t) (sizeof (parser_block_statement_t) + 1), /* PARSER_STATEMENT_PRIVATE_SCOPE */ @@ -272,7 +272,7 @@ parser_statement_length (uint8_t type) /**< type of statement */ (uint8_t) (sizeof (parser_block_statement_t) + sizeof (parser_block_context_t) + 1), /* PARSER_STATEMENT_PRIVATE_CONTEXT */ (uint8_t) (sizeof (parser_block_statement_t) + sizeof (parser_block_context_t) + 1), -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* PARSER_STATEMENT_LABEL */ (uint8_t) (sizeof (parser_label_statement_t) + 1), /* PARSER_STATEMENT_IF */ @@ -291,12 +291,12 @@ parser_statement_length (uint8_t type) /**< type of statement */ (uint8_t) (sizeof (parser_for_statement_t) + sizeof (parser_loop_statement_t) + 1), /* PARSER_STATEMENT_FOR_IN */ (uint8_t) (sizeof (parser_for_in_of_statement_t) + sizeof (parser_loop_statement_t) + 1), -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* PARSER_STATEMENT_FOR_OF */ (uint8_t) (sizeof (parser_for_in_of_statement_t) + sizeof (parser_loop_statement_t) + 1), /* PARSER_STATEMENT_FOR_AWAIT_OF */ (uint8_t) (sizeof (parser_for_in_of_statement_t) + sizeof (parser_loop_statement_t) + 1), -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* PARSER_STATEMENT_WITH */ (uint8_t) (sizeof (parser_with_statement_t) + 1 + 1), /* PARSER_STATEMENT_TRY */ @@ -330,7 +330,7 @@ parser_parse_enclosed_expr (parser_context_t *context_p) /**< context */ lexer_next_token (context_p); } /* parser_parse_enclosed_expr */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Create a block context. @@ -436,7 +436,7 @@ parser_validate_lexical_context (parser_context_t *context_p) /**< context */ parser_raise_error (context_p, PARSER_ERR_LEXICAL_SINGLE_STATEMENT); } } /* parser_validate_lexical_context */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Parse var statement. @@ -448,18 +448,18 @@ parser_parse_var_statement (parser_context_t *context_p) /**< context */ || context_p->token.type == LEXER_KEYW_LET || context_p->token.type == LEXER_KEYW_CONST); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint8_t declaration_type = context_p->token.type; if (declaration_type != LEXER_KEYW_VAR) { parser_validate_lexical_context (context_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ while (true) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (lexer_check_next_characters (context_p, LIT_CHAR_LEFT_SQUARE, LIT_CHAR_LEFT_BRACE)) { parser_pattern_flags_t flags = PARSER_PATTERN_BINDING; @@ -477,20 +477,20 @@ parser_parse_var_statement (parser_context_t *context_p) /**< context */ } else { -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_expect_identifier (context_p, LEXER_IDENT_LITERAL); JERRY_ASSERT (context_p->token.type == LEXER_LITERAL && context_p->token.lit_location.type == LEXER_IDENT_LITERAL); -#if ENABLED (JERRY_DEBUGGER) || ENABLED (JERRY_LINE_INFO) +#if JERRY_DEBUGGER || JERRY_LINE_INFO parser_line_counter_t ident_line_counter = context_p->token.line; -#endif /* ENABLED (JERRY_DEBUGGER) || ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_DEBUGGER || JERRY_LINE_INFO */ -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM parser_module_append_export_name (context_p); -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (declaration_type != LEXER_KEYW_VAR && context_p->token.keyword_type == LEXER_KEYW_LET) { @@ -502,13 +502,13 @@ parser_parse_var_statement (parser_context_t *context_p) /**< context */ JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_ERR_REDECLARED); parser_raise_error (context_p, PARSER_ERR_VARIABLE_REDECLARED); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_next_token (context_p); if (context_p->token.type == LEXER_ASSIGN) { -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if ((JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) && ident_line_counter != context_p->last_breakpoint_line) { @@ -519,14 +519,14 @@ parser_parse_var_statement (parser_context_t *context_p) /**< context */ context_p->last_breakpoint_line = ident_line_counter; } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ -#if ENABLED (JERRY_LINE_INFO) +#if JERRY_LINE_INFO if (ident_line_counter != context_p->last_line_info_line) { parser_emit_line_info (context_p, ident_line_counter, false); } -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ uint16_t index = context_p->lit_object.index; @@ -535,7 +535,7 @@ parser_parse_var_statement (parser_context_t *context_p) /**< context */ cbc_opcode_t opcode = CBC_ASSIGN_SET_IDENT; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint16_t function_literal_index = parser_check_anonymous_function_declaration (context_p); if (function_literal_index == PARSER_ANONYMOUS_CLASS) @@ -562,11 +562,11 @@ parser_parse_var_statement (parser_context_t *context_p) /**< context */ opcode = CBC_INIT_CONST; } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_emit_cbc_literal (context_p, (uint16_t) opcode, index); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (declaration_type == LEXER_KEYW_LET) { parser_emit_cbc (context_p, CBC_PUSH_UNDEFINED); @@ -587,7 +587,7 @@ parser_parse_var_statement (parser_context_t *context_p) /**< context */ parser_raise_error (context_p, PARSER_ERR_MISSING_ASSIGN_AFTER_CONST); } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (context_p->token.type != LEXER_COMMA) { @@ -595,9 +595,9 @@ parser_parse_var_statement (parser_context_t *context_p) /**< context */ } } -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM context_p->status_flags &= (uint32_t) ~(PARSER_MODULE_STORE_IDENT); -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ } /* parser_parse_var_statement */ /** @@ -608,7 +608,7 @@ parser_parse_function_statement (parser_context_t *context_p) /**< context */ { JERRY_ASSERT (context_p->token.type == LEXER_KEYW_FUNCTION); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (parser_statement_flags[context_p->stack_top_uint8] & PARSER_STATM_SINGLE_STATM)) { if (context_p->status_flags & PARSER_IS_STRICT) @@ -654,27 +654,27 @@ parser_parse_function_statement (parser_context_t *context_p) /**< context */ parser_raise_error (context_p, PARSER_ERR_LEXICAL_SINGLE_STATEMENT); } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER parser_line_counter_t debugger_line = context_p->token.line; parser_line_counter_t debugger_column = context_p->token.column; -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT bool is_generator_function = false; if (lexer_consume_generator (context_p)) { is_generator_function = true; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_expect_identifier (context_p, LEXER_NEW_IDENT_LITERAL); JERRY_ASSERT (context_p->token.type == LEXER_LITERAL && context_p->token.lit_location.type == LEXER_IDENT_LITERAL); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->next_scanner_info_p->source_p == context_p->source_p && context_p->next_scanner_info_p->type == SCANNER_TYPE_ERR_REDECLARED) { @@ -682,12 +682,12 @@ parser_parse_function_statement (parser_context_t *context_p) /**< context */ } uint16_t function_name_index = context_p->lit_object.index; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM parser_module_append_export_name (context_p); context_p->status_flags &= (uint32_t) ~(PARSER_MODULE_STORE_IDENT); -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ uint32_t status_flags = PARSER_FUNCTION_CLOSURE; @@ -696,7 +696,7 @@ parser_parse_function_statement (parser_context_t *context_p) /**< context */ status_flags |= PARSER_HAS_NON_STRICT_ARG; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (is_generator_function) { status_flags |= PARSER_IS_GENERATOR_FUNCTION | PARSER_DISALLOW_AWAIT_YIELD; @@ -706,9 +706,9 @@ parser_parse_function_statement (parser_context_t *context_p) /**< context */ { status_flags |= PARSER_IS_ASYNC_FUNCTION | PARSER_DISALLOW_AWAIT_YIELD; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) { lexer_literal_t *name_p = context_p->lit_object.literal_p; @@ -721,7 +721,7 @@ parser_parse_function_statement (parser_context_t *context_p) /**< context */ context_p->token.line = debugger_line; context_p->token.column = debugger_column; } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ JERRY_ASSERT (context_p->scope_stack_top >= 2); parser_scope_stack_t *scope_stack_p = context_p->scope_stack_p + context_p->scope_stack_top - 2; @@ -737,7 +737,7 @@ parser_parse_function_statement (parser_context_t *context_p) /**< context */ JERRY_ASSERT (scope_stack_p[1].map_from == PARSER_SCOPE_STACK_FUNC); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (!(context_p->status_flags & PARSER_IS_STRICT) && (scope_stack_p >= context_p->scope_stack_p + context_p->scope_stack_global_end)) { @@ -788,7 +788,7 @@ parser_parse_function_statement (parser_context_t *context_p) /**< context */ parser_pop_block_context (context_p); } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_literal_t *literal_p = PARSER_GET_LITERAL ((size_t) scope_stack_p[1].map_to); @@ -805,9 +805,9 @@ parser_parse_function_statement (parser_context_t *context_p) /**< context */ literal_p->u.bytecode_p = compiled_code_p; literal_p->type = LEXER_FUNCTION_LITERAL; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT parser_compiled_code_set_function_name (context_p, compiled_code_p, function_name_index, 0); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_next_token (context_p); } /* parser_parse_function_statement */ @@ -1146,11 +1146,11 @@ parser_check_left_hand_side_expression (parser_context_t *context_p, /**< contex else { /* Invalid LeftHandSide expression. */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT parser_raise_error (context_p, PARSER_ERR_INVALID_LHS_FOR_LOOP); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ parser_emit_cbc_ext (context_p, CBC_EXT_THROW_REFERENCE_ERROR); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return CBC_ASSIGN; } @@ -1169,7 +1169,7 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ JERRY_ASSERT (context_p->token.type == LEXER_KEYW_FOR); lexer_next_token (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT bool is_for_await = false; if (context_p->token.type == LEXER_KEYW_AWAIT) @@ -1181,18 +1181,18 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ lexer_next_token (context_p); is_for_await = true; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (context_p->token.type != LEXER_LEFT_PAREN) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->token.type == LEXER_LITERAL && context_p->token.keyword_type == LEXER_KEYW_AWAIT && !context_p->token.lit_location.has_escape) { parser_raise_error (context_p, PARSER_ERR_FOR_AWAIT_NO_ASYNC); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_raise_error (context_p, PARSER_ERR_LEFT_PAREN_EXPECTED); } @@ -1201,7 +1201,7 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ parser_for_in_of_statement_t for_in_of_statement; scanner_location_t start_location, end_location; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_FOR_IN || context_p->next_scanner_info_p->type == SCANNER_TYPE_FOR_OF); @@ -1253,7 +1253,7 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ } scanner_set_location (context_p, &end_location); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_FOR_IN); bool is_for_in = true; @@ -1261,21 +1261,21 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ scanner_set_location (context_p, &((scanner_location_info_t *) context_p->next_scanner_info_p)->location); scanner_release_next (context_p, sizeof (scanner_location_info_t)); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* The length of both 'in' and 'of' is two. */ const uint8_t *source_end_p = context_p->source_p - 2; scanner_seek (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (is_for_in && is_for_await) { context_p->token.line = context_p->line; context_p->token.column = context_p->column - 2; parser_raise_error (context_p, PARSER_ERR_FOR_AWAIT_NO_OF); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_next_token (context_p); parser_parse_expression (context_p, PARSE_EXPR); @@ -1293,24 +1293,24 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ cbc_ext_opcode_t init_opcode = CBC_EXT_FOR_IN_INIT; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (!is_for_in) { init_opcode = is_for_await ? CBC_EXT_FOR_AWAIT_OF_INIT : CBC_EXT_FOR_OF_INIT; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_emit_cbc_ext_forward_branch (context_p, init_opcode, &for_in_of_statement.branch); JERRY_ASSERT (context_p->last_cbc_opcode == PARSER_CBC_UNAVAILABLE); for_in_of_statement.start_offset = context_p->byte_code_size; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (has_context) { parser_emit_cbc_ext (context_p, CBC_EXT_CLONE_CONTEXT); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* The expression parser must not read the 'in' or 'of' tokens. */ scanner_get_location (&end_location, context_p); @@ -1320,7 +1320,7 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ context_p->source_end_p = source_end_p; scanner_seek (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (token_type == LEXER_EOS) { lexer_next_token (context_p); @@ -1330,21 +1330,21 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ token_type = context_p->token.type; } } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ lexer_next_token (context_p); uint8_t token_type = context_p->token.type; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ switch (token_type) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LEXER_KEYW_LET: case LEXER_KEYW_CONST: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case LEXER_KEYW_VAR: { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (lexer_check_next_characters (context_p, LIT_CHAR_LEFT_SQUARE, LIT_CHAR_LEFT_BRACE)) { parser_emit_cbc_ext (context_p, is_for_in ? CBC_EXT_FOR_IN_GET_NEXT @@ -1382,17 +1382,17 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ parser_parse_initializer_by_next_char (context_p, flags); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_expect_identifier (context_p, LEXER_IDENT_LITERAL); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->token.keyword_type == LEXER_KEYW_LET && token_type != LEXER_KEYW_VAR) { parser_raise_error (context_p, PARSER_ERR_LEXICAL_LET_BINDING); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ JERRY_ASSERT (context_p->token.type == LEXER_LITERAL && context_p->token.lit_location.type == LEXER_IDENT_LITERAL); @@ -1402,12 +1402,12 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ if (context_p->token.type == LEXER_ASSIGN) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->status_flags & PARSER_IS_STRICT) { parser_raise_error (context_p, PARSER_ERR_FOR_IN_OF_DECLARATION); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_branch_t branch; /* Initialiser is never executed. */ @@ -1419,7 +1419,7 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ parser_emit_cbc_ext (context_p, is_for_in ? CBC_EXT_FOR_IN_GET_NEXT : CBC_EXT_FOR_OF_GET_NEXT); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #ifndef JERRY_NDEBUG if (literal_index < PARSER_REGISTER_START && has_context @@ -1431,12 +1431,12 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ uint16_t opcode = (has_context ? CBC_ASSIGN_LET_CONST : CBC_ASSIGN_SET_IDENT); parser_emit_cbc_literal (context_p, opcode, literal_index); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ parser_emit_cbc_literal (context_p, CBC_ASSIGN_SET_IDENT, literal_index); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LEXER_LEFT_BRACE: case LEXER_LEFT_SQUARE: { @@ -1462,7 +1462,7 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ } /* FALLTHRU */ } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { uint16_t opcode; @@ -1488,11 +1488,11 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ if (context_p->token.type != LEXER_EOS) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT parser_raise_error (context_p, is_for_in ? PARSER_ERR_IN_EXPECTED : PARSER_ERR_OF_EXPECTED); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ parser_raise_error (context_p, PARSER_ERR_IN_EXPECTED); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } parser_flush_cbc (context_p); @@ -1507,12 +1507,12 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ uint8_t for_type = PARSER_STATEMENT_FOR_IN; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (!is_for_in) { for_type = is_for_await ? PARSER_STATEMENT_FOR_AWAIT_OF : PARSER_STATEMENT_FOR_OF; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_stack_push_uint8 (context_p, for_type); parser_stack_iterator_init (context_p, &context_p->last_statement); @@ -1523,13 +1523,13 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ if (context_p->token.type != LEXER_SEMICOLON) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const uint8_t *source_p = context_p->source_p; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ switch (context_p->token.type) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LEXER_LITERAL: { if (!lexer_token_is_let (context_p)) @@ -1562,7 +1562,7 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ } /* FALLTHRU */ } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case LEXER_KEYW_VAR: { parser_parse_var_statement (context_p); @@ -1581,12 +1581,12 @@ parser_parse_for_statement_start (parser_context_t *context_p) /**< context */ } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (is_for_await) { parser_raise_error (context_p, PARSER_ERR_FOR_AWAIT_NO_OF); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ JERRY_ASSERT (context_p->next_scanner_info_p->source_p != context_p->source_p || context_p->next_scanner_info_p->type == SCANNER_TYPE_FOR); @@ -1663,7 +1663,7 @@ parser_parse_for_statement_end (parser_context_t *context_p) /**< context */ parser_stack_iterator_skip (&iterator, sizeof (parser_loop_statement_t)); parser_stack_iterator_read (&iterator, &for_statement, sizeof (parser_for_statement_t)); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT bool has_block_context = false; uint8_t next_statement_type; @@ -1685,7 +1685,7 @@ parser_parse_for_statement_end (parser_context_t *context_p) /**< context */ parser_set_continues_to_current_position (context_p, loop.branch_list_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (has_block_context) { parser_emit_cbc_ext (context_p, CBC_EXT_CLONE_FULL_CONTEXT); @@ -1740,7 +1740,7 @@ parser_parse_for_statement_end (parser_context_t *context_p) /**< context */ parser_emit_cbc_backward_branch (context_p, (uint16_t) opcode, for_statement.start_offset); parser_set_breaks_to_current_position (context_p, loop.branch_list_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->stack_top_uint8 == PARSER_STATEMENT_PRIVATE_SCOPE || context_p->stack_top_uint8 == PARSER_STATEMENT_PRIVATE_CONTEXT) { @@ -1777,12 +1777,12 @@ parser_parse_switch_statement_start (parser_context_t *context_p) /**< context * parser_raise_error (context_p, PARSER_ERR_LEFT_BRACE_EXPECTED); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->next_scanner_info_p->source_p == context_p->source_p - 1) { parser_push_block_context (context_p, true); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ JERRY_ASSERT (context_p->next_scanner_info_p->source_p == context_p->source_p && context_p->next_scanner_info_p->type == SCANNER_TYPE_SWITCH); @@ -1830,9 +1830,9 @@ parser_parse_switch_statement_start (parser_context_t *context_p) /**< context * switch_case_was_found = false; default_case_was_found = false; -#if ENABLED (JERRY_LINE_INFO) +#if JERRY_LINE_INFO uint32_t last_line_info_line = context_p->last_line_info_line; -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ do { @@ -1865,12 +1865,12 @@ parser_parse_switch_statement_start (parser_context_t *context_p) /**< context * switch_case_was_found = true; -#if ENABLED (JERRY_LINE_INFO) +#if JERRY_LINE_INFO if (context_p->token.line != context_p->last_line_info_line) { parser_emit_line_info (context_p, context_p->token.line, true); } -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ parser_parse_expression (context_p, PARSE_EXPR); @@ -1907,9 +1907,9 @@ parser_parse_switch_statement_start (parser_context_t *context_p) /**< context * JERRY_ASSERT (switch_case_was_found || default_case_was_found); -#if ENABLED (JERRY_LINE_INFO) +#if JERRY_LINE_INFO context_p->last_line_info_line = last_line_info_line; -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ if (!switch_case_was_found) { @@ -1949,10 +1949,10 @@ parser_parse_try_statement_end (parser_context_t *context_p) /**< context */ parser_stack_iterator_skip (&iterator, 1); parser_stack_iterator_read (&iterator, &try_statement, sizeof (parser_try_statement_t)); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT context_p->scope_stack_top = try_statement.scope_stack_top; context_p->scope_stack_reg_top = try_statement.scope_stack_reg_top; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_next_token (context_p); @@ -1973,10 +1973,10 @@ parser_parse_try_statement_end (parser_context_t *context_p) /**< context */ if (try_statement.type == parser_catch_block) { -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT context_p->scope_stack_top = try_statement.scope_stack_top; context_p->scope_stack_reg_top = try_statement.scope_stack_reg_top; -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ if (context_p->token.type != LEXER_KEYW_FINALLY) { @@ -2044,7 +2044,7 @@ parser_parse_try_statement_end (parser_context_t *context_p) /**< context */ if (context_p->token.type == LEXER_LEFT_PAREN) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (lexer_check_next_characters (context_p, LIT_CHAR_LEFT_SQUARE, LIT_CHAR_LEFT_BRACE)) { parser_pattern_flags_t flags = (PARSER_PATTERN_BINDING @@ -2055,28 +2055,28 @@ parser_parse_try_statement_end (parser_context_t *context_p) /**< context */ } else { -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_expect_identifier (context_p, LEXER_IDENT_LITERAL); JERRY_ASSERT (context_p->token.type == LEXER_LITERAL && context_p->token.lit_location.type == LEXER_IDENT_LITERAL); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint16_t literal_index = context_p->lit_object.index; parser_emit_cbc_literal (context_p, (literal_index >= PARSER_REGISTER_START) ? CBC_ASSIGN_SET_IDENT : CBC_ASSIGN_LET_CONST, literal_index); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ parser_emit_cbc_literal (context_p, CBC_ASSIGN_SET_IDENT, context_p->lit_object.index); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_next_token (context_p); #ifndef JERRY_NDEBUG JERRY_ASSERT (block_found); #endif /* !JERRY_NDEBUG */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (context_p->token.type != LEXER_RIGHT_PAREN) { @@ -2090,12 +2090,12 @@ parser_parse_try_statement_end (parser_context_t *context_p) /**< context */ parser_raise_error (context_p, PARSER_ERR_LEFT_BRACE_EXPECTED); } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (context_p->token.type == LEXER_LEFT_BRACE) { parser_emit_cbc (context_p, CBC_POP); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ else { parser_raise_error (context_p, PARSER_ERR_LEFT_PAREN_EXPECTED); @@ -2123,7 +2123,7 @@ parser_parse_try_statement_end (parser_context_t *context_p) /**< context */ CBC_EXT_FINALLY, &try_statement.branch); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->next_scanner_info_p->source_p == context_p->source_p) { JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_BLOCK); @@ -2135,7 +2135,7 @@ parser_parse_try_statement_end (parser_context_t *context_p) /**< context */ scanner_create_variables (context_p, SCANNER_CREATE_VARS_NO_OPTS); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } lexer_next_token (context_p); @@ -2364,12 +2364,12 @@ parser_parse_continue_statement (parser_context_t *context_p) /**< context */ opcode = CBC_JUMP_FORWARD_EXIT_CONTEXT; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const bool is_private_scope = (type == PARSER_STATEMENT_PRIVATE_SCOPE || type == PARSER_STATEMENT_PRIVATE_CONTEXT); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ const bool is_private_scope = false; -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ if (parser_statement_flags[type] & PARSER_STATM_CONTINUE_TARGET) { @@ -2416,7 +2416,7 @@ parser_parse_continue_statement (parser_context_t *context_p) /**< context */ } } /* parser_parse_continue_statement */ -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM /** * Parse import statement. * Note: See 15.2.2 @@ -2677,7 +2677,7 @@ parser_parse_export_statement (parser_context_t *context_p) /**< context */ return consume_last_statement; } /* parser_parse_export_statement */ -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ /** * Parse label statement. @@ -2743,18 +2743,18 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ parser_stack_push_uint8 (context_p, PARSER_STATEMENT_START); parser_stack_iterator_init (context_p, &context_p->last_statement); -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER /* Set lexical enviroment for the debugger. */ if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) { context_p->status_flags |= PARSER_LEXICAL_ENV_NEEDED; context_p->last_breakpoint_line = 0; } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ -#if ENABLED (JERRY_LINE_INFO) +#if JERRY_LINE_INFO context_p->last_line_info_line = 0; -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ while (context_p->token.type == LEXER_LITERAL && context_p->token.lit_location.type == LEXER_STRING_LITERAL) @@ -2790,7 +2790,7 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ context_p->status_flags &= (uint32_t) ~PARSER_IS_STRICT; } -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) { JERRY_ASSERT (context_p->last_breakpoint_line == 0); @@ -2802,10 +2802,10 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ context_p->last_breakpoint_line = context_p->token.line; } -#endif /* ENABLED (JERRY_DEBUGGER) */ -#if ENABLED (JERRY_LINE_INFO) +#endif /* JERRY_DEBUGGER */ +#if JERRY_LINE_INFO parser_emit_line_info (context_p, context_p->token.line, false); -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ lexer_construct_literal_object (context_p, &lit_location, LEXER_STRING_LITERAL); parser_emit_cbc_literal_from_token (context_p, CBC_PUSH_LITERAL); @@ -2815,20 +2815,20 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ break; } -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE if (strict_mode == PARSER_USE_STRICT_SET && context_p->is_show_opcodes) { JERRY_DEBUG_MSG (" Note: switch to strict mode\n\n"); } -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (strict_mode != PARSER_USE_STRICT_NOT_FOUND && (context_p->status_flags & PARSER_FUNCTION_HAS_COMPLEX_ARGUMENT)) { parser_raise_error (context_p, PARSER_ERR_USE_STRICT_NOT_ALLOWED); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (context_p->token.type == LEXER_SEMICOLON) { @@ -2861,12 +2861,12 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ JERRY_ASSERT (context_p->stack_depth == context_p->context_stack_depth); #endif /* !JERRY_NDEBUG */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_ASSERT (context_p->stack_top_uint8 != PARSER_STATEMENT_PRIVATE_SCOPE && context_p->stack_top_uint8 != PARSER_STATEMENT_PRIVATE_CONTEXT); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED && context_p->token.line != context_p->last_breakpoint_line && context_p->token.type != LEXER_SEMICOLON @@ -2886,9 +2886,9 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ context_p->last_breakpoint_line = context_p->token.line; } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ -#if ENABLED (JERRY_LINE_INFO) +#if JERRY_LINE_INFO if (context_p->token.line != context_p->last_line_info_line && context_p->token.type != LEXER_SEMICOLON && context_p->token.type != LEXER_LEFT_BRACE @@ -2902,7 +2902,7 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ { parser_emit_line_info (context_p, context_p->token.line, true); } -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ switch (context_p->token.type) { @@ -2922,7 +2922,7 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ case LEXER_LEFT_BRACE: { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->next_scanner_info_p->source_p == context_p->source_p) { parser_push_block_context (context_p, false); @@ -2931,9 +2931,9 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ { parser_stack_push_uint8 (context_p, PARSER_STATEMENT_BLOCK); } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ parser_stack_push_uint8 (context_p, PARSER_STATEMENT_BLOCK); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_stack_iterator_init (context_p, &context_p->last_statement); lexer_next_token (context_p); @@ -2941,25 +2941,25 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ } case LEXER_KEYW_VAR: -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LEXER_KEYW_LET: case LEXER_KEYW_CONST: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { parser_parse_var_statement (context_p); break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LEXER_KEYW_CLASS: { parser_validate_lexical_context (context_p); parser_parse_class (context_p, true); goto consume_last_statement; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM case LEXER_KEYW_IMPORT: { parser_parse_import_statement (context_p); @@ -2974,7 +2974,7 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ } break; } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ case LEXER_KEYW_FUNCTION: { @@ -3050,7 +3050,7 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ CBC_EXT_TRY_CREATE_CONTEXT, &try_statement.branch); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT try_statement.scope_stack_top = context_p->scope_stack_top; try_statement.scope_stack_reg_top = context_p->scope_stack_reg_top; @@ -3065,7 +3065,7 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ scanner_create_variables (context_p, SCANNER_CREATE_VARS_NO_OPTS); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_stack_push (context_p, &try_statement, sizeof (parser_try_statement_t)); parser_stack_push_uint8 (context_p, PARSER_STATEMENT_TRY); @@ -3124,13 +3124,13 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ || context_p->token.type == LEXER_EOS || context_p->token.type == LEXER_RIGHT_BRACE) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->status_flags & PARSER_IS_ASYNC_FUNCTION) { parser_emit_cbc_ext (context_p, CBC_EXT_RETURN_UNDEFINED); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_emit_cbc (context_p, CBC_RETURN_WITH_BLOCK); break; @@ -3150,14 +3150,14 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ case LEXER_KEYW_DEBUGGER: { -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER /* This breakpoint location is not reported to the * debugger, so it is impossible to disable it. */ if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) { parser_emit_cbc (context_p, CBC_BREAKPOINT_ENABLED); } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ lexer_next_token (context_p); break; } @@ -3173,7 +3173,7 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ lexer_next_token (context_p); continue; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (lexer_token_is_let (context_p))) { if (context_p->next_scanner_info_p->source_p == context_p->source_p) @@ -3228,7 +3228,7 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ continue; } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* FALLTHRU */ } @@ -3267,14 +3267,14 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ parser_stack_iterator_init (context_p, &context_p->last_statement); lexer_next_token (context_p); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (context_p->stack_top_uint8 == PARSER_STATEMENT_BLOCK_SCOPE || context_p->stack_top_uint8 == PARSER_STATEMENT_BLOCK_CONTEXT) { parser_pop_block_context (context_p); lexer_next_token (context_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ else if (context_p->stack_top_uint8 == PARSER_STATEMENT_SWITCH || context_p->stack_top_uint8 == PARSER_STATEMENT_SWITCH_NO_DEFAULT) { @@ -3297,13 +3297,13 @@ parser_parse_statements (parser_context_t *context_p) /**< context */ parser_set_breaks_to_current_position (context_p, loop.branch_list_p); lexer_next_token (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->stack_top_uint8 == PARSER_STATEMENT_PRIVATE_SCOPE || context_p->stack_top_uint8 == PARSER_STATEMENT_PRIVATE_CONTEXT) { parser_pop_block_context (context_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } else if (context_p->stack_top_uint8 == PARSER_STATEMENT_TRY) { @@ -3393,17 +3393,17 @@ consume_last_statement: } case PARSER_STATEMENT_FOR_IN: -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case PARSER_STATEMENT_FOR_OF: case PARSER_STATEMENT_FOR_AWAIT_OF: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { parser_for_in_of_statement_t for_in_of_statement; parser_loop_statement_t loop; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint8_t for_type = context_p->stack_top_uint8; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_stack_pop_uint8 (context_p); parser_stack_pop (context_p, &loop, sizeof (parser_loop_statement_t)); @@ -3415,13 +3415,13 @@ consume_last_statement: parser_flush_cbc (context_p); uint16_t stack_allocation = PARSER_FOR_IN_CONTEXT_STACK_ALLOCATION; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (for_type != PARSER_STATEMENT_FOR_IN) { stack_allocation = (for_type == PARSER_STATEMENT_FOR_OF ? PARSER_FOR_OF_CONTEXT_STACK_ALLOCATION : PARSER_FOR_AWAIT_OF_CONTEXT_STACK_ALLOCATION); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ PARSER_MINUS_EQUAL_U16 (context_p->stack_depth, stack_allocation); #ifndef JERRY_NDEBUG @@ -3430,26 +3430,26 @@ consume_last_statement: cbc_ext_opcode_t opcode = CBC_EXT_BRANCH_IF_FOR_IN_HAS_NEXT; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (for_type != PARSER_STATEMENT_FOR_IN) { opcode = (for_type == PARSER_STATEMENT_FOR_OF ? CBC_EXT_BRANCH_IF_FOR_OF_HAS_NEXT : CBC_EXT_BRANCH_IF_FOR_AWAIT_OF_HAS_NEXT); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_emit_cbc_ext_backward_branch (context_p, opcode, for_in_of_statement.start_offset); parser_set_breaks_to_current_position (context_p, loop.branch_list_p); parser_set_branch_to_current_position (context_p, &for_in_of_statement.branch); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->stack_top_uint8 == PARSER_STATEMENT_PRIVATE_SCOPE || context_p->stack_top_uint8 == PARSER_STATEMENT_PRIVATE_CONTEXT) { parser_pop_block_context (context_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ continue; } @@ -3533,9 +3533,9 @@ parser_free_jumps (parser_stack_iterator_t iterator) /**< iterator position */ case PARSER_STATEMENT_WHILE: case PARSER_STATEMENT_FOR: case PARSER_STATEMENT_FOR_IN: -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case PARSER_STATEMENT_FOR_OF: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { parser_loop_statement_t loop; @@ -3568,4 +3568,4 @@ parser_free_jumps (parser_stack_iterator_t iterator) /**< iterator position */ * @} */ -#endif /* ENABLED (JERRY_PARSER) */ +#endif /* JERRY_PARSER */ diff --git a/jerry-core/parser/js/js-parser-tagged-template-literal.c b/jerry-core/parser/js/js-parser-tagged-template-literal.c index ae09965df..439818f3b 100644 --- a/jerry-core/parser/js/js-parser-tagged-template-literal.c +++ b/jerry-core/parser/js/js-parser-tagged-template-literal.c @@ -31,7 +31,7 @@ * @{ */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Append the cooked and raw string to the corresponding array */ @@ -150,7 +150,7 @@ parser_tagged_template_literal_finalize (ecma_object_t *template_obj_p, /**< tem parser_tagged_template_literal_freeze_array (template_obj_p); parser_tagged_template_literal_freeze_array (raw_strings_p); } /* parser_tagged_template_literal_finalize */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} diff --git a/jerry-core/parser/js/js-parser-tagged-template-literal.h b/jerry-core/parser/js/js-parser-tagged-template-literal.h index cda003ac1..2149e5233 100644 --- a/jerry-core/parser/js/js-parser-tagged-template-literal.h +++ b/jerry-core/parser/js/js-parser-tagged-template-literal.h @@ -30,7 +30,7 @@ #include "ecma-globals.h" #include "js-parser-internal.h" -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_object_t * parser_new_tagged_template_literal (ecma_object_t **raw_strings_p); @@ -40,7 +40,7 @@ parser_tagged_template_literal_append_strings (parser_context_t *context_p, ecma void parser_tagged_template_literal_finalize (ecma_object_t *template_obj_p, ecma_object_t *raw_strings_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #endif /* ECMA_TAGGED_TEMPLATE_LITERAL_H */ diff --git a/jerry-core/parser/js/js-parser-util.c b/jerry-core/parser/js/js-parser-util.c index 5e841661b..23ed8abb3 100644 --- a/jerry-core/parser/js/js-parser-util.c +++ b/jerry-core/parser/js/js-parser-util.c @@ -15,11 +15,11 @@ #include "js-parser-internal.h" -#if ENABLED (JERRY_PARSER) +#if JERRY_PARSER -#if ENABLED (JERRY_LINE_INFO) +#if JERRY_LINE_INFO #include "jcontext.h" -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ /** \addtogroup parser Parser * @{ @@ -85,7 +85,7 @@ parser_emit_two_bytes (parser_context_t *context_p, /**< context */ } \ (context_p)->byte_code.last_p->bytes[(context_p)->byte_code.last_position++] = (uint8_t) (byte) -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE /** * Print literal corresponding to the current index @@ -137,7 +137,7 @@ parser_print_literal (parser_context_t *context_p, /**< context */ util_print_literal (literal_p); } /* parser_print_literal */ -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ /** * Append the current byte code to the stream @@ -225,7 +225,7 @@ parser_flush_cbc (parser_context_t *context_p) /**< context */ context_p->byte_code_size++; } -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE if (context_p->is_show_opcodes) { JERRY_DEBUG_MSG (" [%3d] %s", @@ -268,7 +268,7 @@ parser_flush_cbc (parser_context_t *context_p) /**< context */ JERRY_DEBUG_MSG ("\n"); } -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ if (context_p->stack_depth > context_p->stack_limit) { @@ -453,7 +453,7 @@ parser_emit_cbc_push_number (parser_context_t *context_p, /**< context */ context_p->last_cbc.value = (uint16_t) (value - 1); } /* parser_emit_cbc_push_number */ -#if ENABLED (JERRY_LINE_INFO) +#if JERRY_LINE_INFO /** * Append a line info data @@ -468,12 +468,12 @@ parser_emit_line_info (parser_context_t *context_p, /**< context */ parser_flush_cbc (context_p); } -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE if (context_p->is_show_opcodes) { JERRY_DEBUG_MSG (" [%3d] CBC_EXT_LINE %d\n", (int) context_p->stack_depth, line); } -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ parser_emit_two_bytes (context_p, CBC_EXT_OPCODE, CBC_EXT_LINE); context_p->byte_code_size += 2; @@ -505,7 +505,7 @@ parser_emit_line_info (parser_context_t *context_p, /**< context */ while (shift > 0); } /* parser_emit_line_info */ -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ /** * Append a byte code with a branch argument @@ -550,14 +550,14 @@ parser_emit_cbc_forward_branch (parser_context_t *context_p, /**< context */ || (CBC_STACK_ADJUST_BASE - (flags >> CBC_STACK_ADJUST_SHIFT)) <= context_p->stack_depth); PARSER_PLUS_EQUAL_U16 (context_p->stack_depth, CBC_STACK_ADJUST_VALUE (flags)); -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE if (context_p->is_show_opcodes) { JERRY_DEBUG_MSG (" [%3d] %s\n", (int) context_p->stack_depth, extra_byte_code_increase == 0 ? cbc_names[opcode] : cbc_ext_names[opcode]); } -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ PARSER_PLUS_EQUAL_U16 (opcode, PARSER_MAX_BRANCH_LENGTH - 1); @@ -617,9 +617,9 @@ parser_emit_cbc_backward_branch (parser_context_t *context_p, /**< context */ uint32_t offset) /**< destination offset */ { uint8_t flags; -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE const char *name; -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ if (context_p->last_cbc_opcode != PARSER_CBC_UNAVAILABLE) { @@ -634,9 +634,9 @@ parser_emit_cbc_backward_branch (parser_context_t *context_p, /**< context */ JERRY_ASSERT (opcode < CBC_END); flags = cbc_flags[opcode]; -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE name = cbc_names[opcode]; -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ } else { @@ -647,9 +647,9 @@ parser_emit_cbc_backward_branch (parser_context_t *context_p, /**< context */ flags = cbc_ext_flags[opcode]; context_p->byte_code_size++; -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE name = cbc_ext_names[opcode]; -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ } JERRY_ASSERT (flags & CBC_HAS_BRANCH_ARG); @@ -662,12 +662,12 @@ parser_emit_cbc_backward_branch (parser_context_t *context_p, /**< context */ || (CBC_STACK_ADJUST_BASE - (flags >> CBC_STACK_ADJUST_SHIFT)) <= context_p->stack_depth); PARSER_PLUS_EQUAL_U16 (context_p->stack_depth, CBC_STACK_ADJUST_VALUE (flags)); -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE if (context_p->is_show_opcodes) { JERRY_DEBUG_MSG (" [%3d] %s\n", (int) context_p->stack_depth, name); } -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ context_p->byte_code_size += 2; #if PARSER_MAXIMUM_CODE_SIZE > UINT16_MAX @@ -790,7 +790,7 @@ parser_set_continues_to_current_position (parser_context_t *context_p, /**< cont } } /* parser_set_continues_to_current_position */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Return the size of internal record corresponding to a class field @@ -908,9 +908,9 @@ parser_reverse_class_fields (parser_context_t *context_p, /**< context */ parser_free (data_p, fields_size); } /* parser_reverse_class_fields */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_ERROR_MESSAGES) +#if JERRY_ERROR_MESSAGES /** * Returns with the string representation of the error */ @@ -951,12 +951,12 @@ parser_error_to_string (parser_error_t error) /**< error code */ { return "Invalid hexadecimal digit"; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case PARSER_ERR_INVALID_BIN_DIGIT: { return "Invalid binary digit"; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case PARSER_ERR_INVALID_ESCAPE_SEQUENCE: { return "Invalid escape sequence"; @@ -993,12 +993,12 @@ parser_error_to_string (parser_error_t error) /**< error code */ { return "Identifier cannot start after a number"; } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT case PARSER_ERR_INVALID_BIGINT: { return "Number is not a valid BigInt"; } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ case PARSER_ERR_INVALID_REGEXP: { return "Invalid regular expression"; @@ -1055,12 +1055,12 @@ parser_error_to_string (parser_error_t error) /**< error code */ { return "Octal escape sequences are not allowed in strict mode"; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case PARSER_ERR_TEMPLATE_STR_OCTAL_ESCAPE: { return "Octal escape sequences are not allowed in template strings"; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case PARSER_ERR_STRICT_IDENT_NOT_ALLOWED: { return "Identifier name is reserved in strict mode"; @@ -1073,7 +1073,7 @@ parser_error_to_string (parser_error_t error) /**< error code */ { return "Arguments is not allowed to be used here in strict mode"; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case PARSER_ERR_USE_STRICT_NOT_ALLOWED: { return "The 'use strict' directive is not allowed for functions with non-simple arguments"; @@ -1114,7 +1114,7 @@ parser_error_to_string (parser_error_t error) /**< error code */ { return "Invalid left-hand-side in for-loop"; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case PARSER_ERR_DELETE_IDENT_NOT_ALLOWED: { return "Deleting identifier is not allowed in strict mode"; @@ -1271,7 +1271,7 @@ parser_error_to_string (parser_error_t error) /**< error code */ { return "Non-strict argument definition"; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case PARSER_ERR_VARIABLE_REDECLARED: { return "Local variable is redeclared"; @@ -1372,8 +1372,8 @@ parser_error_to_string (parser_error_t error) /**< error code */ { return "new.target expression is not allowed here"; } -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_MODULE_SYSTEM) +#endif /* JERRY_ESNEXT */ +#if JERRY_MODULE_SYSTEM case PARSER_ERR_FILE_NOT_FOUND: { return "Requested module not found"; @@ -1422,7 +1422,7 @@ parser_error_to_string (parser_error_t error) /**< error code */ { return "Export not defined in module"; } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ default: { @@ -1431,7 +1431,7 @@ parser_error_to_string (parser_error_t error) /**< error code */ } } } /* parser_error_to_string */ -#endif /* ENABLED (JERRY_ERROR_MESSAGES) */ +#endif /* JERRY_ERROR_MESSAGES */ /** * @} @@ -1439,4 +1439,4 @@ parser_error_to_string (parser_error_t error) /**< error code */ * @} */ -#endif /* ENABLED (JERRY_PARSER) */ +#endif /* JERRY_PARSER */ diff --git a/jerry-core/parser/js/js-parser.c b/jerry-core/parser/js/js-parser.c index c04d6b843..c32a2c700 100644 --- a/jerry-core/parser/js/js-parser.c +++ b/jerry-core/parser/js/js-parser.c @@ -21,12 +21,12 @@ #include "jcontext.h" #include "js-parser-internal.h" -#if ENABLED (JERRY_PARSER) +#if JERRY_PARSER JERRY_STATIC_ASSERT ((int) ECMA_PARSE_STRICT_MODE == (int) PARSER_IS_STRICT, ecma_parse_strict_mode_must_be_equal_to_parser_is_strict); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_STATIC_ASSERT (PARSER_SAVE_STATUS_FLAGS (PARSER_ALLOW_SUPER) == 0x1, incorrect_saving_of_ecma_parse_allow_super); JERRY_STATIC_ASSERT (PARSER_RESTORE_STATUS_FLAGS (ECMA_PARSE_ALLOW_SUPER) == PARSER_ALLOW_SUPER, @@ -34,7 +34,7 @@ JERRY_STATIC_ASSERT (PARSER_RESTORE_STATUS_FLAGS (ECMA_PARSE_ALLOW_SUPER) == PAR JERRY_STATIC_ASSERT (PARSER_RESTORE_STATUS_FLAGS (ECMA_PARSE_FUNCTION_CONTEXT) == 0, ecma_parse_function_context_must_not_be_transformed); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** \addtogroup parser Parser * @{ @@ -62,7 +62,7 @@ parser_compute_indicies (parser_context_t *context_p, /**< context */ uint16_t ident_count = 0; uint16_t const_literal_count = 0; -#if ENABLED (JERRY_RESOURCE_NAME) +#if JERRY_RESOURCE_NAME /* Resource name will be stored as the last const literal. */ if (JERRY_UNLIKELY (context_p->literal_count >= PARSER_MAXIMUM_NUMBER_OF_LITERALS)) { @@ -71,7 +71,7 @@ parser_compute_indicies (parser_context_t *context_p, /**< context */ const_literal_count++; context_p->literal_count++; -#endif /* ENABLED (JERRY_RESOURCE_NAME) */ +#endif /* JERRY_RESOURCE_NAME */ uint16_t ident_index; uint16_t const_literal_index; @@ -198,10 +198,10 @@ parser_compute_indicies (parser_context_t *context_p, /**< context */ } } -#if ENABLED (JERRY_RESOURCE_NAME) +#if JERRY_RESOURCE_NAME /* Resource name will be stored as the last const literal. */ const_literal_index++; -#endif /* ENABLED (JERRY_RESOURCE_NAME) */ +#endif /* JERRY_RESOURCE_NAME */ JERRY_ASSERT (ident_index == context_p->register_count + ident_count); JERRY_ASSERT (const_literal_index == ident_index + const_literal_count); @@ -507,7 +507,7 @@ parse_update_branches (parser_context_t *context_p, /**< context */ context_p->byte_code.first_p = last_page_p; } /* parse_update_branches */ -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER /** * Send current breakpoint list. @@ -547,7 +547,7 @@ parser_append_breakpoint_info (parser_context_t *context_p, /**< context */ context_p->breakpoint_info_count = (uint16_t) (context_p->breakpoint_info_count + 1); } /* parser_append_breakpoint_info */ -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ /** * Forward iterator: move to the next byte code @@ -608,7 +608,7 @@ parser_post_processing (parser_context_t *context_p) /**< context */ ecma_value_t *literal_pool_p; uint8_t *dst_p; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if ((context_p->status_flags & (PARSER_IS_FUNCTION | PARSER_LEXICAL_BLOCK_NEEDED)) == (PARSER_IS_FUNCTION | PARSER_LEXICAL_BLOCK_NEEDED)) { @@ -647,7 +647,7 @@ parser_post_processing (parser_context_t *context_p) /**< context */ JERRY_ASSERT (!(context_p->status_flags & PARSER_NO_END_LABEL)); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ JERRY_ASSERT (context_p->stack_depth == 0); #ifndef JERRY_NDEBUG @@ -661,7 +661,7 @@ parser_post_processing (parser_context_t *context_p) /**< context */ JERRY_ASSERT (context_p->literal_count <= PARSER_MAXIMUM_NUMBER_OF_LITERALS); -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if ((JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) && !(context_p->status_flags & PARSER_DEBUGGER_BREAKPOINT_APPENDED)) { @@ -680,7 +680,7 @@ parser_post_processing (parser_context_t *context_p) /**< context */ parser_send_breakpoints (context_p, JERRY_DEBUGGER_BREAKPOINT_LIST); JERRY_ASSERT (context_p->breakpoint_info_count == 0); } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ parser_compute_indicies (context_p, &ident_end, &const_literal_end); @@ -731,7 +731,7 @@ parser_post_processing (parser_context_t *context_p) /**< context */ PARSER_NEXT_BYTE (page_p, offset); length++; -#if ENABLED (JERRY_LINE_INFO) +#if JERRY_LINE_INFO if (ext_opcode == CBC_EXT_LINE) { uint8_t last_byte = 0; @@ -746,7 +746,7 @@ parser_post_processing (parser_context_t *context_p) /**< context */ continue; } -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ break; } case CBC_POST_DECR: @@ -893,12 +893,12 @@ parser_post_processing (parser_context_t *context_p) /**< context */ { context_p->status_flags &= (uint32_t) ~PARSER_NO_END_LABEL; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (PARSER_IS_NORMAL_ASYNC_FUNCTION (context_p->status_flags)) { length++; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ length++; } @@ -923,7 +923,7 @@ parser_post_processing (parser_context_t *context_p) /**< context */ total_size += context_p->argument_count * sizeof (ecma_value_t); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* function.name */ if (!(context_p->status_flags & PARSER_CLASS_CONSTRUCTOR)) { @@ -939,33 +939,33 @@ parser_post_processing (parser_context_t *context_p) /**< context */ { total_size += sizeof (ecma_value_t); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ total_size = JERRY_ALIGNUP (total_size, JMEM_ALIGNMENT); compiled_code_p = (ecma_compiled_code_t *) parser_malloc (context_p, total_size); -#if ENABLED (JERRY_SNAPSHOT_SAVE) || ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_SNAPSHOT_SAVE || JERRY_PARSER_DUMP_BYTE_CODE // Avoid getting junk bytes memset (compiled_code_p, 0, total_size); -#endif /* ENABLED (JERRY_SNAPSHOT_SAVE) || ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_SNAPSHOT_SAVE || JERRY_PARSER_DUMP_BYTE_CODE */ -#if ENABLED (JERRY_MEM_STATS) +#if JERRY_MEM_STATS jmem_stats_allocate_byte_code_bytes (total_size); -#endif /* ENABLED (JERRY_MEM_STATS) */ +#endif /* JERRY_MEM_STATS */ byte_code_p = (uint8_t *) compiled_code_p; compiled_code_p->size = (uint16_t) (total_size >> JMEM_ALIGNMENT_LOG); compiled_code_p->refs = 1; compiled_code_p->status_flags = 0; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->status_flags & PARSER_FUNCTION_HAS_REST_PARAM) { JERRY_ASSERT (context_p->argument_count > 0); context_p->argument_count--; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (needs_uint16_arguments) { @@ -977,9 +977,9 @@ parser_post_processing (parser_context_t *context_p) /**< context */ args_p->ident_end = ident_end; args_p->const_literal_end = const_literal_end; args_p->literal_end = context_p->literal_count; -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ECMA_SET_INTERNAL_VALUE_POINTER (args_p->realm_value, JERRY_CONTEXT (global_object_p)); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ compiled_code_p->status_flags |= CBC_CODE_FLAGS_UINT16_ARGUMENTS; byte_code_p += sizeof (cbc_uint16_arguments_t); @@ -994,9 +994,9 @@ parser_post_processing (parser_context_t *context_p) /**< context */ args_p->ident_end = (uint8_t) ident_end; args_p->const_literal_end = (uint8_t) const_literal_end; args_p->literal_end = (uint8_t) context_p->literal_count; -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ECMA_SET_INTERNAL_VALUE_POINTER (args_p->realm_value, JERRY_CONTEXT (global_object_p)); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ byte_code_p += sizeof (cbc_uint8_arguments_t); } @@ -1042,7 +1042,7 @@ parser_post_processing (parser_context_t *context_p) /**< context */ { function_type = CBC_FUNCTION_TO_TYPE_BITS (CBC_FUNCTION_SCRIPT); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (context_p->status_flags & PARSER_IS_ARROW_FUNCTION) { if (context_p->status_flags & PARSER_IS_ASYNC_FUNCTION) @@ -1083,7 +1083,7 @@ parser_post_processing (parser_context_t *context_p) /**< context */ JERRY_ASSERT (!(context_p->status_flags & PARSER_IS_FUNCTION)); compiled_code_p->status_flags |= CBC_CODE_FLAGS_LEXICAL_BLOCK_NEEDED; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ compiled_code_p->status_flags |= function_type; @@ -1093,9 +1093,9 @@ parser_post_processing (parser_context_t *context_p) /**< context */ parser_init_literal_pool (context_p, literal_pool_p); -#if ENABLED (JERRY_RESOURCE_NAME) +#if JERRY_RESOURCE_NAME literal_pool_p[const_literal_end - 1] = context_p->resource_name; -#endif /* ENABLED (JERRY_RESOURCE_NAME) */ +#endif /* JERRY_RESOURCE_NAME */ page_p = context_p->byte_code.first_p; offset = 0; @@ -1136,13 +1136,13 @@ parser_post_processing (parser_context_t *context_p) /**< context */ PARSER_NEXT_BYTE_UPDATE (page_p, offset, real_offset); flags = cbc_flags[opcode]; -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if (opcode == CBC_BREAKPOINT_DISABLED) { uint32_t bp_offset = (uint32_t) (((uint8_t *) dst_p) - ((uint8_t *) compiled_code_p) - 1); parser_append_breakpoint_info (context_p, JERRY_DEBUGGER_BREAKPOINT_OFFSET_LIST, bp_offset); } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ if (opcode == CBC_EXT_OPCODE) { @@ -1158,7 +1158,7 @@ parser_post_processing (parser_context_t *context_p) /**< context */ real_offset++; PARSER_NEXT_BYTE_UPDATE (page_p, offset, real_offset); -#if ENABLED (JERRY_LINE_INFO) +#if JERRY_LINE_INFO if (ext_opcode == CBC_EXT_LINE) { uint8_t last_byte = 0; @@ -1175,7 +1175,7 @@ parser_post_processing (parser_context_t *context_p) /**< context */ continue; } -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ } /* Only literal and call arguments can be combined. */ @@ -1267,27 +1267,27 @@ parser_post_processing (parser_context_t *context_p) /**< context */ } } -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if ((JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) && context_p->breakpoint_info_count > 0) { parser_send_breakpoints (context_p, JERRY_DEBUGGER_BREAKPOINT_OFFSET_LIST); JERRY_ASSERT (context_p->breakpoint_info_count == 0); } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ if (!(context_p->status_flags & PARSER_NO_END_LABEL)) { *dst_p++ = CBC_RETURN_WITH_BLOCK; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (PARSER_IS_NORMAL_ASYNC_FUNCTION (context_p->status_flags)) { dst_p[-1] = CBC_EXT_OPCODE; dst_p[0] = CBC_EXT_ASYNC_EXIT; dst_p++; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } JERRY_ASSERT (dst_p == byte_code_p + length); @@ -1355,7 +1355,7 @@ parser_post_processing (parser_context_t *context_p) /**< context */ } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (!(context_p->status_flags & PARSER_CLASS_CONSTRUCTOR)) { *(--base_p) = ecma_make_magic_string_value (LIT_MAGIC_STRING__EMPTY); @@ -1372,23 +1372,23 @@ parser_post_processing (parser_context_t *context_p) /**< context */ compiled_code_p->status_flags |= CBC_CODE_FLAGS_HAS_TAGGED_LITERALS; base_p[-1] = (ecma_value_t) context_p->tagged_template_literal_cp; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE if (context_p->is_show_opcodes) { util_print_cbc (compiled_code_p); JERRY_DEBUG_MSG ("\nByte code size: %d bytes\n", (int) length); context_p->total_byte_code_size += (uint32_t) length; } -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) { jerry_debugger_send_function_cp (JERRY_DEBUGGER_BYTE_CODE_CP, compiled_code_p); } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ return compiled_code_p; } /* parser_post_processing */ @@ -1423,7 +1423,7 @@ parser_parse_function_arguments (parser_context_t *context_p, /**< context */ { JERRY_ASSERT (context_p->next_scanner_info_p->type == SCANNER_TYPE_FUNCTION); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_ASSERT (context_p->status_flags & PARSER_IS_FUNCTION); JERRY_ASSERT (!(context_p->status_flags & PARSER_LEXICAL_BLOCK_NEEDED)); @@ -1439,11 +1439,11 @@ parser_parse_function_arguments (parser_context_t *context_p, /**< context */ context_p->context_stack_depth = PARSER_TRY_CONTEXT_STACK_ALLOCATION; #endif /* !JERRY_NDEBUG */ } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (context_p->token.type == end_type) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT context_p->status_flags &= (uint32_t) ~PARSER_DISALLOW_AWAIT_YIELD; if (context_p->status_flags & PARSER_IS_GENERATOR_FUNCTION) @@ -1454,26 +1454,26 @@ parser_parse_function_arguments (parser_context_t *context_p, /**< context */ scanner_create_variables (context_p, SCANNER_CREATE_VARS_IS_FUNCTION_BODY); return; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scanner_create_variables (context_p, SCANNER_CREATE_VARS_NO_OPTS); return; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT bool has_complex_argument = (context_p->next_scanner_info_p->u8_arg & SCANNER_FUNCTION_HAS_COMPLEX_ARGUMENT) != 0; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ bool is_strict = (context_p->next_scanner_info_p->u8_arg & SCANNER_FUNCTION_IS_STRICT) != 0; scanner_create_variables (context_p, SCANNER_CREATE_VARS_IS_FUNCTION_ARGS); scanner_set_active (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT context_p->status_flags |= PARSER_FUNCTION_IS_PARSING_ARGS; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ while (true) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->token.type == LEXER_THREE_DOTS) { if (context_p->status_flags & PARSER_IS_PROPERTY_SETTER) @@ -1578,7 +1578,7 @@ parser_parse_function_arguments (parser_context_t *context_p, /**< context */ } continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (context_p->token.type != LEXER_LITERAL || context_p->token.lit_location.type != LEXER_IDENT_LITERAL) @@ -1597,14 +1597,14 @@ parser_parse_function_arguments (parser_context_t *context_p, /**< context */ if (JERRY_UNLIKELY (context_p->lit_object.literal_p->status_flags & LEXER_FLAG_FUNCTION_ARGUMENT)) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if ((context_p->status_flags & PARSER_FUNCTION_HAS_COMPLEX_ARGUMENT) || (context_p->status_flags & PARSER_IS_ARROW_FUNCTION)) { parser_raise_error (context_p, PARSER_ERR_DUPLICATED_ARGUMENT_NAMES); } has_duplicated_arg_names = true; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ context_p->status_flags |= PARSER_HAS_NON_STRICT_ARG; } @@ -1615,7 +1615,7 @@ parser_parse_function_arguments (parser_context_t *context_p, /**< context */ lexer_next_token (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint16_t literal_index = context_p->lit_object.index; if (context_p->token.type == LEXER_ASSIGN) @@ -1697,7 +1697,7 @@ parser_parse_function_arguments (parser_context_t *context_p, /**< context */ (uint16_t) (PARSER_REGISTER_START + context_p->argument_count), literal_index); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ context_p->argument_count++; if (context_p->argument_count >= PARSER_MAXIMUM_NUMBER_OF_REGISTERS) @@ -1717,26 +1717,26 @@ parser_parse_function_arguments (parser_context_t *context_p, /**< context */ break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->status_flags & PARSER_FUNCTION_HAS_REST_PARAM) { parser_raise_error (context_p, PARSER_ERR_FORMAL_PARAM_AFTER_REST_PARAMETER); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_next_token (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->token.type == end_type) { break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } scanner_revert_active (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_ASSERT (has_complex_argument || !(context_p->status_flags & PARSER_FUNCTION_HAS_COMPLEX_ARGUMENT)); if (context_p->status_flags & PARSER_IS_GENERATOR_FUNCTION) @@ -1767,7 +1767,7 @@ parser_parse_function_arguments (parser_context_t *context_p, /**< context */ } context_p->status_flags &= (uint32_t) ~(PARSER_DISALLOW_AWAIT_YIELD | PARSER_FUNCTION_IS_PARSING_ARGS); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scanner_create_variables (context_p, SCANNER_CREATE_VARS_IS_FUNCTION_BODY); @@ -1811,19 +1811,19 @@ parser_parse_source (const uint8_t *arg_list_p, /**< function argument list */ context.status_flags = parse_opts & PARSER_STRICT_MODE_MASK; context.global_status_flags = parse_opts; -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM if (context.global_status_flags & ECMA_PARSE_MODULE) { context.status_flags |= PARSER_IS_STRICT; } context.module_current_node_p = NULL; -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ if (arg_list_p != NULL) { context.status_flags |= PARSER_IS_FUNCTION; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (parse_opts & ECMA_PARSE_GENERATOR_FUNCTION) { context.status_flags |= PARSER_IS_GENERATOR_FUNCTION; @@ -1832,13 +1832,13 @@ parser_parse_source (const uint8_t *arg_list_p, /**< function argument list */ { context.status_flags |= PARSER_IS_ASYNC_FUNCTION; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT context.status_flags |= PARSER_RESTORE_STATUS_FLAGS (parse_opts); context.tagged_template_literal_cp = JMEM_CP_NULL; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ context.stack_depth = 0; context.stack_limit = 0; @@ -1848,11 +1848,11 @@ parser_parse_source (const uint8_t *arg_list_p, /**< function argument list */ context.token.flags = 0; context.line = 1; context.column = 1; -#if ENABLED (JERRY_RESOURCE_NAME) +#if JERRY_RESOURCE_NAME context.resource_name = resource_name; -#else /* !ENABLED (JERRY_RESOURCE_NAME) */ +#else /* !JERRY_RESOURCE_NAME */ JERRY_UNUSED (resource_name); -#endif /* !ENABLED (JERRY_RESOURCE_NAME) */ +#endif /* !JERRY_RESOURCE_NAME */ scanner_info_t scanner_info_end; scanner_info_end.next_p = NULL; @@ -1866,9 +1866,9 @@ parser_parse_source (const uint8_t *arg_list_p, /**< function argument list */ context.last_cbc_opcode = PARSER_CBC_UNAVAILABLE; context.argument_count = 0; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT context.argument_length = UINT16_MAX; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ context.register_count = 0; context.literal_count = 0; @@ -1881,16 +1881,16 @@ parser_parse_source (const uint8_t *arg_list_p, /**< function argument list */ context.scope_stack_size = 0; context.scope_stack_top = 0; context.scope_stack_reg_top = 0; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT context.scope_stack_global_end = 0; context.tagged_template_literal_cp = JMEM_CP_NULL; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #ifndef JERRY_NDEBUG context.context_stack_depth = 0; #endif /* !JERRY_NDEBUG */ -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE context.is_show_opcodes = (JERRY_CONTEXT (jerry_init_flags) & ECMA_INIT_SHOW_OPCODES); context.total_byte_code_size = 0; @@ -1900,7 +1900,7 @@ parser_parse_source (const uint8_t *arg_list_p, /**< function argument list */ (arg_list_p == NULL) ? "Script" : "Function"); } -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ scanner_scan_all (&context, arg_list_p, @@ -1939,9 +1939,9 @@ parser_parse_source (const uint8_t *arg_list_p, /**< function argument list */ parser_stack_init (&context); -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER context.breakpoint_info_count = 0; -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ JERRY_ASSERT (context.next_scanner_info_p->source_p == context.source_p); JERRY_ASSERT (context.next_scanner_info_p->type == SCANNER_TYPE_FUNCTION); @@ -1975,18 +1975,18 @@ parser_parse_source (const uint8_t *arg_list_p, /**< function argument list */ lexer_next_token (&context); } -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM else if (parse_opts & ECMA_PARSE_MODULE) { scanner_create_variables (&context, SCANNER_CREATE_VARS_NO_OPTS); } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ else { JERRY_ASSERT (context.next_scanner_info_p->source_p == source_p && context.next_scanner_info_p->type == SCANNER_TYPE_FUNCTION); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (scanner_is_context_needed (&context, PARSER_CHECK_GLOBAL_CONTEXT)) { context.status_flags |= PARSER_LEXICAL_BLOCK_NEEDED; @@ -1996,7 +1996,7 @@ parser_parse_source (const uint8_t *arg_list_p, /**< function argument list */ { scanner_check_variables (&context); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scanner_create_variables (&context, SCANNER_CREATE_VARS_IS_SCRIPT); } @@ -2028,7 +2028,7 @@ parser_parse_source (const uint8_t *arg_list_p, /**< function argument list */ JERRY_ASSERT (arg_list_p != NULL || !(context.status_flags & PARSER_ARGUMENTS_NEEDED)); -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE if (context.is_show_opcodes) { JERRY_DEBUG_MSG ("\n%s parsing successfully completed. Total byte code size: %d bytes\n", @@ -2036,7 +2036,7 @@ parser_parse_source (const uint8_t *arg_list_p, /**< function argument list */ : "Function", (int) context.total_byte_code_size); } -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ } PARSER_CATCH { @@ -2049,7 +2049,7 @@ parser_parse_source (const uint8_t *arg_list_p, /**< function argument list */ scanner_cleanup (&context); -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM if (context.module_current_node_p != NULL) { ecma_module_release_module_nodes (context.module_current_node_p); @@ -2074,14 +2074,14 @@ parser_parse_source (const uint8_t *arg_list_p, /**< function argument list */ parser_free (context.scope_stack_p, context.scope_stack_size * sizeof (parser_scope_stack_t)); } -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE if (context.is_show_opcodes) { JERRY_DEBUG_MSG ("\n--- %s parsing end ---\n\n", (arg_list_p == NULL) ? "Script" : "Function"); } -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ parser_stack_free (&context); @@ -2097,21 +2097,21 @@ parser_save_context (parser_context_t *context_p, /**< context */ { JERRY_ASSERT (context_p->last_cbc_opcode == PARSER_CBC_UNAVAILABLE); -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if ((JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) && context_p->breakpoint_info_count > 0) { parser_send_breakpoints (context_p, JERRY_DEBUGGER_BREAKPOINT_LIST); context_p->breakpoint_info_count = 0; } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->status_flags & PARSER_FUNCTION_IS_PARSING_ARGS) { context_p->status_flags |= PARSER_LEXICAL_BLOCK_NEEDED; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* Save private part of the context. */ @@ -2122,9 +2122,9 @@ parser_save_context (parser_context_t *context_p, /**< context */ saved_context_p->last_statement = context_p->last_statement; saved_context_p->argument_count = context_p->argument_count; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT saved_context_p->argument_length = context_p->argument_length; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ saved_context_p->register_count = context_p->register_count; saved_context_p->literal_count = context_p->literal_count; @@ -2135,10 +2135,10 @@ parser_save_context (parser_context_t *context_p, /**< context */ saved_context_p->scope_stack_size = context_p->scope_stack_size; saved_context_p->scope_stack_top = context_p->scope_stack_top; saved_context_p->scope_stack_reg_top = context_p->scope_stack_reg_top; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT saved_context_p->scope_stack_global_end = context_p->scope_stack_global_end; saved_context_p->tagged_template_literal_cp = context_p->tagged_template_literal_cp; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #ifndef JERRY_NDEBUG saved_context_p->context_stack_depth = context_p->context_stack_depth; @@ -2153,9 +2153,9 @@ parser_save_context (parser_context_t *context_p, /**< context */ context_p->last_statement.current_p = NULL; context_p->argument_count = 0; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT context_p->argument_length = UINT16_MAX; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ context_p->register_count = 0; context_p->literal_count = 0; @@ -2166,10 +2166,10 @@ parser_save_context (parser_context_t *context_p, /**< context */ context_p->scope_stack_size = 0; context_p->scope_stack_top = 0; context_p->scope_stack_reg_top = 0; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT context_p->scope_stack_global_end = 0; context_p->tagged_template_literal_cp = JMEM_CP_NULL; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #ifndef JERRY_NDEBUG context_p->context_stack_depth = 0; @@ -2201,9 +2201,9 @@ parser_restore_context (parser_context_t *context_p, /**< context */ context_p->last_statement = saved_context_p->last_statement; context_p->argument_count = saved_context_p->argument_count; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT context_p->argument_length = saved_context_p->argument_length; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ context_p->register_count = saved_context_p->register_count; context_p->literal_count = saved_context_p->literal_count; @@ -2214,10 +2214,10 @@ parser_restore_context (parser_context_t *context_p, /**< context */ context_p->scope_stack_size = saved_context_p->scope_stack_size; context_p->scope_stack_top = saved_context_p->scope_stack_top; context_p->scope_stack_reg_top = saved_context_p->scope_stack_reg_top; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT context_p->scope_stack_global_end = saved_context_p->scope_stack_global_end; context_p->tagged_template_literal_cp = saved_context_p->tagged_template_literal_cp; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ #ifndef JERRY_NDEBUG context_p->context_stack_depth = saved_context_p->context_stack_depth; @@ -2239,29 +2239,29 @@ parser_parse_function (parser_context_t *context_p, /**< context */ JERRY_ASSERT (status_flags & PARSER_IS_FUNCTION); parser_save_context (context_p, &saved_context); context_p->status_flags |= status_flags; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT context_p->status_flags |= PARSER_ALLOW_NEW_TARGET; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE if (context_p->is_show_opcodes) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_DEBUG_MSG ("\n--- %s parsing start ---\n\n", (context_p->status_flags & PARSER_CLASS_CONSTRUCTOR) ? "Class constructor" : "Function"); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_DEBUG_MSG ("\n--- Function parsing start ---\n\n"); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) { jerry_debugger_send_parse_function (context_p->token.line, context_p->token.column); } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ lexer_next_token (context_p); @@ -2287,21 +2287,21 @@ parser_parse_function (parser_context_t *context_p, /**< context */ parser_raise_error (context_p, PARSER_ERR_ONE_ARGUMENT_EXPECTED); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if ((context_p->status_flags & (PARSER_CLASS_CONSTRUCTOR | PARSER_ALLOW_SUPER_CALL)) == PARSER_CLASS_CONSTRUCTOR) { parser_emit_cbc_ext (context_p, CBC_EXT_RUN_FIELD_INIT); parser_flush_cbc (context_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE if (context_p->is_show_opcodes && (context_p->status_flags & PARSER_HAS_NON_STRICT_ARG)) { JERRY_DEBUG_MSG (" Note: legacy (non-strict) argument definition\n\n"); } -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ if (context_p->token.type != LEXER_LEFT_BRACE) { @@ -2312,25 +2312,25 @@ parser_parse_function (parser_context_t *context_p, /**< context */ parser_parse_statements (context_p); compiled_code_p = parser_post_processing (context_p); -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE if (context_p->is_show_opcodes) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_DEBUG_MSG ("\n--- %s parsing end ---\n\n", (context_p->status_flags & PARSER_CLASS_CONSTRUCTOR) ? "Class constructor" : "Function"); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_DEBUG_MSG ("\n--- Function parsing end ---\n\n"); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ parser_restore_context (context_p, &saved_context); return compiled_code_p; } /* parser_parse_function */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Parse arrow function code @@ -2352,19 +2352,19 @@ parser_parse_arrow_function (parser_context_t *context_p, /**< context */ | PARSER_ALLOW_SUPER | PARSER_ALLOW_SUPER_CALL); -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE if (context_p->is_show_opcodes) { JERRY_DEBUG_MSG ("\n--- Arrow function parsing start ---\n\n"); } -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) { jerry_debugger_send_parse_function (context_p->token.line, context_p->token.column); } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ if (context_p->token.type == LEXER_LEFT_PAREN) { @@ -2417,12 +2417,12 @@ parser_parse_arrow_function (parser_context_t *context_p, /**< context */ compiled_code_p = parser_post_processing (context_p); -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE if (context_p->is_show_opcodes) { JERRY_DEBUG_MSG ("\n--- Arrow function parsing end ---\n\n"); } -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ parser_restore_context (context_p, &saved_context); @@ -2449,19 +2449,19 @@ parser_parse_class_fields (parser_context_t *context_p) /**< context */ | PARSER_ALLOW_NEW_TARGET | extra_status_flags); -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE if (context_p->is_show_opcodes) { JERRY_DEBUG_MSG ("\n--- Class fields parsing start ---\n\n"); } -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) { jerry_debugger_send_parse_function (context_p->token.line, context_p->token.column); } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ const uint8_t *source_end_p = context_p->source_end_p; bool first_computed_class_field = true; @@ -2473,7 +2473,7 @@ parser_parse_class_fields (parser_context_t *context_p) /**< context */ uint8_t class_field_type = context_p->stack_top_uint8; parser_stack_pop_uint8 (context_p); - scanner_range_t range; + scanner_range_t range = {0}; if (class_field_type & PARSER_CLASS_FIELD_INITIALIZED) { @@ -2571,12 +2571,12 @@ parser_parse_class_fields (parser_context_t *context_p) /**< context */ compiled_code_p = parser_post_processing (context_p); -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE if (context_p->is_show_opcodes) { JERRY_DEBUG_MSG ("\n--- Class fields parsing end ---\n\n"); } -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ parser_restore_context (context_p, &saved_context); @@ -2707,7 +2707,7 @@ parser_compiled_code_set_function_name (parser_context_t *context_p, /**< contex } } /* parser_compiled_code_set_function_name */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Raise a parse error. @@ -2744,26 +2744,26 @@ parser_raise_error (parser_context_t *context_p, /**< context */ parser_free_jumps (saved_context_p->last_statement); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (saved_context_p->tagged_template_literal_cp != JMEM_CP_NULL) { ecma_collection_t *collection = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, saved_context_p->tagged_template_literal_cp); ecma_collection_free_template_literal (collection); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ saved_context_p = saved_context_p->prev_context_p; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->tagged_template_literal_cp != JMEM_CP_NULL) { ecma_collection_t *collection = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, context_p->tagged_template_literal_cp); ecma_collection_free_template_literal (collection); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ context_p->error = error; PARSER_THROW (context_p->try_buffer); @@ -2771,7 +2771,7 @@ parser_raise_error (parser_context_t *context_p, /**< context */ JERRY_ASSERT (0); } /* parser_raise_error */ -#endif /* ENABLED (JERRY_PARSER) */ +#endif /* JERRY_PARSER */ /** * Parse EcmaScript source code @@ -2791,10 +2791,10 @@ parser_parse_script (const uint8_t *arg_list_p, /**< function argument list */ ecma_value_t resource_name, /**< resource name */ uint32_t parse_opts) /**< ecma_parse_opts_t option bits */ { -#if ENABLED (JERRY_PARSER) +#if JERRY_PARSER parser_error_location_t parser_error; -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) { jerry_debugger_send_string (JERRY_DEBUGGER_SOURCE_CODE, @@ -2802,7 +2802,7 @@ parser_parse_script (const uint8_t *arg_list_p, /**< function argument list */ source_p, source_size); } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ ecma_compiled_code_t *bytecode_p = parser_parse_source (arg_list_p, arg_list_size, @@ -2814,12 +2814,12 @@ parser_parse_script (const uint8_t *arg_list_p, /**< function argument list */ if (JERRY_UNLIKELY (bytecode_p == NULL)) { -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) { jerry_debugger_send_type (JERRY_DEBUGGER_PARSE_ERROR); } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ if (parser_error.error == PARSER_ERR_OUT_OF_MEMORY) { @@ -2829,7 +2829,7 @@ parser_parse_script (const uint8_t *arg_list_p, /**< function argument list */ return NULL; } -#if ENABLED (JERRY_ERROR_MESSAGES) +#if JERRY_ERROR_MESSAGES ecma_string_t *err_str_p; if (parser_error.error == PARSER_ERR_INVALID_REGEXP) @@ -2862,19 +2862,19 @@ parser_parse_script (const uint8_t *arg_list_p, /**< function argument list */ ecma_free_value (col_str_val); ecma_free_value (line_str_val); ecma_deref_ecma_string (err_str_p); -#else /* !ENABLED (JERRY_ERROR_MESSAGES) */ +#else /* !JERRY_ERROR_MESSAGES */ if (parser_error.error == PARSER_ERR_INVALID_REGEXP) { jcontext_release_exception (); } ecma_raise_syntax_error (""); -#endif /* ENABLED (JERRY_ERROR_MESSAGES) */ +#endif /* JERRY_ERROR_MESSAGES */ return NULL; } -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if ((JERRY_CONTEXT (debugger_flags) & (JERRY_DEBUGGER_CONNECTED | JERRY_DEBUGGER_PARSER_WAIT)) == (JERRY_DEBUGGER_CONNECTED | JERRY_DEBUGGER_PARSER_WAIT)) { @@ -2893,10 +2893,10 @@ parser_parse_script (const uint8_t *arg_list_p, /**< function argument list */ jerry_debugger_transport_sleep (); } } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ return bytecode_p; -#else /* !ENABLED (JERRY_PARSER) */ +#else /* !JERRY_PARSER */ JERRY_UNUSED (arg_list_p); JERRY_UNUSED (arg_list_size); JERRY_UNUSED (source_p); @@ -2906,7 +2906,7 @@ parser_parse_script (const uint8_t *arg_list_p, /**< function argument list */ ecma_raise_syntax_error (ECMA_ERR_MSG ("Source code parsing is disabled")); return NULL; -#endif /* ENABLED (JERRY_PARSER) */ +#endif /* JERRY_PARSER */ } /* parser_parse_script */ /** diff --git a/jerry-core/parser/js/js-parser.h b/jerry-core/parser/js/js-parser.h index 1febf70e9..d8863ad20 100644 --- a/jerry-core/parser/js/js-parser.h +++ b/jerry-core/parser/js/js-parser.h @@ -44,9 +44,9 @@ typedef enum PARSER_ERR_INVALID_CHARACTER, /**< unexpected character */ PARSER_ERR_INVALID_OCTAL_DIGIT, /**< invalid octal digit */ PARSER_ERR_INVALID_HEX_DIGIT, /**< invalid hexadecimal digit */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT PARSER_ERR_INVALID_BIN_DIGIT, /**< invalid binary digit */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ PARSER_ERR_INVALID_ESCAPE_SEQUENCE, /**< invalid escape sequence */ PARSER_ERR_INVALID_UNICODE_ESCAPE_SEQUENCE, /**< invalid unicode escape sequence */ PARSER_ERR_INVALID_IDENTIFIER_START, /**< character cannot be start of an identifier */ @@ -57,9 +57,9 @@ typedef enum PARSER_ERR_MISSING_EXPONENT, /**< missing exponent */ PARSER_ERR_IDENTIFIER_AFTER_NUMBER, /**< identifier start after number */ PARSER_ERR_INVALID_UNDERSCORE_IN_NUMBER, /**< invalid use of underscore in number */ -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT PARSER_ERR_INVALID_BIGINT, /**< number is not a valid BigInt */ -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ PARSER_ERR_INVALID_REGEXP, /**< invalid regular expression */ PARSER_ERR_UNKNOWN_REGEXP_FLAG, /**< unknown regexp flag */ @@ -78,13 +78,13 @@ typedef enum PARSER_ERR_NEWLINE_NOT_ALLOWED, /**< newline is not allowed */ PARSER_ERR_OCTAL_NUMBER_NOT_ALLOWED, /**< octal numbers are not allowed in strict mode */ PARSER_ERR_OCTAL_ESCAPE_NOT_ALLOWED, /**< octal escape sequences are not allowed in strict mode */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT PARSER_ERR_TEMPLATE_STR_OCTAL_ESCAPE, /**< octal escape sequences are not allowed in template strings */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ PARSER_ERR_STRICT_IDENT_NOT_ALLOWED, /**< identifier name is reserved in strict mode */ PARSER_ERR_EVAL_NOT_ALLOWED, /**< eval is not allowed here in strict mode */ PARSER_ERR_ARGUMENTS_NOT_ALLOWED, /**< arguments is not allowed here in strict mode */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT PARSER_ERR_USE_STRICT_NOT_ALLOWED, /**< use strict directive is not allowed */ PARSER_ERR_YIELD_NOT_ALLOWED, /**< yield expression is not allowed */ PARSER_ERR_AWAIT_NOT_ALLOWED, /**< await expression is not allowed */ @@ -95,7 +95,7 @@ typedef enum PARSER_ERR_INVALID_LHS_ASSIGNMENT, /**< invalid LeftHandSide in assignment */ PARSER_ERR_INVALID_LHS_POSTFIX_OP, /**< invalid LeftHandSide expression in postfix operation */ PARSER_ERR_INVALID_LHS_FOR_LOOP, /**< invalid LeftHandSide in for-loop */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ PARSER_ERR_DELETE_IDENT_NOT_ALLOWED, /**< identifier delete is not allowed in strict mode */ PARSER_ERR_EVAL_CANNOT_ASSIGNED, /**< eval cannot be assigned in strict mode */ PARSER_ERR_ARGUMENTS_CANNOT_ASSIGNED, /**< arguments cannot be assigned in strict mode */ @@ -137,7 +137,7 @@ typedef enum PARSER_ERR_INVALID_RIGHT_SQUARE, /**< right square must terminate a block */ PARSER_ERR_DUPLICATED_LABEL, /**< duplicated label */ PARSER_ERR_OBJECT_PROPERTY_REDEFINED, /**< property of object literal redefined */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT PARSER_ERR_VARIABLE_REDECLARED, /**< a variable redeclared */ PARSER_ERR_LEXICAL_SINGLE_STATEMENT, /**< lexical declaration in single statement context */ PARSER_ERR_LABELLED_FUNC_NOT_IN_BLOCK, /**< labelled functions are only allowed inside blocks */ @@ -166,8 +166,8 @@ typedef enum PARSER_ERR_INVALID_NULLISH_COALESCING, /**< Cannot chain nullish with logical AND or OR. */ PARSER_ERR_NEW_TARGET_EXPECTED, /**< expected new.target expression */ PARSER_ERR_NEW_TARGET_NOT_ALLOWED, /**< new.target is not allowed in the given context */ -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_MODULE_SYSTEM) +#endif /* JERRY_ESNEXT */ +#if JERRY_MODULE_SYSTEM PARSER_ERR_FILE_NOT_FOUND, /**< file not found*/ PARSER_ERR_FROM_EXPECTED, /**< from expected */ PARSER_ERR_FROM_COMMA_EXPECTED, /**< from or comma expected */ @@ -180,7 +180,7 @@ typedef enum PARSER_ERR_DUPLICATED_EXPORT_IDENTIFIER, /**< duplicated export identifier name */ PARSER_ERR_DUPLICATED_IMPORT_BINDING, /**< duplicated import binding name */ PARSER_ERR_EXPORT_NOT_DEFINED, /**< export is not defined in module */ -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ PARSER_ERR_NON_STRICT_ARG_DEFINITION /**< non-strict argument definition */ } parser_error_t; @@ -209,9 +209,9 @@ parser_parse_script (const uint8_t *arg_list_p, ecma_value_t resource_name, uint32_t parse_opts); -#if ENABLED (JERRY_ERROR_MESSAGES) +#if JERRY_ERROR_MESSAGES const char *parser_error_to_string (parser_error_t); -#endif /* ENABLED (JERRY_ERROR_MESSAGES) */ +#endif /* JERRY_ERROR_MESSAGES */ /** * @} diff --git a/jerry-core/parser/js/js-scanner-internal.h b/jerry-core/parser/js/js-scanner-internal.h index 4f075c88f..e4cecf811 100644 --- a/jerry-core/parser/js/js-scanner-internal.h +++ b/jerry-core/parser/js/js-scanner-internal.h @@ -41,13 +41,13 @@ typedef enum SCAN_MODE_VAR_STATEMENT, /**< scanning var statement */ SCAN_MODE_PROPERTY_NAME, /**< scanning property name */ SCAN_MODE_FUNCTION_ARGUMENTS, /**< scanning function arguments */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT SCAN_MODE_CONTINUE_FUNCTION_ARGUMENTS, /**< continue scanning function arguments */ SCAN_MODE_BINDING, /**< array or object binding */ SCAN_MODE_CLASS_DECLARATION, /**< scanning class declaration */ SCAN_MODE_CLASS_BODY, /**< scanning class body */ SCAN_MODE_CLASS_BODY_NO_SCAN, /**< scanning class body without calling lexer_scan_identifier */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } scan_modes_t; /** @@ -61,9 +61,9 @@ typedef enum SCAN_STACK_FUNCTION_STATEMENT, /**< function statement */ SCAN_STACK_FUNCTION_EXPRESSION, /**< function expression */ SCAN_STACK_FUNCTION_PROPERTY, /**< function expression in an object literal */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT SCAN_STACK_FUNCTION_ARROW, /**< arrow function expression */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ SCAN_STACK_SWITCH_BLOCK, /**< block part of "switch" statement */ SCAN_STACK_IF_STATEMENT, /**< statement part of "if" statements */ SCAN_STACK_WITH_STATEMENT, /**< statement part of "with" statements */ @@ -73,19 +73,19 @@ typedef enum SCAN_STACK_WHILE_EXPRESSION, /**< expression part of "while" iterator */ SCAN_STACK_PAREN_EXPRESSION, /**< expression in brackets */ SCAN_STACK_STATEMENT_WITH_EXPR, /**< statement which starts with expression enclosed in brackets */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT SCAN_STACK_BINDING_INIT, /**< post processing after a single initializer */ SCAN_STACK_BINDING_LIST_INIT, /**< post processing after an initializer list */ SCAN_STACK_LET, /**< let statement */ SCAN_STACK_CONST, /**< const statement */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* The SCANNER_IS_FOR_START macro needs to be updated when the following constants are reordered. */ SCAN_STACK_VAR, /**< var statement */ SCAN_STACK_FOR_VAR_START, /**< start of "for" iterator with var statement */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT SCAN_STACK_FOR_LET_START, /**< start of "for" iterator with let statement */ SCAN_STACK_FOR_CONST_START, /**< start of "for" iterator with const statement */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ SCAN_STACK_FOR_START, /**< start of "for" iterator */ SCAN_STACK_FOR_CONDITION, /**< condition part of "for" iterator */ SCAN_STACK_FOR_EXPRESSION, /**< expression part of "for" iterator */ @@ -97,7 +97,7 @@ typedef enum SCAN_STACK_ARRAY_LITERAL, /**< array literal or destructuring assignment or binding */ SCAN_STACK_OBJECT_LITERAL, /**< object literal group */ SCAN_STACK_PROPERTY_ACCESSOR, /**< property accessor in square brackets */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* These four must be in this order. */ SCAN_STACK_COMPUTED_PROPERTY, /**< computed property name */ SCAN_STACK_COMPUTED_GENERATOR, /**< computed generator function */ @@ -118,10 +118,10 @@ typedef enum SCAN_STACK_FUNCTION_PARAMETERS, /**< function parameter initializer */ SCAN_STACK_FOR_START_PATTERN, /**< possible assignment pattern for "for" iterator */ SCAN_STACK_USE_ASYNC, /**< an "async" identifier is used */ -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_MODULE_SYSTEM) +#endif /* JERRY_ESNEXT */ +#if JERRY_MODULE_SYSTEM SCAN_STACK_EXPORT_DEFAULT, /**< scan primary expression after export default */ -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ } scan_stack_modes_t; /** @@ -130,12 +130,12 @@ typedef enum typedef enum { SCANNER_CONTEXT_NO_FLAGS = 0, /**< no flags are set */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT SCANNER_CONTEXT_THROW_ERR_ASYNC_FUNCTION = (1 << 0), /**< throw async function error */ -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_DEBUGGER) +#endif /* JERRY_ESNEXT */ +#if JERRY_DEBUGGER SCANNER_CONTEXT_DEBUGGER_ENABLED = (1 << 1), /**< debugger is enabled */ -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ } scanner_context_flags_t; /** @@ -167,24 +167,24 @@ typedef enum { SCANNER_LITERAL_IS_ARG = (1 << 0), /**< literal is argument */ SCANNER_LITERAL_IS_VAR = (1 << 1), /**< literal is var */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** literal is a destructured argument binding of a possible arrow function */ SCANNER_LITERAL_IS_ARROW_DESTRUCTURED_ARG = SCANNER_LITERAL_IS_VAR, -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ SCANNER_LITERAL_IS_FUNC = (1 << 2), /**< literal is function */ SCANNER_LITERAL_NO_REG = (1 << 3), /**< literal cannot be stored in a register */ SCANNER_LITERAL_IS_LET = (1 << 4), /**< literal is let */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** literal is a function declared in this block (prevents declaring let/const with the same name) */ SCANNER_LITERAL_IS_FUNC_DECLARATION = SCANNER_LITERAL_IS_LET, -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ SCANNER_LITERAL_IS_CONST = (1 << 5), /**< literal is const */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** literal is a destructured argument binding */ SCANNER_LITERAL_IS_DESTRUCTURED_ARG = SCANNER_LITERAL_IS_CONST, SCANNER_LITERAL_IS_USED = (1 << 6), /**< literal is used */ SCANNER_LITERAL_EARLY_CREATE = (1 << 7), /**< binding should be created early with ECMA_VALUE_UNINITIALIZED */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } scanner_literal_type_flags_t; /* @@ -233,7 +233,7 @@ typedef struct scanner_case_info_t **last_case_p; /**< last case info */ } scanner_switch_statement_t; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Types of scanner destructuring bindings. @@ -274,7 +274,7 @@ typedef struct scanner_binding_list_t bool is_nested; /**< is nested binding declaration */ } scanner_binding_list_t; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Flags for scanner_literal_pool_t structure. @@ -282,30 +282,30 @@ typedef struct scanner_binding_list_t typedef enum { SCANNER_LITERAL_POOL_FUNCTION = (1 << 0), /**< literal pool represents a function */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT SCANNER_LITERAL_POOL_CLASS_NAME = (1 << 1), /**< literal pool which contains a class name */ SCANNER_LITERAL_POOL_CLASS_FIELD = (1 << 2), /**< literal pool is created for a class field initializer */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ SCANNER_LITERAL_POOL_IS_STRICT = (1 << 3), /**< literal pool represents a strict mode code block */ SCANNER_LITERAL_POOL_CAN_EVAL = (1 << 4), /**< prepare for executing eval in this block */ SCANNER_LITERAL_POOL_NO_ARGUMENTS = (1 << 5), /**< arguments object must not be constructed, * or arguments cannot be stored in registers if * SCANNER_LITERAL_POOL_ARGUMENTS_IN_ARGS is set */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT SCANNER_LITERAL_POOL_ARGUMENTS_IN_ARGS = (1 << 6), /**< arguments is referenced in function args */ SCANNER_LITERAL_POOL_HAS_COMPLEX_ARGUMENT = (1 << 7), /**< function has complex (ES2015+) argument definition */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ SCANNER_LITERAL_POOL_IN_WITH = (1 << 8), /**< literal pool is in a with statement */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT SCANNER_LITERAL_POOL_ARROW = (1 << 9), /**< arrow function */ SCANNER_LITERAL_POOL_GENERATOR = (1 << 10), /**< generator function */ SCANNER_LITERAL_POOL_ASYNC = (1 << 11), /**< async function */ SCANNER_LITERAL_POOL_FUNCTION_STATEMENT = (1 << 12), /**< function statement */ SCANNER_LITERAL_POOL_HAS_SUPER_REFERENCE = (1 << 13), /**< function body contains super reference */ -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_MODULE_SYSTEM) +#endif /* JERRY_ESNEXT */ +#if JERRY_MODULE_SYSTEM SCANNER_LITERAL_POOL_IN_EXPORT = (1 << 14), /**< the declared variables are exported by the module system */ -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ } scanner_literal_pool_flags_t; /** @@ -332,7 +332,7 @@ typedef enum #define SCANNER_FROM_COMPUTED_TO_LITERAL_POOL(mode) \ (((mode) - SCAN_STACK_COMPUTED_PROPERTY) << 10) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Literal pool which may contains function argument identifiers @@ -340,14 +340,14 @@ typedef enum #define SCANNER_LITERAL_POOL_MAY_HAVE_ARGUMENTS(status_flags) \ (!((status_flags) & (SCANNER_LITERAL_POOL_CLASS_NAME | SCANNER_LITERAL_POOL_CLASS_FIELD))) -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ /** * Literal pool which may contains function argument identifiers */ #define SCANNER_LITERAL_POOL_MAY_HAVE_ARGUMENTS(status_flags) true -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Local literal pool. @@ -368,27 +368,27 @@ struct scanner_context_t { uint32_t context_status_flags; /**< original status flags of the context */ uint8_t mode; /**< scanner mode */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint8_t binding_type; /**< current destructuring binding type */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ uint16_t status_flags; /**< scanner status flags */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT scanner_binding_list_t *active_binding_list_p; /**< currently active binding list */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scanner_literal_pool_t *active_literal_pool_p; /**< currently active literal pool */ scanner_switch_statement_t active_switch_statement; /**< currently active switch statement */ scanner_info_t *end_arguments_p; /**< position of end arguments */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const uint8_t *async_source_p; /**< source position for async functions */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ }; /* Scanner utils. */ void scanner_raise_error (parser_context_t *context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT void scanner_raise_redeclaration_error (parser_context_t *context_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ void *scanner_malloc (parser_context_t *context_p, size_t size); void scanner_free (void *ptr, size_t size); @@ -400,23 +400,23 @@ scanner_info_t *scanner_insert_info_before (parser_context_t *context_p, const u scanner_literal_pool_t *scanner_push_literal_pool (parser_context_t *context_p, scanner_context_t *scanner_context_p, uint16_t status_flags); void scanner_pop_literal_pool (parser_context_t *context_p, scanner_context_t *scanner_context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT void scanner_filter_arguments (parser_context_t *context_p, scanner_context_t *scanner_context_p); void scanner_construct_global_block (parser_context_t *context_p, scanner_context_t *scanner_context_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_lit_location_t *scanner_add_custom_literal (parser_context_t *context_p, scanner_literal_pool_t *literal_pool_p, const lexer_lit_location_t *literal_location_p); lexer_lit_location_t *scanner_add_literal (parser_context_t *context_p, scanner_context_t *scanner_context_p); void scanner_add_reference (parser_context_t *context_p, scanner_context_t *scanner_context_p); lexer_lit_location_t *scanner_append_argument (parser_context_t *context_p, scanner_context_t *scanner_context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT void scanner_detect_invalid_var (parser_context_t *context_p, scanner_context_t *scanner_context_p, lexer_lit_location_t *var_literal_p); void scanner_detect_invalid_let (parser_context_t *context_p, lexer_lit_location_t *let_literal_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ void scanner_detect_eval_call (parser_context_t *context_p, scanner_context_t *scanner_context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT lexer_lit_location_t *scanner_push_class_declaration (parser_context_t *context_p, scanner_context_t *scanner_context_p, uint8_t stack_mode); void scanner_push_class_field_initializer (parser_context_t *context_p, scanner_context_t *scanner_context_p); @@ -424,11 +424,11 @@ void scanner_push_destructuring_pattern (parser_context_t *context_p, scanner_co uint8_t binding_type, bool is_nested); void scanner_pop_binding_list (scanner_context_t *scanner_context_p); void scanner_append_hole (parser_context_t *context_p, scanner_context_t *scanner_context_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* Scanner operations. */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT void scanner_add_async_literal (parser_context_t *context_p, scanner_context_t *scanner_context_p); void scanner_check_arrow (parser_context_t *context_p, scanner_context_t *scanner_context_p); void scanner_scan_simple_arrow (parser_context_t *context_p, scanner_context_t *scanner_context_p, @@ -436,7 +436,7 @@ void scanner_scan_simple_arrow (parser_context_t *context_p, scanner_context_t * void scanner_check_arrow_arg (parser_context_t *context_p, scanner_context_t *scanner_context_p); bool scanner_check_async_function (parser_context_t *context_p, scanner_context_t *scanner_context_p); void scanner_check_function_after_if (parser_context_t *context_p, scanner_context_t *scanner_context_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ void scanner_scan_bracket (parser_context_t *context_p, scanner_context_t *scanner_context_p); void scanner_check_directives (parser_context_t *context_p, scanner_context_t *scanner_context_p); diff --git a/jerry-core/parser/js/js-scanner-ops.c b/jerry-core/parser/js/js-scanner-ops.c index a76f25b93..f1b1450b1 100644 --- a/jerry-core/parser/js/js-scanner-ops.c +++ b/jerry-core/parser/js/js-scanner-ops.c @@ -17,7 +17,7 @@ #include "js-scanner-internal.h" #include "lit-char-helpers.h" -#if ENABLED (JERRY_PARSER) +#if JERRY_PARSER /** \addtogroup parser Parser * @{ @@ -29,7 +29,7 @@ * @{ */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Add the "async" literal to the literal pool. @@ -245,9 +245,9 @@ scanner_check_arrow_arg (parser_context_t *context_p, /**< context */ if (context_p->token.type == LEXER_LEFT_BRACE) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT parser_stack_push_uint8 (context_p, 0); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_stack_push_uint8 (context_p, SCAN_STACK_OBJECT_LITERAL); scanner_context_p->mode = SCAN_MODE_PROPERTY_NAME; return; @@ -367,7 +367,7 @@ typedef enum SCANNER_SCAN_BRACKET_ARROW_WITH_ONE_ARG, /**< arrow function with one argument */ } scanner_scan_bracket_arrow_type_t; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Scan bracketed expressions. @@ -377,19 +377,19 @@ scanner_scan_bracket (parser_context_t *context_p, /**< context */ scanner_context_t *scanner_context_p) /**< scanner context */ { size_t depth = 0; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const uint8_t *arrow_source_p; const uint8_t *async_source_p = NULL; scanner_scan_bracket_arrow_type_t arrow_type = SCANNER_SCAN_BRACKET_NO_ARROW; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ JERRY_ASSERT (context_p->token.type == LEXER_LEFT_PAREN); do { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT arrow_source_p = context_p->source_p; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ depth++; lexer_next_token (context_p); } @@ -403,13 +403,13 @@ scanner_scan_bracket (parser_context_t *context_p, /**< context */ { if (context_p->token.lit_location.type != LEXER_IDENT_LITERAL) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT arrow_source_p = NULL; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const uint8_t *source_p = context_p->source_p; if (lexer_check_arrow (context_p)) @@ -420,7 +420,7 @@ scanner_scan_bracket (parser_context_t *context_p, /**< context */ } size_t total_depth = depth; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ while (depth > 0 && lexer_check_next_character (context_p, LIT_CHAR_RIGHT_PAREN)) { @@ -431,19 +431,19 @@ scanner_scan_bracket (parser_context_t *context_p, /**< context */ if (context_p->token.keyword_type == LEXER_KEYW_EVAL && lexer_check_next_character (context_p, LIT_CHAR_LEFT_PAREN)) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* A function call cannot be an eval function. */ arrow_source_p = NULL; const uint16_t flags = (uint16_t) (SCANNER_LITERAL_POOL_CAN_EVAL | SCANNER_LITERAL_POOL_HAS_SUPER_REFERENCE); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ const uint16_t flags = SCANNER_LITERAL_POOL_CAN_EVAL; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scanner_context_p->active_literal_pool_p->status_flags |= flags; break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (total_depth == depth) { if (lexer_check_arrow_param (context_p)) @@ -473,10 +473,10 @@ scanner_scan_bracket (parser_context_t *context_p, /**< context */ } arrow_source_p = NULL; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LEXER_THREE_DOTS: case LEXER_LEFT_SQUARE: case LEXER_LEFT_BRACE: @@ -486,23 +486,23 @@ scanner_scan_bracket (parser_context_t *context_p, /**< context */ depth--; break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT arrow_source_p = NULL; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ break; } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (scanner_context_p->async_source_p != NULL) && (arrow_source_p == NULL || depth > 0)) { scanner_context_p->async_source_p = NULL; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ while (depth > 0) { @@ -510,7 +510,7 @@ scanner_scan_bracket (parser_context_t *context_p, /**< context */ depth--; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (arrow_source_p != NULL) { JERRY_ASSERT (async_source_p == NULL); @@ -558,7 +558,7 @@ scanner_scan_bracket (parser_context_t *context_p, /**< context */ scanner_context_p->async_source_p = async_source_p; scanner_check_async_function (context_p, scanner_context_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* scanner_scan_bracket */ /** @@ -614,4 +614,4 @@ scanner_check_directives (parser_context_t *context_p, /**< context */ * @} */ -#endif /* ENABLED (JERRY_PARSER) */ +#endif /* JERRY_PARSER */ diff --git a/jerry-core/parser/js/js-scanner-util.c b/jerry-core/parser/js/js-scanner-util.c index f250d49f2..dd1b5e61e 100644 --- a/jerry-core/parser/js/js-scanner-util.c +++ b/jerry-core/parser/js/js-scanner-util.c @@ -20,7 +20,7 @@ #include "js-scanner-internal.h" #include "lit-char-helpers.h" -#if ENABLED (JERRY_PARSER) +#if JERRY_PARSER /** \addtogroup parser Parser * @{ @@ -35,7 +35,7 @@ JERRY_STATIC_ASSERT (PARSER_MAXIMUM_NUMBER_OF_LITERALS + PARSER_MAXIMUM_NUMBER_OF_REGISTERS < PARSER_REGISTER_START, maximum_number_of_literals_plus_registers_must_be_less_than_register_start); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_STATIC_ASSERT ((SCANNER_LITERAL_IS_ARROW_DESTRUCTURED_ARG & SCANNER_LITERAL_IS_LOCAL) == 0, is_arrow_arg_binding_flag_must_not_use_local_flags); @@ -58,7 +58,7 @@ JERRY_STATIC_ASSERT (SCANNER_LITERAL_IS_FUNC_DECLARATION != SCANNER_LITERAL_IS_D JERRY_STATIC_ASSERT (PARSER_SCOPE_STACK_IS_CONST_REG == PARSER_SCOPE_STACK_IS_LOCAL_CREATED, scope_stack_is_const_reg_and_scope_stack_is_local_created_must_be_the_same); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Raise a scanner error. @@ -71,7 +71,7 @@ scanner_raise_error (parser_context_t *context_p) /**< context */ JERRY_ASSERT (0); } /* scanner_raise_error */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Raise a variable redeclaration error. @@ -85,7 +85,7 @@ scanner_raise_redeclaration_error (parser_context_t *context_p) /**< context */ scanner_raise_error (context_p); } /* scanner_raise_redeclaration_error */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Allocate memory for scanner. @@ -139,24 +139,24 @@ scanner_get_stream_size (scanner_info_t *info_p, /**< scanner info block */ switch (data_p[0] & SCANNER_STREAM_TYPE_MASK) { case SCANNER_STREAM_TYPE_VAR: -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCANNER_STREAM_TYPE_LET: case SCANNER_STREAM_TYPE_CONST: case SCANNER_STREAM_TYPE_LOCAL: -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_MODULE_SYSTEM) +#endif /* JERRY_ESNEXT */ +#if JERRY_MODULE_SYSTEM case SCANNER_STREAM_TYPE_IMPORT: -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ case SCANNER_STREAM_TYPE_ARG: -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCANNER_STREAM_TYPE_ARG_VAR: case SCANNER_STREAM_TYPE_DESTRUCTURED_ARG: case SCANNER_STREAM_TYPE_DESTRUCTURED_ARG_VAR: -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ case SCANNER_STREAM_TYPE_ARG_FUNC: -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCANNER_STREAM_TYPE_DESTRUCTURED_ARG_FUNC: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case SCANNER_STREAM_TYPE_FUNC: { break; @@ -386,7 +386,7 @@ scanner_seek (parser_context_t *context_p) /**< context */ context_p->next_scanner_info_p = prev_p->next_p; } /* scanner_seek */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Find any let/const declaration of a given literal. @@ -463,7 +463,7 @@ scanner_scope_find_lexical_declaration (parser_context_t *context_p, /**< contex return false; } /* scanner_scope_find_lexical_declaration */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Push a new literal pool. @@ -485,17 +485,17 @@ scanner_push_literal_pool (parser_context_t *context_p, /**< context */ JERRY_ASSERT (prev_literal_pool_p != NULL); status_flags |= SCANNER_LITERAL_POOL_NO_ARGUMENTS; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const uint16_t copied_flags = (SCANNER_LITERAL_POOL_IN_WITH | SCANNER_LITERAL_POOL_GENERATOR | SCANNER_LITERAL_POOL_ASYNC); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ const uint16_t copied_flags = SCANNER_LITERAL_POOL_IN_WITH; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ status_flags |= (uint16_t) (prev_literal_pool_p->status_flags & copied_flags); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else { context_p->status_flags &= (uint32_t) ~(PARSER_IS_GENERATOR_FUNCTION | PARSER_IS_ASYNC_FUNCTION); @@ -510,7 +510,7 @@ scanner_push_literal_pool (parser_context_t *context_p, /**< context */ context_p->status_flags |= PARSER_IS_ASYNC_FUNCTION; } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (prev_literal_pool_p != NULL) { @@ -568,13 +568,13 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ scanner_literal_pool_t *literal_pool_p = scanner_context_p->active_literal_pool_p; scanner_literal_pool_t *prev_literal_pool_p = literal_pool_p->prev_p; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const uint32_t arrow_super_flags = (SCANNER_LITERAL_POOL_ARROW | SCANNER_LITERAL_POOL_HAS_SUPER_REFERENCE); if ((literal_pool_p->status_flags & arrow_super_flags) == arrow_super_flags) { prev_literal_pool_p->status_flags |= SCANNER_LITERAL_POOL_HAS_SUPER_REFERENCE; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (JERRY_UNLIKELY (literal_pool_p->source_p == NULL)) { @@ -599,7 +599,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ arguments_type = SCANNER_ARGUMENTS_MAY_PRESENT_IN_EVAL; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (status_flags & SCANNER_LITERAL_POOL_ARGUMENTS_IN_ARGS) { arguments_type = SCANNER_ARGUMENTS_PRESENT; @@ -610,29 +610,29 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ status_flags &= (uint16_t) ~SCANNER_LITERAL_POOL_NO_ARGUMENTS; } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ uint8_t can_eval_types = 0; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (prev_literal_pool_p == NULL && !(context_p->global_status_flags & ECMA_PARSE_DIRECT_EVAL)) { can_eval_types |= SCANNER_LITERAL_IS_FUNC; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if ((status_flags & SCANNER_LITERAL_POOL_CAN_EVAL) && prev_literal_pool_p != NULL) { prev_literal_pool_p->status_flags |= SCANNER_LITERAL_POOL_CAN_EVAL; } -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if (scanner_context_p->status_flags & SCANNER_CONTEXT_DEBUGGER_ENABLED) { /* When debugger is enabled, identifiers are not stored in registers. However, * this does not affect 'eval' detection, so 'arguments' object is not created. */ status_flags |= SCANNER_LITERAL_POOL_CAN_EVAL; } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ parser_list_iterator_t literal_iterator; lexer_lit_location_t *literal_p; @@ -656,12 +656,12 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ if (!(status_flags & SCANNER_LITERAL_POOL_NO_ARGUMENTS) && scanner_literal_is_arguments (literal_p)) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_ASSERT (arguments_type != SCANNER_ARGUMENTS_NOT_PRESENT); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_ASSERT (arguments_type == SCANNER_ARGUMENTS_MAY_PRESENT || arguments_type == SCANNER_ARGUMENTS_MAY_PRESENT_IN_EVAL); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ status_flags |= SCANNER_LITERAL_POOL_NO_ARGUMENTS; @@ -672,7 +672,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ arguments_type = SCANNER_ARGUMENTS_NOT_PRESENT; last_argument_p = literal_p; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (type & SCANNER_LITERAL_IS_LOCAL) { if (arguments_type == SCANNER_ARGUMENTS_MAY_PRESENT || arguments_type == SCANNER_ARGUMENTS_MAY_PRESENT_IN_EVAL) @@ -703,15 +703,15 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ } } } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ else if (type & SCANNER_LITERAL_IS_FUNC) { arguments_type = SCANNER_ARGUMENTS_NOT_PRESENT; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ else { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if ((type & SCANNER_LITERAL_IS_VAR) && (arguments_type == SCANNER_ARGUMENTS_PRESENT || arguments_type == SCANNER_ARGUMENTS_PRESENT_NO_REG)) { @@ -728,7 +728,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ literal_p->type = type; no_declarations--; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if ((type & SCANNER_LITERAL_NO_REG) || arguments_type == SCANNER_ARGUMENTS_MAY_PRESENT_IN_EVAL) { @@ -739,17 +739,17 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ arguments_type = SCANNER_ARGUMENTS_PRESENT; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* The SCANNER_LITERAL_IS_ARG may be set above. */ if (!(type & SCANNER_LITERAL_IS_ARG)) { literal_p->type = 0; continue; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ literal_p->type = 0; continue; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } } else if (type & SCANNER_LITERAL_IS_ARG) @@ -757,7 +757,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ last_argument_p = literal_p; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if ((status_flags & SCANNER_LITERAL_POOL_FUNCTION) && (type & SCANNER_LITERAL_IS_LOCAL_FUNC) == SCANNER_LITERAL_IS_FUNC) { @@ -775,7 +775,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ type &= (uint8_t) ~SCANNER_LITERAL_IS_FUNC; literal_p->type = type; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if ((type & SCANNER_LITERAL_IS_LOCAL) || ((type & (SCANNER_LITERAL_IS_VAR | SCANNER_LITERAL_IS_ARG)) @@ -802,7 +802,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ { no_declarations++; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if ((type & (SCANNER_LITERAL_IS_CONST | SCANNER_LITERAL_IS_ARG)) == SCANNER_LITERAL_IS_CONST) { JERRY_ASSERT (type & SCANNER_LITERAL_IS_LET); @@ -811,14 +811,14 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ literal_p->type = (uint8_t) (type & ~SCANNER_LITERAL_IS_FUNC); no_declarations--; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ if (type & SCANNER_LITERAL_IS_LOCAL) { /* Catch parameters cannot be functions. */ literal_p->type = (uint8_t) (type & ~SCANNER_LITERAL_IS_FUNC); no_declarations--; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } intptr_t diff = (intptr_t) (literal_p->char_p - prev_source_p); @@ -839,9 +839,9 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ prev_source_p = literal_p->char_p + literal_p->length; if ((status_flags & SCANNER_LITERAL_POOL_FUNCTION) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT || ((type & SCANNER_LITERAL_IS_FUNC) && (status_flags & SCANNER_LITERAL_POOL_IS_STRICT)) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ || !(type & (SCANNER_LITERAL_IS_VAR | SCANNER_LITERAL_IS_FUNC))) { continue; @@ -856,18 +856,18 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ literal_p); uint8_t extended_type = literal_location_p->type; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const uint16_t no_reg_flags = (SCANNER_LITERAL_POOL_FUNCTION | SCANNER_LITERAL_POOL_CLASS_FIELD); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ const uint16_t no_reg_flags = SCANNER_LITERAL_POOL_FUNCTION; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if ((status_flags & no_reg_flags) || (type & SCANNER_LITERAL_NO_REG)) { extended_type |= SCANNER_LITERAL_NO_REG; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT extended_type |= SCANNER_LITERAL_IS_USED; if (status_flags & SCANNER_LITERAL_POOL_FUNCTION_STATEMENT) @@ -885,7 +885,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ * for speculative arrow parameters and local (non-var) functions. */ type = 0; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ type = (uint8_t) (type & (SCANNER_LITERAL_IS_VAR | SCANNER_LITERAL_IS_FUNC)); JERRY_ASSERT (type == 0 || !(status_flags & SCANNER_LITERAL_POOL_FUNCTION)); @@ -947,11 +947,11 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ no_declarations++; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const uint16_t is_unmapped = SCANNER_LITERAL_POOL_IS_STRICT | SCANNER_LITERAL_POOL_HAS_COMPLEX_ARGUMENT; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ const uint16_t is_unmapped = SCANNER_LITERAL_POOL_IS_STRICT; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (!(status_flags & is_unmapped)) { @@ -973,7 +973,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ last_argument_p = NULL; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (status_flags & (SCANNER_LITERAL_POOL_HAS_COMPLEX_ARGUMENT | SCANNER_LITERAL_POOL_ARROW)) { u8_arg |= SCANNER_FUNCTION_HAS_COMPLEX_ARGUMENT; @@ -998,7 +998,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ { u8_arg |= SCANNER_FUNCTION_IS_STRICT; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ info_p->u8_arg = u8_arg; info_p->u16_arg = (uint16_t) no_declarations; @@ -1048,19 +1048,19 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ { type = SCANNER_STREAM_TYPE_ARG_FUNC; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (literal_p->type & SCANNER_LITERAL_IS_DESTRUCTURED_ARG) { type = SCANNER_STREAM_TYPE_DESTRUCTURED_ARG_FUNC; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } } else if (literal_p->type & SCANNER_LITERAL_IS_ARG) { type = SCANNER_STREAM_TYPE_ARG; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (literal_p->type & SCANNER_LITERAL_IS_DESTRUCTURED_ARG) { type = SCANNER_STREAM_TYPE_DESTRUCTURED_ARG; @@ -1073,9 +1073,9 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ JERRY_ASSERT (type == SCANNER_STREAM_TYPE_ARG_VAR || type == SCANNER_STREAM_TYPE_DESTRUCTURED_ARG_VAR); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (literal_p->type & SCANNER_LITERAL_IS_LET) { if (!(literal_p->type & SCANNER_LITERAL_IS_CONST)) @@ -1087,12 +1087,12 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ literal_p->type |= SCANNER_LITERAL_EARLY_CREATE; } } -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM else if (prev_literal_pool_p == NULL) { type = SCANNER_STREAM_TYPE_IMPORT; } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ else { type = SCANNER_STREAM_TYPE_LOCAL; @@ -1112,7 +1112,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ { type |= SCANNER_STREAM_NO_REG | SCANNER_STREAM_EARLY_CREATE; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (literal_p->has_escape) { @@ -1150,8 +1150,8 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ else { data_p[-1] = 0; - memcpy (data_p, &literal_p->char_p, sizeof (const uint8_t *)); - data_p += sizeof (const uint8_t *); + memcpy (data_p, &literal_p->char_p, sizeof (uintptr_t)); + data_p += sizeof (uintptr_t); } if (literal_p == last_argument_p) @@ -1184,7 +1184,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ context_p->status_flags &= (uint32_t) ~PARSER_IS_STRICT; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (prev_literal_pool_p->status_flags & SCANNER_LITERAL_POOL_GENERATOR) { context_p->status_flags |= PARSER_IS_GENERATOR_FUNCTION; @@ -1202,7 +1202,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ { context_p->status_flags &= (uint32_t) ~PARSER_IS_ASYNC_FUNCTION; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } scanner_context_p->active_literal_pool_p = literal_pool_p->prev_p; @@ -1211,7 +1211,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */ scanner_free (literal_pool_p, sizeof (scanner_literal_pool_t)); } /* scanner_pop_literal_pool */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Filter out the arguments from a literal pool. @@ -1363,7 +1363,7 @@ scanner_filter_arguments (parser_context_t *context_p, /**< context */ scanner_free (literal_pool_p, sizeof (scanner_literal_pool_t)); } /* scanner_filter_arguments */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Add any literal to the specified literal pool. @@ -1418,13 +1418,13 @@ scanner_add_custom_literal (parser_context_t *context_p, /**< context */ } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (literal_pool_p->status_flags & SCANNER_LITERAL_POOL_CLASS_NAME)) { literal_pool_p = literal_pool_p->prev_p; continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ literal_p = (lexer_lit_location_t *) parser_list_append (context_p, &literal_pool_p->literal_pool); *literal_p = *literal_location_p; @@ -1462,9 +1462,9 @@ scanner_add_reference (parser_context_t *context_p, /**< context */ lexer_lit_location_t *lit_location_p = scanner_add_custom_literal (context_p, scanner_context_p->active_literal_pool_p, &context_p->token.lit_location); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT lit_location_p->type |= SCANNER_LITERAL_IS_USED; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (scanner_context_p->active_literal_pool_p->status_flags & SCANNER_LITERAL_POOL_IN_WITH) { @@ -1531,12 +1531,12 @@ scanner_append_argument (parser_context_t *context_p, /**< context */ { literal_p->length = 0; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (literal_p->type & SCANNER_LITERAL_IS_USED) { literal_type = SCANNER_LITERAL_IS_ARG | SCANNER_LITERAL_EARLY_CREATE; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } literal_p = (lexer_lit_location_t *) parser_list_append (context_p, &literal_pool_p->literal_pool); @@ -1557,17 +1557,17 @@ scanner_detect_eval_call (parser_context_t *context_p, /**< context */ if (context_p->token.keyword_type == LEXER_KEYW_EVAL && lexer_check_next_character (context_p, LIT_CHAR_LEFT_PAREN)) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const uint16_t flags = (uint16_t) (SCANNER_LITERAL_POOL_CAN_EVAL | SCANNER_LITERAL_POOL_HAS_SUPER_REFERENCE); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ const uint16_t flags = SCANNER_LITERAL_POOL_CAN_EVAL; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scanner_context_p->active_literal_pool_p->status_flags |= flags; } } /* scanner_detect_eval_call */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Throws an error for invalid var statements. @@ -1689,10 +1689,10 @@ scanner_push_class_declaration (parser_context_t *context_p, /**< context */ const uint8_t *source_p = context_p->source_p; lexer_lit_location_t *literal_p = NULL; -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM bool is_export_default = context_p->stack_top_uint8 == SCAN_STACK_EXPORT_DEFAULT; JERRY_ASSERT (!is_export_default || stack_mode == SCAN_STACK_CLASS_EXPRESSION); -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ parser_stack_push_uint8 (context_p, stack_mode); lexer_next_token (context_p); @@ -1707,7 +1707,7 @@ scanner_push_class_declaration (parser_context_t *context_p, /**< context */ literal_p = scanner_add_literal (context_p, scanner_context_p); scanner_context_p->active_literal_pool_p->no_declarations++; } -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM else if (is_export_default) { literal_p = scanner_add_literal (context_p, scanner_context_p); @@ -1722,7 +1722,7 @@ scanner_push_class_declaration (parser_context_t *context_p, /**< context */ literal_p->type |= SCANNER_LITERAL_IS_LET | SCANNER_LITERAL_NO_REG; } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ } scanner_literal_pool_t *literal_pool_p = scanner_push_literal_pool (context_p, scanner_context_p, 0); @@ -1732,7 +1732,7 @@ scanner_push_class_declaration (parser_context_t *context_p, /**< context */ scanner_add_literal (context_p, scanner_context_p); scanner_context_p->active_literal_pool_p->no_declarations++; } -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM else if (is_export_default) { lexer_lit_location_t *name_literal_p; @@ -1743,7 +1743,7 @@ scanner_push_class_declaration (parser_context_t *context_p, /**< context */ name_literal_p->type |= SCANNER_LITERAL_IS_LET | SCANNER_LITERAL_NO_REG; scanner_context_p->active_literal_pool_p->no_declarations++; } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ literal_pool_p->source_p = source_p; literal_pool_p->status_flags |= SCANNER_LITERAL_POOL_CLASS_NAME; @@ -1812,6 +1812,8 @@ void scanner_pop_binding_list (scanner_context_t *scanner_context_p) /**< scanner context */ { scanner_binding_list_t *binding_list_p = scanner_context_p->active_binding_list_p; + JERRY_ASSERT (binding_list_p != NULL); + scanner_binding_item_t *item_p = binding_list_p->items_p; scanner_binding_list_t *prev_binding_list_p = binding_list_p->prev_p; bool is_nested = binding_list_p->is_nested; @@ -1819,8 +1821,6 @@ scanner_pop_binding_list (scanner_context_t *scanner_context_p) /**< scanner con scanner_free (binding_list_p, sizeof (scanner_binding_list_t)); scanner_context_p->active_binding_list_p = prev_binding_list_p; - JERRY_ASSERT (binding_list_p != NULL); - if (!is_nested) { while (item_p != NULL) @@ -1865,7 +1865,7 @@ scanner_append_hole (parser_context_t *context_p, scanner_context_t *scanner_con literal_p->has_escape = 0; } /* scanner_append_hole */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Reverse the scanner info chain after the scanning is completed. @@ -1932,14 +1932,14 @@ scanner_cleanup (parser_context_t *context_p) /**< context */ } case SCANNER_TYPE_WHILE: case SCANNER_TYPE_FOR_IN: -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCANNER_TYPE_FOR_OF: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case SCANNER_TYPE_CASE: -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCANNER_TYPE_INITIALIZER: case SCANNER_TYPE_CLASS_FIELD_INITIALIZER_END: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { size = sizeof (scanner_location_info_t); break; @@ -1957,7 +1957,7 @@ scanner_cleanup (parser_context_t *context_p) /**< context */ } default: { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_ASSERT (scanner_info_p->type == SCANNER_TYPE_END_ARGUMENTS || scanner_info_p->type == SCANNER_TYPE_LITERAL_FLAGS || scanner_info_p->type == SCANNER_TYPE_CLASS_CONSTRUCTOR @@ -1965,9 +1965,9 @@ scanner_cleanup (parser_context_t *context_p) /**< context */ || scanner_info_p->type == SCANNER_TYPE_ERR_REDECLARED || scanner_info_p->type == SCANNER_TYPE_ERR_ASYNC_FUNCTION || scanner_info_p->type == SCANNER_TYPE_EXPORT_MODULE_SPECIFIER); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_ASSERT (scanner_info_p->type == SCANNER_TYPE_END_ARGUMENTS); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ break; } } @@ -1995,13 +1995,13 @@ scanner_is_context_needed (parser_context_t *context_p, /**< context */ JERRY_UNUSED (check_type); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_ASSERT ((check_type == PARSER_CHECK_BLOCK_CONTEXT ? info_p->type == SCANNER_TYPE_BLOCK : info_p->type == SCANNER_TYPE_FUNCTION)); uint32_t scope_stack_reg_top = (check_type != PARSER_CHECK_GLOBAL_CONTEXT ? context_p->scope_stack_reg_top : 0); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_ASSERT (check_type == PARSER_CHECK_BLOCK_CONTEXT); JERRY_ASSERT (info_p->type == SCANNER_TYPE_BLOCK); @@ -2012,7 +2012,7 @@ scanner_is_context_needed (parser_context_t *context_p, /**< context */ { uint8_t data = data_p[0]; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint32_t type = data & SCANNER_STREAM_TYPE_MASK; if (JERRY_UNLIKELY (check_type == PARSER_CHECK_FUNCTION_CONTEXT)) @@ -2048,11 +2048,11 @@ scanner_is_context_needed (parser_context_t *context_p, /**< context */ } else if (check_type == PARSER_CHECK_GLOBAL_CONTEXT) { -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM const bool is_import = (type == SCANNER_STREAM_TYPE_IMPORT); #else const bool is_import = true; -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ /* FIXME: a private declarative lexical environment should always be present * for modules. Remove SCANNER_STREAM_TYPE_IMPORT after it is implemented. */ @@ -2086,9 +2086,9 @@ scanner_is_context_needed (parser_context_t *context_p, /**< context */ } #endif /* !JERRY_NDEBUG */ -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_ASSERT ((data & SCANNER_STREAM_TYPE_MASK) == SCANNER_STREAM_TYPE_VAR); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (!(data & SCANNER_STREAM_UINT16_DIFF)) { @@ -2106,12 +2106,12 @@ scanner_is_context_needed (parser_context_t *context_p, /**< context */ data_p += 2 + 2; } -#if ENABLED (JERRY_ESNEXT) -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_ESNEXT +#if JERRY_MODULE_SYSTEM const bool is_import = (type == SCANNER_STREAM_TYPE_IMPORT); -#else /* !ENABLED (JERRY_MODULE_SYSTEM) */ +#else /* !JERRY_MODULE_SYSTEM */ const bool is_import = false; -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ if (JERRY_UNLIKELY (check_type == PARSER_CHECK_GLOBAL_CONTEXT) && (type == SCANNER_STREAM_TYPE_VAR @@ -2144,7 +2144,7 @@ scanner_is_context_needed (parser_context_t *context_p, /**< context */ continue; } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if ((data & SCANNER_STREAM_NO_REG) || scope_stack_reg_top >= PARSER_MAXIMUM_NUMBER_OF_REGISTERS) @@ -2158,7 +2158,7 @@ scanner_is_context_needed (parser_context_t *context_p, /**< context */ return false; } /* scanner_is_context_needed */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Try to scan/parse the ".target" part in the "new.target" expression. @@ -2196,7 +2196,7 @@ scanner_try_scan_new_target (parser_context_t *context_p) /**< parser/scanner co return false; } /* scanner_try_scan_new_target */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Description of "arguments" literal string. @@ -2226,7 +2226,7 @@ scanner_create_unused_literal (parser_context_t *context_p, /**< context */ context_p->literal_count++; } /* scanner_create_unused_literal */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Emit checks for redeclared bindings in the global lexical scope. */ @@ -2260,8 +2260,8 @@ scanner_check_variables (parser_context_t *context_p) /**< context */ } else { - memcpy (&literal.char_p, data_p + 2 + 1, sizeof (const uint8_t *)); - next_data_p += 2 + 1 + sizeof (const uint8_t *); + memcpy (&literal.char_p, data_p + 2 + 1, sizeof (uintptr_t)); + next_data_p += 2 + 1 + sizeof (uintptr_t); } } else @@ -2284,12 +2284,12 @@ scanner_check_variables (parser_context_t *context_p) /**< context */ lexer_construct_literal_object (context_p, &literal, LEXER_NEW_IDENT_LITERAL); literal.char_p += data_p[1]; -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM if (type == SCANNER_STREAM_TYPE_IMPORT) { continue; } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ context_p->lit_object.literal_p->status_flags |= LEXER_FLAG_USED; @@ -2308,7 +2308,7 @@ scanner_check_variables (parser_context_t *context_p) /**< context */ parser_flush_cbc (context_p); } /* scanner_check_variables */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Create and/or initialize var/let/const/function/etc. variables. @@ -2371,9 +2371,9 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ && !SCANNER_STREAM_TYPE_IS_ARG (type) && !SCANNER_STREAM_TYPE_IS_ARG_FUNC (type))); -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM JERRY_ASSERT (type != SCANNER_STREAM_TYPE_IMPORT || (data_p[0] & SCANNER_STREAM_NO_REG)); -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ if (JERRY_UNLIKELY (type == SCANNER_STREAM_TYPE_HOLE)) { @@ -2428,9 +2428,9 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ { map_to = (uint16_t) (PARSER_REGISTER_START + scope_stack_reg_top); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT scope_stack_p->map_to = (uint16_t) (scope_stack_reg_top + 1); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scope_stack_reg_top++; } @@ -2441,28 +2441,28 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ context_p->status_flags |= PARSER_LEXICAL_ENV_NEEDED; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (data_p[0] & SCANNER_STREAM_LOCAL_ARGUMENTS) { context_p->status_flags |= PARSER_LEXICAL_BLOCK_NEEDED; } scope_stack_p->map_to = 0; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT scope_stack_p->map_to = map_to; -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ scope_stack_p++; -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE context_p->scope_stack_top = (uint16_t) (scope_stack_p - context_p->scope_stack_p); -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ parser_emit_cbc_ext_literal (context_p, CBC_EXT_CREATE_ARGUMENTS, map_to); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (type == SCANNER_STREAM_TYPE_ARGUMENTS_FUNC) { if (JERRY_UNLIKELY (scope_stack_p >= scope_stack_end_p)) @@ -2477,7 +2477,7 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ scanner_create_unused_literal (context_p, 0); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (option_flags & SCANNER_CREATE_VARS_IS_FUNCTION_ARGS) { @@ -2497,8 +2497,8 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ } else { - memcpy (&literal.char_p, data_p + 2 + 1, sizeof (const uint8_t *)); - next_data_p += 2 + 1 + sizeof (const uint8_t *); + memcpy (&literal.char_p, data_p + 2 + 1, sizeof (uintptr_t)); + next_data_p += 2 + 1 + sizeof (uintptr_t); } } else @@ -2518,7 +2518,7 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ { if (option_flags & SCANNER_CREATE_VARS_IS_FUNCTION_BODY) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if ((context_p->status_flags & PARSER_LEXICAL_BLOCK_NEEDED) && (type == SCANNER_STREAM_TYPE_ARG_VAR || type == SCANNER_STREAM_TYPE_DESTRUCTURED_ARG_VAR)) { @@ -2534,7 +2534,7 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ parser_emit_cbc_ext_literal_from_token (context_p, CBC_EXT_COPY_FROM_ARG); } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ literal.char_p += data_p[1]; continue; @@ -2558,9 +2558,9 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ { JERRY_ASSERT (scope_stack_p >= context_p->scope_stack_p + 2); JERRY_ASSERT (context_p->status_flags & PARSER_IS_FUNCTION); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_ASSERT (!(context_p->status_flags & PARSER_FUNCTION_IS_PARSING_ARGS)); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_scope_stack_t *function_map_p = scope_stack_p - 2; uint16_t literal_index = context_p->lit_object.index; @@ -2576,13 +2576,13 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ cbc_opcode_t opcode = CBC_SET_VAR_FUNC; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (context_p->status_flags & PARSER_LEXICAL_BLOCK_NEEDED) && (function_map_p[0].map_to & PARSER_SCOPE_STACK_REGISTER_MASK) == 0) { opcode = CBC_INIT_ARG_OR_FUNC; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_emit_cbc_literal_value (context_p, (uint16_t) opcode, @@ -2599,19 +2599,19 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ scope_stack_p->map_from = context_p->lit_object.index; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (info_type == SCANNER_TYPE_FUNCTION) { if (type != SCANNER_STREAM_TYPE_LET -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM && type != SCANNER_STREAM_TYPE_IMPORT -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ && type != SCANNER_STREAM_TYPE_CONST) { context_p->lit_object.literal_p->status_flags |= LEXER_FLAG_GLOBAL; } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ uint16_t map_to; uint16_t func_init_opcode = CBC_INIT_ARG_OR_FUNC; @@ -2621,14 +2621,14 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ { map_to = (uint16_t) (PARSER_REGISTER_START + scope_stack_reg_top); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT scope_stack_p->map_to = (uint16_t) (scope_stack_reg_top + 1); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ scope_stack_p->map_to = map_to; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scope_stack_reg_top++; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT switch (type) { case SCANNER_STREAM_TYPE_CONST: @@ -2650,18 +2650,18 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ } func_init_opcode = CBC_SET_VAR_FUNC; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } else { context_p->lit_object.literal_p->status_flags |= LEXER_FLAG_USED; map_to = context_p->lit_object.index; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint16_t scope_stack_map_to = 0; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ scope_stack_p->map_to = map_to; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (info_type == SCANNER_TYPE_FUNCTION) { @@ -2670,7 +2670,7 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ switch (type) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCANNER_STREAM_TYPE_LET: case SCANNER_STREAM_TYPE_CONST: case SCANNER_STREAM_TYPE_DESTRUCTURED_ARG: @@ -2687,14 +2687,14 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ /* FALLTHRU */ } case SCANNER_STREAM_TYPE_LOCAL: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case SCANNER_STREAM_TYPE_VAR: { -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE context_p->scope_stack_top = (uint16_t) (scope_stack_p - context_p->scope_stack_p); -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint16_t opcode; switch (type) @@ -2736,44 +2736,44 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ break; } } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ uint16_t opcode = ((option_flags & SCANNER_CREATE_VARS_IS_SCRIPT) ? CBC_CREATE_VAR_EVAL : CBC_CREATE_VAR); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_emit_cbc_literal (context_p, opcode, map_to); break; } case SCANNER_STREAM_TYPE_ARG: -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCANNER_STREAM_TYPE_ARG_VAR: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case SCANNER_STREAM_TYPE_ARG_FUNC: { -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE context_p->scope_stack_top = (uint16_t) (scope_stack_p - context_p->scope_stack_p); -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT scope_stack_map_to |= PARSER_SCOPE_STACK_NO_FUNCTION_COPY; /* Argument initializers of functions with simple arguments (e.g. function f(a,b,a) {}) are * generated here. The other initializers are handled by parser_parse_function_arguments(). */ if (!(info_u8_arg & SCANNER_FUNCTION_HAS_COMPLEX_ARGUMENT)) { -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_emit_cbc_literal_value (context_p, CBC_INIT_ARG_OR_FUNC, (uint16_t) (PARSER_REGISTER_START + scope_stack_reg_top), map_to); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT } else if (data_p[0] & SCANNER_STREAM_EARLY_CREATE) { parser_emit_cbc_literal (context_p, CBC_CREATE_LOCAL, map_to); scope_stack_map_to |= PARSER_SCOPE_STACK_IS_LOCAL_CREATED; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (scope_stack_reg_top < PARSER_MAXIMUM_NUMBER_OF_REGISTERS) { @@ -2783,9 +2783,9 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT scope_stack_p->map_to = scope_stack_map_to; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } scope_stack_p++; @@ -2801,15 +2801,15 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ parser_raise_error (context_p, PARSER_ERR_SCOPE_STACK_LIMIT_REACHED); } -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE context_p->scope_stack_top = (uint16_t) (scope_stack_p - context_p->scope_stack_p); -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ if (!SCANNER_STREAM_TYPE_IS_ARG_FUNC (type)) { if (func_init_opcode == CBC_INIT_ARG_OR_FUNC && (option_flags & SCANNER_CREATE_VARS_IS_SCRIPT)) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT literal.char_p -= data_p[1]; if (!scanner_scope_find_lexical_declaration (context_p, &literal)) @@ -2822,9 +2822,9 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ } } literal.char_p += data_p[1]; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ func_init_opcode = CBC_CREATE_VAR_FUNC_EVAL; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } parser_emit_cbc_literal_value (context_p, func_init_opcode, context_p->literal_count, map_to); @@ -2840,12 +2840,12 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ context_p->scope_stack_top = (uint16_t) (scope_stack_p - context_p->scope_stack_p); context_p->scope_stack_reg_top = (uint16_t) scope_stack_reg_top; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (info_type == SCANNER_TYPE_FUNCTION) { context_p->scope_stack_global_end = context_p->scope_stack_top; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (context_p->register_count < scope_stack_reg_top) { @@ -2891,15 +2891,15 @@ scanner_decode_map_to (parser_scope_stack_t *stack_item_p) /**< scope stack item { JERRY_ASSERT (stack_item_p->map_from != PARSER_SCOPE_STACK_FUNC); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint16_t value = (stack_item_p->map_to & PARSER_SCOPE_STACK_REGISTER_MASK); return (value == 0) ? stack_item_p->map_from : (uint16_t) (value + (PARSER_REGISTER_START - 1)); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ return stack_item_p->map_to; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } /* scanner_decode_map_to */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Find the given literal index in the scope stack @@ -3016,7 +3016,7 @@ scanner_literal_exists (parser_context_t *context_p, /**< context */ return false; } /* scanner_literal_exists */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} @@ -3024,4 +3024,4 @@ scanner_literal_exists (parser_context_t *context_p, /**< context */ * @} */ -#endif /* ENABLED (JERRY_PARSER) */ +#endif /* JERRY_PARSER */ diff --git a/jerry-core/parser/js/js-scanner.c b/jerry-core/parser/js/js-scanner.c index b70e5ce33..fabc8dd8b 100644 --- a/jerry-core/parser/js/js-scanner.c +++ b/jerry-core/parser/js/js-scanner.c @@ -18,7 +18,7 @@ #include "js-scanner-internal.h" #include "lit-char-helpers.h" -#if ENABLED (JERRY_PARSER) +#if JERRY_PARSER /** \addtogroup parser Parser * @{ @@ -42,13 +42,13 @@ typedef enum /** * Checks whether token type is "of". */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define SCANNER_IDENTIFIER_IS_OF() (lexer_token_is_identifier (context_p, "of", 2)) #else #define SCANNER_IDENTIFIER_IS_OF() (false) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_STATIC_ASSERT (SCANNER_FROM_LITERAL_POOL_TO_COMPUTED (SCANNER_LITERAL_POOL_GENERATOR) == SCAN_STACK_COMPUTED_GENERATOR, @@ -64,7 +64,7 @@ JERRY_STATIC_ASSERT (SCANNER_FROM_COMPUTED_TO_LITERAL_POOL (SCAN_STACK_COMPUTED_ == SCANNER_LITERAL_POOL_ASYNC, scanner_invalid_conversion_from_computed_async_to_literal_pool_async); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Scan primary expression. @@ -83,12 +83,12 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ { scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION_AFTER_NEW; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (scanner_try_scan_new_target (context_p)) { scanner_context_p->mode = SCAN_MODE_POST_PRIMARY_EXPRESSION; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ break; } case LEXER_DIVIDE: @@ -101,11 +101,11 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ case LEXER_KEYW_FUNCTION: { uint16_t status_flags = SCANNER_LITERAL_POOL_FUNCTION; -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM bool is_export_default = stack_top == SCAN_STACK_EXPORT_DEFAULT; -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (scanner_context_p->async_source_p != NULL) { status_flags |= SCANNER_LITERAL_POOL_ASYNC; @@ -115,7 +115,7 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ { status_flags |= SCANNER_LITERAL_POOL_GENERATOR; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scanner_push_literal_pool (context_p, scanner_context_p, status_flags); @@ -124,7 +124,7 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ if (context_p->token.type == LEXER_LITERAL && context_p->token.lit_location.type == LEXER_IDENT_LITERAL) { -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM if (is_export_default) { lexer_lit_location_t *location_p; @@ -135,10 +135,10 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ scanner_detect_invalid_let (context_p, location_p); location_p->type |= SCANNER_LITERAL_IS_FUNC | SCANNER_LITERAL_IS_LET; } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ lexer_next_token (context_p); } -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM else if (is_export_default) { lexer_lit_location_t *location_p; @@ -147,7 +147,7 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ &lexer_default_literal); location_p->type |= SCANNER_LITERAL_IS_FUNC | SCANNER_LITERAL_IS_LET; } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ parser_stack_push_uint8 (context_p, SCAN_STACK_FUNCTION_EXPRESSION); scanner_context_p->mode = SCAN_MODE_FUNCTION_ARGUMENTS; @@ -160,9 +160,9 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ } case LEXER_LEFT_SQUARE: { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT scanner_push_destructuring_pattern (context_p, scanner_context_p, SCANNER_BINDING_NONE, false); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_stack_push_uint8 (context_p, SCAN_STACK_ARRAY_LITERAL); scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION; @@ -170,16 +170,16 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ } case LEXER_LEFT_BRACE: { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT scanner_push_destructuring_pattern (context_p, scanner_context_p, SCANNER_BINDING_NONE, false); parser_stack_push_uint8 (context_p, 0); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_stack_push_uint8 (context_p, SCAN_STACK_OBJECT_LITERAL); scanner_context_p->mode = SCAN_MODE_PROPERTY_NAME; return SCAN_KEEP_TOKEN; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LEXER_TEMPLATE_LITERAL: { if (context_p->source_p[-1] != LIT_CHAR_GRAVE_ACCENT) @@ -192,10 +192,10 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ /* The string is a normal string literal. */ /* FALLTHRU */ } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case LEXER_LITERAL: { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const uint8_t *source_p = context_p->source_p; if (context_p->token.lit_location.type == LEXER_IDENT_LITERAL @@ -211,11 +211,11 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ scanner_check_async_function (context_p, scanner_context_p); return SCAN_KEEP_TOKEN; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (context_p->token.lit_location.type == LEXER_IDENT_LITERAL) { -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM if (stack_top == SCAN_STACK_EXPORT_DEFAULT) { lexer_lit_location_t *location_p = scanner_add_literal (context_p, scanner_context_p); @@ -224,7 +224,7 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ scanner_context_p->mode = SCAN_MODE_POST_PRIMARY_EXPRESSION; break; } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ scanner_add_reference (context_p, scanner_context_p); } @@ -238,7 +238,7 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ scanner_context_p->mode = SCAN_MODE_POST_PRIMARY_EXPRESSION; break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LEXER_KEYW_SUPER: { scanner_context_p->active_literal_pool_p->status_flags |= SCANNER_LITERAL_POOL_HAS_SUPER_REFERENCE; @@ -255,7 +255,7 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ } break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case LEXER_RIGHT_SQUARE: { if (stack_top != SCAN_STACK_ARRAY_LITERAL) @@ -266,7 +266,7 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION_END; return SCAN_KEEP_TOKEN; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LEXER_THREE_DOTS: { /* Elision or spread arguments */ @@ -277,7 +277,7 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION; break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case LEXER_COMMA: { if (stack_top != SCAN_STACK_ARRAY_LITERAL) @@ -286,15 +286,15 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ } scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (scanner_context_p->binding_type != SCANNER_BINDING_NONE) { scanner_context_p->mode = SCAN_MODE_BINDING; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LEXER_KEYW_YIELD: { lexer_next_token (context_p); @@ -310,19 +310,19 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */ } return SCAN_KEEP_TOKEN; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case LEXER_RIGHT_PAREN: { if (stack_top == SCAN_STACK_PAREN_EXPRESSION) { parser_stack_pop_uint8 (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->stack_top_uint8 == SCAN_STACK_USE_ASYNC) { scanner_add_async_literal (context_p, scanner_context_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scanner_context_p->mode = SCAN_MODE_POST_PRIMARY_EXPRESSION; break; @@ -368,7 +368,7 @@ scanner_scan_post_primary_expression (parser_context_t *context_p, /**< context scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION; return true; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LEXER_TEMPLATE_LITERAL: { if (JERRY_UNLIKELY (context_p->source_p[-1] != LIT_CHAR_GRAVE_ACCENT)) @@ -378,7 +378,7 @@ scanner_scan_post_primary_expression (parser_context_t *context_p, /**< context } return true; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case LEXER_LEFT_SQUARE: { parser_stack_push_uint8 (context_p, SCAN_STACK_PROPERTY_ACCESSOR); @@ -442,15 +442,15 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * switch (stack_top) { case SCAN_STACK_VAR: -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCAN_STACK_LET: case SCAN_STACK_CONST: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case SCAN_STACK_FOR_VAR_START: -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCAN_STACK_FOR_LET_START: case SCAN_STACK_FOR_CONST_START: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { scanner_context_p->mode = SCAN_MODE_VAR_STATEMENT; return SCAN_NEXT_TOKEN; @@ -460,7 +460,7 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * scanner_raise_error (context_p); break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCAN_STACK_BINDING_INIT: case SCAN_STACK_BINDING_LIST_INIT: { @@ -498,7 +498,7 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * return SCAN_NEXT_TOKEN; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case SCAN_STACK_OBJECT_LITERAL: { scanner_context_p->mode = SCAN_MODE_PROPERTY_NAME; @@ -574,12 +574,12 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * parser_stack_pop_uint8 (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->stack_top_uint8 == SCAN_STACK_USE_ASYNC) { scanner_add_async_literal (context_p, scanner_context_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scanner_context_p->mode = SCAN_MODE_POST_PRIMARY_EXPRESSION; return SCAN_NEXT_TOKEN; @@ -593,18 +593,18 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * parser_stack_pop_uint8 (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->stack_top_uint8 == SCAN_STACK_IF_STATEMENT) { scanner_check_function_after_if (context_p, scanner_context_p); return SCAN_KEEP_TOKEN; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scanner_context_p->mode = SCAN_MODE_STATEMENT; return SCAN_NEXT_TOKEN; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCAN_STACK_BINDING_LIST_INIT: { parser_stack_pop_uint8 (context_p); @@ -660,25 +660,25 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION_END; return SCAN_KEEP_TOKEN; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case SCAN_STACK_VAR: -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCAN_STACK_LET: case SCAN_STACK_CONST: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM scanner_context_p->active_literal_pool_p->status_flags &= (uint16_t) ~SCANNER_LITERAL_POOL_IN_EXPORT; -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ parser_stack_pop_uint8 (context_p); return SCAN_KEEP_TOKEN; } case SCAN_STACK_FOR_VAR_START: -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCAN_STACK_FOR_LET_START: case SCAN_STACK_FOR_CONST_START: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case SCAN_STACK_FOR_START: { if (type == LEXER_KEYW_IN || SCANNER_IDENTIFIER_IS_OF ()) @@ -692,16 +692,16 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * location_info = (scanner_location_info_t *) scanner_insert_info (context_p, for_statement.u.source_p, sizeof (scanner_location_info_t)); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT location_info->info.type = (type == LEXER_KEYW_IN) ? SCANNER_TYPE_FOR_IN : SCANNER_TYPE_FOR_OF; if (stack_top == SCAN_STACK_FOR_LET_START || stack_top == SCAN_STACK_FOR_CONST_START) { parser_stack_push_uint8 (context_p, SCAN_STACK_PRIVATE_BLOCK_EARLY); } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ location_info->info.type = SCANNER_TYPE_FOR_IN; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scanner_get_location (&location_info->location, context_p); @@ -720,12 +720,12 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * parser_stack_pop_uint8 (context_p); parser_stack_pop (context_p, NULL, sizeof (scanner_for_statement_t)); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (stack_top == SCAN_STACK_FOR_LET_START || stack_top == SCAN_STACK_FOR_CONST_START) { parser_stack_push_uint8 (context_p, SCAN_STACK_PRIVATE_BLOCK); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ for_statement.u.source_p = context_p->source_p; parser_stack_push (context_p, &for_statement, sizeof (scanner_for_statement_t)); @@ -810,11 +810,11 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT scanner_literal_pool_t *literal_pool_p; literal_pool_p = scanner_push_literal_pool (context_p, scanner_context_p, 0); literal_pool_p->source_p = context_p->source_p - 1; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_stack_pop_uint8 (context_p); @@ -876,7 +876,7 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * parser_stack_pop_uint8 (context_p); return SCAN_NEXT_TOKEN; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCAN_STACK_ARRAY_LITERAL: case SCAN_STACK_OBJECT_LITERAL: { @@ -910,14 +910,14 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * { scanner_pop_binding_list (scanner_context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (object_literal_flags != 0) { scanner_info_t *info_p = scanner_insert_info (context_p, source_start.source_p, sizeof (scanner_info_t)); info_p->type = SCANNER_TYPE_LITERAL_FLAGS; info_p->u8_arg = object_literal_flags; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (context_p->token.type != LEXER_RIGHT_PAREN) { @@ -957,7 +957,7 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * scanner_pop_binding_list (scanner_context_p); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if ((stack_top == SCAN_STACK_ARRAY_LITERAL || stack_top == SCAN_STACK_OBJECT_LITERAL) && (binding_type == SCANNER_BINDING_NONE || binding_type == SCANNER_BINDING_ARROW_ARG) && context_p->token.type != LEXER_EOS @@ -974,7 +974,7 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * info_p->type = SCANNER_TYPE_LITERAL_FLAGS; info_p->u8_arg = object_literal_flags; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scanner_context_p->mode = SCAN_MODE_POST_PRIMARY_EXPRESSION; return SCAN_KEEP_TOKEN; @@ -1003,7 +1003,7 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * } return SCAN_NEXT_TOKEN; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ case SCAN_STACK_OBJECT_LITERAL: { if (type != LEXER_RIGHT_BRACE) @@ -1016,7 +1016,7 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * return SCAN_NEXT_TOKEN; } case SCAN_STACK_ARRAY_LITERAL: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case SCAN_STACK_PROPERTY_ACCESSOR: { if (type != LEXER_RIGHT_SQUARE) @@ -1028,7 +1028,7 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * parser_stack_pop_uint8 (context_p); return SCAN_NEXT_TOKEN; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCAN_STACK_COMPUTED_PROPERTY: { if (type != LEXER_RIGHT_SQUARE) @@ -1262,7 +1262,7 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * scanner_context_p->mode = SCAN_MODE_CONTINUE_FUNCTION_ARGUMENTS; return SCAN_KEEP_TOKEN; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { scanner_context_p->mode = SCAN_MODE_STATEMENT_END; @@ -1294,11 +1294,11 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ } case LEXER_LEFT_BRACE: { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT scanner_literal_pool_t *literal_pool_p; literal_pool_p = scanner_push_literal_pool (context_p, scanner_context_p, 0); literal_pool_p->source_p = context_p->source_p; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scanner_context_p->mode = SCAN_MODE_STATEMENT_OR_TERMINATOR; parser_stack_push_uint8 (context_p, SCAN_STACK_BLOCK_STATEMENT); @@ -1319,11 +1319,11 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ scanner_raise_error (context_p); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT scanner_literal_pool_t *literal_pool_p; literal_pool_p = scanner_push_literal_pool (context_p, scanner_context_p, 0); literal_pool_p->source_p = context_p->source_p; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scanner_context_p->mode = SCAN_MODE_STATEMENT_OR_TERMINATOR; parser_stack_push_uint8 (context_p, SCAN_STACK_TRY_STATEMENT); @@ -1385,12 +1385,12 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ { lexer_next_token (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->token.type == LEXER_KEYW_AWAIT) { lexer_next_token (context_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (context_p->token.type != LEXER_LEFT_PAREN) { @@ -1405,9 +1405,9 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ lexer_next_token (context_p); scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const uint8_t *source_p = context_p->source_p; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ switch (context_p->token.type) { @@ -1423,7 +1423,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ return_type = SCAN_NEXT_TOKEN; break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LEXER_LEFT_BRACE: case LEXER_LEFT_SQUARE: { @@ -1484,7 +1484,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ : SCAN_STACK_FOR_LET_START); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } parser_stack_push (context_p, &for_statement, sizeof (scanner_for_statement_t)); @@ -1497,7 +1497,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ parser_stack_push_uint8 (context_p, SCAN_STACK_VAR); return SCAN_NEXT_TOKEN; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LEXER_KEYW_LET: { scanner_context_p->mode = SCAN_MODE_VAR_STATEMENT; @@ -1510,7 +1510,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ parser_stack_push_uint8 (context_p, SCAN_STACK_CONST); return SCAN_NEXT_TOKEN; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case LEXER_KEYW_THROW: { scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION; @@ -1587,7 +1587,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ } case LEXER_KEYW_FUNCTION: { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT uint16_t status_flags = SCANNER_LITERAL_POOL_FUNCTION | SCANNER_LITERAL_POOL_FUNCTION_STATEMENT; if (scanner_context_p->async_source_p != NULL) @@ -1595,17 +1595,17 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ scanner_context_p->status_flags |= SCANNER_CONTEXT_THROW_ERR_ASYNC_FUNCTION; status_flags |= SCANNER_LITERAL_POOL_ASYNC; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_next_token (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->token.type == LEXER_MULTIPLY) { status_flags |= SCANNER_LITERAL_POOL_GENERATOR; lexer_next_token (context_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (context_p->token.type != LEXER_LITERAL || context_p->token.lit_location.type != LEXER_IDENT_LITERAL) @@ -1615,7 +1615,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ lexer_lit_location_t *literal_p = scanner_add_literal (context_p, scanner_context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const uint8_t mask = (SCANNER_LITERAL_IS_ARG | SCANNER_LITERAL_IS_FUNC | SCANNER_LITERAL_IS_LOCAL); if ((literal_p->type & SCANNER_LITERAL_IS_LOCAL) @@ -1640,7 +1640,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ literal_p->type |= SCANNER_LITERAL_IS_VAR | SCANNER_LITERAL_IS_FUNC; uint16_t status_flags = SCANNER_LITERAL_POOL_FUNCTION; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scanner_push_literal_pool (context_p, scanner_context_p, status_flags); @@ -1648,7 +1648,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ parser_stack_push_uint8 (context_p, SCAN_STACK_FUNCTION_STATEMENT); return SCAN_NEXT_TOKEN; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LEXER_KEYW_CLASS: { lexer_lit_location_t *literal_p; @@ -1667,18 +1667,18 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ literal_p->type |= SCANNER_LITERAL_EARLY_CREATE; } -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM if (scanner_context_p->active_literal_pool_p->status_flags & SCANNER_LITERAL_POOL_IN_EXPORT) { literal_p->type |= SCANNER_LITERAL_NO_REG; scanner_context_p->active_literal_pool_p->status_flags &= (uint16_t) ~SCANNER_LITERAL_POOL_IN_EXPORT; } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ return SCAN_NEXT_TOKEN; } -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_MODULE_SYSTEM) +#endif /* JERRY_ESNEXT */ +#if JERRY_MODULE_SYSTEM case LEXER_KEYW_IMPORT: { if (stack_top != SCAN_STACK_SCRIPT) @@ -1944,7 +1944,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ scanner_context_p->mode = SCAN_MODE_STATEMENT; return SCAN_KEEP_TOKEN; } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ default: { break; @@ -1965,7 +1965,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ JERRY_ASSERT (context_p->token.flags & LEXER_NO_SKIP_SPACES); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* The colon needs to be checked first because the parser also checks * it first, and this check skips the spaces which affects source_p. */ if (JERRY_UNLIKELY (lexer_check_arrow (context_p))) @@ -2019,7 +2019,7 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */ } return SCAN_KEEP_TOKEN; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scanner_add_reference (context_p, scanner_context_p); @@ -2064,9 +2064,9 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ break; } case SCAN_STACK_BLOCK_STATEMENT: -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCAN_STACK_CLASS_STATEMENT: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case SCAN_STACK_FUNCTION_STATEMENT: { if (type != LEXER_RIGHT_BRACE) @@ -2074,30 +2074,30 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->stack_top_uint8 != SCAN_STACK_CLASS_STATEMENT) { scanner_pop_literal_pool (context_p, scanner_context_p); } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ if (context_p->stack_top_uint8 == SCAN_STACK_FUNCTION_STATEMENT) { scanner_pop_literal_pool (context_p, scanner_context_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ terminator_found = true; parser_stack_pop_uint8 (context_p); -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM scanner_context_p->active_literal_pool_p->status_flags &= (uint16_t) ~SCANNER_LITERAL_POOL_IN_EXPORT; -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ lexer_next_token (context_p); continue; } case SCAN_STACK_FUNCTION_EXPRESSION: -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCAN_STACK_FUNCTION_ARROW: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { if (type != LEXER_RIGHT_BRACE) { @@ -2105,17 +2105,17 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ } scanner_context_p->mode = SCAN_MODE_POST_PRIMARY_EXPRESSION; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->stack_top_uint8 == SCAN_STACK_FUNCTION_ARROW) { scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION_END; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scanner_pop_literal_pool (context_p, scanner_context_p); parser_stack_pop_uint8 (context_p); -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM if (context_p->stack_top_uint8 == SCAN_STACK_EXPORT_DEFAULT) { terminator_found = true; @@ -2123,7 +2123,7 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ lexer_next_token (context_p); continue; } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ return SCAN_NEXT_TOKEN; } case SCAN_STACK_FUNCTION_PROPERTY: @@ -2133,14 +2133,14 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT bool has_super_reference = (scanner_context_p->active_literal_pool_p->status_flags & SCANNER_LITERAL_POOL_HAS_SUPER_REFERENCE) != 0; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scanner_pop_literal_pool (context_p, scanner_context_p); parser_stack_pop_uint8 (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->stack_top_uint8 == SCAN_STACK_EXPLICIT_CLASS_CONSTRUCTOR || context_p->stack_top_uint8 == SCAN_STACK_IMPLICIT_CLASS_CONSTRUCTOR) { @@ -2152,9 +2152,9 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ { *parser_stack_get_prev_uint8 (context_p) |= SCANNER_LITERAL_OBJECT_HAS_SUPER; } -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ JERRY_ASSERT (context_p->stack_top_uint8 == SCAN_STACK_OBJECT_LITERAL); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_next_token (context_p); @@ -2186,9 +2186,9 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ scanner_context_p->active_switch_statement = switch_statement; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT scanner_pop_literal_pool (context_p, scanner_context_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ terminator_found = true; lexer_next_token (context_p); @@ -2201,13 +2201,13 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ if (type == LEXER_KEYW_ELSE && (terminator_found || (context_p->token.flags & LEXER_WAS_NEWLINE))) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT scanner_check_function_after_if (context_p, scanner_context_p); return SCAN_KEEP_TOKEN; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ scanner_context_p->mode = SCAN_MODE_STATEMENT; return SCAN_NEXT_TOKEN; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } continue; } @@ -2253,7 +2253,7 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ terminator_found = true; continue; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCAN_STACK_PRIVATE_BLOCK_EARLY: { parser_list_iterator_t literal_iterator; @@ -2277,8 +2277,8 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ scanner_pop_literal_pool (context_p, scanner_context_p); continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_MODULE_SYSTEM) +#endif /* JERRY_ESNEXT */ +#if JERRY_MODULE_SYSTEM case SCAN_STACK_EXPORT_DEFAULT: { parser_stack_pop_uint8 (context_p); @@ -2288,7 +2288,7 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ location_p->type |= SCANNER_LITERAL_IS_VAR; continue; } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ default: { JERRY_ASSERT (context_p->stack_top_uint8 == SCAN_STACK_TRY_STATEMENT @@ -2303,14 +2303,14 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ parser_stack_pop_uint8 (context_p); lexer_next_token (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT scanner_pop_literal_pool (context_p, scanner_context_p); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ if (stack_top == SCAN_STACK_CATCH_STATEMENT) { scanner_pop_literal_pool (context_p, scanner_context_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* A finally statement is optional after a try or catch statement. */ if (context_p->token.type == LEXER_KEYW_FINALLY) @@ -2322,11 +2322,11 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ scanner_raise_error (context_p); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT scanner_literal_pool_t *literal_pool_p; literal_pool_p = scanner_push_literal_pool (context_p, scanner_context_p, 0); literal_pool_p->source_p = context_p->source_p; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_stack_push_uint8 (context_p, SCAN_STACK_BLOCK_STATEMENT); scanner_context_p->mode = SCAN_MODE_STATEMENT_OR_TERMINATOR; @@ -2352,13 +2352,13 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ literal_pool_p->source_p = context_p->source_p; parser_stack_push_uint8 (context_p, SCAN_STACK_CATCH_STATEMENT); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->token.type == LEXER_LEFT_BRACE) { scanner_context_p->mode = SCAN_MODE_STATEMENT_OR_TERMINATOR; return SCAN_NEXT_TOKEN; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (context_p->token.type != LEXER_LEFT_PAREN) { @@ -2367,7 +2367,7 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ lexer_next_token (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->token.type == LEXER_LEFT_SQUARE || context_p->token.type == LEXER_LEFT_BRACE) { scanner_push_destructuring_pattern (context_p, scanner_context_p, SCANNER_BINDING_CATCH, false); @@ -2384,7 +2384,7 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ scanner_context_p->mode = SCAN_MODE_PROPERTY_NAME; return SCAN_KEEP_TOKEN; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (context_p->token.type != LEXER_LITERAL || context_p->token.lit_location.type != LEXER_IDENT_LITERAL) @@ -2436,37 +2436,37 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ { scanner_context_t scanner_context; -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE if (context_p->is_show_opcodes) { JERRY_DEBUG_MSG ("\n--- Scanning start ---\n\n"); } -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ scanner_context.context_status_flags = context_p->status_flags; scanner_context.status_flags = SCANNER_CONTEXT_NO_FLAGS; -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED) { scanner_context.status_flags |= SCANNER_CONTEXT_DEBUGGER_ENABLED; } -#endif /* ENABLED (JERRY_DEBUGGER) */ -#if ENABLED (JERRY_ESNEXT) +#endif /* JERRY_DEBUGGER */ +#if JERRY_ESNEXT scanner_context.binding_type = SCANNER_BINDING_NONE; scanner_context.active_binding_list_p = NULL; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scanner_context.active_literal_pool_p = NULL; scanner_context.active_switch_statement.last_case_p = NULL; scanner_context.end_arguments_p = NULL; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT scanner_context.async_source_p = NULL; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* This assignment must be here because of Apple compilers. */ context_p->u.scanner_context_p = &scanner_context; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT context_p->global_status_flags |= ECMA_PARSE_INTERNAL_PRE_SCANNING; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_stack_init (context_p); @@ -2509,7 +2509,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ status_flags |= SCANNER_LITERAL_POOL_IS_STRICT; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->status_flags & PARSER_IS_GENERATOR_FUNCTION) { status_flags |= SCANNER_LITERAL_POOL_GENERATOR; @@ -2518,7 +2518,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ { status_flags |= SCANNER_LITERAL_POOL_ASYNC; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scanner_push_literal_pool (context_p, &scanner_context, status_flags); scanner_context.mode = SCAN_MODE_FUNCTION_ARGUMENTS; @@ -2553,7 +2553,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ } break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCAN_MODE_CLASS_DECLARATION: { if (context_p->token.type == LEXER_KEYW_EXTENDS) @@ -2601,7 +2601,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ scanner_context.mode = SCAN_MODE_POST_PRIMARY_EXPRESSION; parser_stack_pop_uint8 (context_p); -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM if (context_p->stack_top_uint8 == SCAN_STACK_EXPORT_DEFAULT) { /* The token is kept to disallow consuming a semicolon after it. */ @@ -2609,7 +2609,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ scanner_context.mode = SCAN_MODE_STATEMENT_END; continue; } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ break; } @@ -2741,7 +2741,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ scanner_context.mode = SCAN_MODE_CLASS_BODY_NO_SCAN; continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case SCAN_MODE_POST_PRIMARY_EXPRESSION: { if (scanner_scan_post_primary_expression (context_p, &scanner_context, type, stack_top)) @@ -2792,7 +2792,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ } case SCAN_MODE_VAR_STATEMENT: { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (type == LEXER_LEFT_SQUARE || type == LEXER_LEFT_BRACE) { uint8_t binding_type = SCANNER_BINDING_VAR; @@ -2820,7 +2820,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ scanner_context.mode = SCAN_MODE_PROPERTY_NAME; continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (type != LEXER_LITERAL || context_p->token.lit_location.type != LEXER_IDENT_LITERAL) @@ -2830,7 +2830,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ lexer_lit_location_t *literal_p = scanner_add_literal (context_p, &scanner_context); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (stack_top != SCAN_STACK_VAR && stack_top != SCAN_STACK_FOR_VAR_START) { scanner_detect_invalid_let (context_p, literal_p); @@ -2875,7 +2875,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ lexer_next_token (context_p); } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ literal_p->type |= SCANNER_LITERAL_IS_VAR; if (scanner_context.active_literal_pool_p->status_flags & SCANNER_LITERAL_POOL_IN_WITH) @@ -2884,14 +2884,14 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ } lexer_next_token (context_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM if (scanner_context.active_literal_pool_p->status_flags & SCANNER_LITERAL_POOL_IN_EXPORT) { literal_p->type |= SCANNER_LITERAL_NO_REG; } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ switch (context_p->token.type) { @@ -2909,9 +2909,9 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ if (SCANNER_IS_FOR_START (stack_top)) { -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM JERRY_ASSERT (!(scanner_context.active_literal_pool_p->status_flags & SCANNER_LITERAL_POOL_IN_EXPORT)); -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ if (context_p->token.type != LEXER_SEMICOLON && context_p->token.type != LEXER_KEYW_IN @@ -2924,15 +2924,15 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ continue; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_ASSERT (stack_top == SCAN_STACK_VAR || stack_top == SCAN_STACK_LET || stack_top == SCAN_STACK_CONST); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_ASSERT (stack_top == SCAN_STACK_VAR); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM scanner_context.active_literal_pool_p->status_flags &= (uint16_t) ~SCANNER_LITERAL_POOL_IN_EXPORT; -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ scanner_context.mode = SCAN_MODE_STATEMENT_END; parser_stack_pop_uint8 (context_p); @@ -2951,14 +2951,14 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ literal_pool_p->source_p = context_p->source_p; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (scanner_context.async_source_p != NULL)) { literal_pool_p->status_flags |= SCANNER_LITERAL_POOL_ASYNC; literal_pool_p->source_p = scanner_context.async_source_p; scanner_context.async_source_p = NULL; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (type != LEXER_LEFT_PAREN) { @@ -2966,7 +2966,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ } lexer_next_token (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* FALLTHRU */ } case SCAN_MODE_CONTINUE_FUNCTION_ARGUMENTS: @@ -3049,7 +3049,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ break; } } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ if (context_p->token.type != LEXER_RIGHT_PAREN && context_p->token.type != LEXER_EOS) { while (true) @@ -3071,7 +3071,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ lexer_next_token (context_p); } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (context_p->token.type == LEXER_EOS && stack_top == SCAN_STACK_SCRIPT_FUNCTION) { @@ -3088,9 +3088,9 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ context_p->line = 1; context_p->column = 1; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT scanner_filter_arguments (context_p, &scanner_context); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_next_token (context_p); scanner_check_directives (context_p, &scanner_context); continue; @@ -3108,9 +3108,9 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ scanner_raise_error (context_p); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT scanner_filter_arguments (context_p, &scanner_context); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_next_token (context_p); scanner_check_directives (context_p, &scanner_context); continue; @@ -3124,7 +3124,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ lexer_check_property_modifier (context_p); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->token.type == LEXER_LEFT_SQUARE) { parser_stack_push_uint8 (context_p, SCAN_STACK_COMPUTED_PROPERTY); @@ -3143,7 +3143,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ } break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (context_p->token.type == LEXER_RIGHT_BRACE) { @@ -3152,15 +3152,15 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ } if (context_p->token.type == LEXER_PROPERTY_GETTER -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT || context_p->token.type == LEXER_KEYW_ASYNC || context_p->token.type == LEXER_MULTIPLY -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ || context_p->token.type == LEXER_PROPERTY_SETTER) { uint16_t literal_pool_flags = SCANNER_LITERAL_POOL_FUNCTION; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->token.type == LEXER_MULTIPLY) { literal_pool_flags |= SCANNER_LITERAL_POOL_GENERATOR; @@ -3174,19 +3174,19 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ literal_pool_flags |= SCANNER_LITERAL_POOL_GENERATOR; } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ parser_stack_push_uint8 (context_p, SCAN_STACK_FUNCTION_PROPERTY); lexer_scan_identifier (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->token.type == LEXER_LEFT_SQUARE) { parser_stack_push_uint8 (context_p, SCANNER_FROM_LITERAL_POOL_TO_COMPUTED (literal_pool_flags)); scanner_context.mode = SCAN_MODE_PRIMARY_EXPRESSION; break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (context_p->token.type != LEXER_LITERAL) { @@ -3203,15 +3203,15 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ scanner_raise_error (context_p); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT parser_line_counter_t start_line = context_p->token.line; parser_line_counter_t start_column = context_p->token.column; bool is_ident = (context_p->token.lit_location.type == LEXER_IDENT_LITERAL); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ lexer_next_token (context_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (context_p->token.type == LEXER_LEFT_PAREN) { scanner_push_literal_pool (context_p, &scanner_context, SCANNER_LITERAL_POOL_FUNCTION); @@ -3259,7 +3259,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ scanner_context.mode = SCAN_MODE_PRIMARY_EXPRESSION_END; continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (context_p->token.type != LEXER_COLON) { @@ -3268,15 +3268,15 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ scanner_context.mode = SCAN_MODE_PRIMARY_EXPRESSION; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (scanner_context.binding_type != SCANNER_BINDING_NONE) { scanner_context.mode = SCAN_MODE_BINDING; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCAN_MODE_BINDING: { JERRY_ASSERT (scanner_context.binding_type == SCANNER_BINDING_VAR @@ -3400,7 +3400,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */ scanner_context.mode = SCAN_MODE_PRIMARY_EXPRESSION; break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } lexer_next_token (context_p); @@ -3415,9 +3415,9 @@ scan_completed: scanner_pop_literal_pool (context_p, &scanner_context); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT JERRY_ASSERT (scanner_context.active_binding_list_p == NULL); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ JERRY_ASSERT (scanner_context.active_literal_pool_p == NULL); #ifndef JERRY_NDEBUG @@ -3426,12 +3426,12 @@ scan_completed: } PARSER_CATCH { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT while (scanner_context.active_binding_list_p != NULL) { scanner_pop_binding_list (&scanner_context); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (JERRY_UNLIKELY (context_p->error != PARSER_ERR_OUT_OF_MEMORY)) { @@ -3441,7 +3441,7 @@ scan_completed: /* The following code may allocate memory, so it is enclosed in a try/catch. */ PARSER_TRY (context_p->try_buffer) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (scanner_context.status_flags & SCANNER_CONTEXT_THROW_ERR_ASYNC_FUNCTION) { JERRY_ASSERT (scanner_context.async_source_p != NULL); @@ -3450,7 +3450,7 @@ scan_completed: info_p = scanner_insert_info (context_p, scanner_context.async_source_p, sizeof (scanner_info_t)); info_p->type = SCANNER_TYPE_ERR_ASYNC_FUNCTION; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ while (scanner_context.active_literal_pool_p != NULL) { @@ -3485,12 +3485,12 @@ scan_completed: PARSER_TRY_END context_p->status_flags = scanner_context.context_status_flags; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT context_p->global_status_flags &= (uint32_t) ~ECMA_PARSE_INTERNAL_PRE_SCANNING; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ scanner_reverse_info_list (context_p); -#if ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) +#if JERRY_PARSER_DUMP_BYTE_CODE if (context_p->is_show_opcodes) { scanner_info_t *info_p = context_p->next_scanner_info_p; @@ -3542,7 +3542,7 @@ scan_completed: data_p++; continue; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCANNER_STREAM_TYPE_ARGUMENTS: { JERRY_DEBUG_MSG (" ARGUMENTS%s%s\n", @@ -3559,7 +3559,7 @@ scan_completed: data_p++; continue; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ case SCANNER_STREAM_TYPE_ARGUMENTS: { JERRY_DEBUG_MSG (" ARGUMENTS%s\n", @@ -3567,13 +3567,13 @@ scan_completed: data_p++; continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case SCANNER_STREAM_TYPE_VAR: { JERRY_DEBUG_MSG (" VAR "); break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCANNER_STREAM_TYPE_LET: { JERRY_DEBUG_MSG (" LET "); @@ -3589,20 +3589,20 @@ scan_completed: JERRY_DEBUG_MSG (" LOCAL "); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_MODULE_SYSTEM) +#endif /* JERRY_ESNEXT */ +#if JERRY_MODULE_SYSTEM case SCANNER_STREAM_TYPE_IMPORT: { JERRY_DEBUG_MSG (" IMPORT "); break; } -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ case SCANNER_STREAM_TYPE_ARG: { JERRY_DEBUG_MSG (" ARG "); break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCANNER_STREAM_TYPE_ARG_VAR: { JERRY_DEBUG_MSG (" ARG_VAR "); @@ -3618,19 +3618,19 @@ scan_completed: JERRY_DEBUG_MSG (" DESTRUCTURED_ARG_VAR "); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case SCANNER_STREAM_TYPE_ARG_FUNC: { JERRY_DEBUG_MSG (" ARG_FUNC "); break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCANNER_STREAM_TYPE_DESTRUCTURED_ARG_FUNC: { JERRY_DEBUG_MSG (" DESTRUCTURED_ARG_FUNC "); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case SCANNER_STREAM_TYPE_FUNC: { JERRY_DEBUG_MSG (" FUNC "); @@ -3655,8 +3655,8 @@ scan_completed: } else { - memcpy (&prev_source_p, data_p + 2 + 1, sizeof (const uint8_t *)); - length = 2 + 1 + sizeof (const uint8_t *); + memcpy (&prev_source_p, data_p + 2 + 1, sizeof (uintptr_t)); + length = 2 + 1 + sizeof (uintptr_t); } } else @@ -3672,13 +3672,13 @@ scan_completed: length = 2 + 2; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (data_p[0] & SCANNER_STREAM_EARLY_CREATE) { JERRY_ASSERT (data_p[0] & SCANNER_STREAM_NO_REG); JERRY_DEBUG_MSG ("*"); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (data_p[0] & SCANNER_STREAM_NO_REG) { @@ -3716,14 +3716,14 @@ scan_completed: print_location = true; break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCANNER_TYPE_FOR_OF: { name_p = "FOR-OF"; print_location = true; break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case SCANNER_TYPE_SWITCH: { JERRY_DEBUG_MSG (" SWITCH: source:%d\n", @@ -3748,7 +3748,7 @@ scan_completed: print_location = true; break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case SCANNER_TYPE_INITIALIZER: { scanner_location_info_t *location_info_p = (scanner_location_info_t *) info_p; @@ -3806,7 +3806,7 @@ scan_completed: print_location = false; break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } if (print_location) @@ -3825,7 +3825,7 @@ scan_completed: JERRY_DEBUG_MSG ("\n--- Scanning end ---\n\n"); } -#endif /* ENABLED (JERRY_PARSER_DUMP_BYTE_CODE) */ +#endif /* JERRY_PARSER_DUMP_BYTE_CODE */ parser_stack_free (context_p); } /* scanner_scan_all */ @@ -3836,4 +3836,4 @@ scan_completed: * @} */ -#endif /* ENABLED (JERRY_PARSER) */ +#endif /* JERRY_PARSER */ diff --git a/jerry-core/parser/js/js-scanner.h b/jerry-core/parser/js/js-scanner.h index 91db12fb2..302a787eb 100644 --- a/jerry-core/parser/js/js-scanner.h +++ b/jerry-core/parser/js/js-scanner.h @@ -39,12 +39,12 @@ typedef enum SCANNER_TYPE_WHILE, /**< while statement */ SCANNER_TYPE_FOR, /**< for statement */ SCANNER_TYPE_FOR_IN, /**< for-in statement */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT SCANNER_TYPE_FOR_OF, /**< for-of statement */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ SCANNER_TYPE_SWITCH, /**< switch statement */ SCANNER_TYPE_CASE, /**< case statement */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT SCANNER_TYPE_INITIALIZER, /**< destructuring binding or assignment pattern with initializer */ SCANNER_TYPE_LITERAL_FLAGS, /**< object or array literal with non-zero flags (stored in u8_arg) */ SCANNER_TYPE_CLASS_CONSTRUCTOR, /**< class constructor */ @@ -53,7 +53,7 @@ typedef enum SCANNER_TYPE_ERR_REDECLARED, /**< syntax error: a variable is redeclared */ SCANNER_TYPE_ERR_ASYNC_FUNCTION, /**< an invalid async function follows */ SCANNER_TYPE_EXPORT_MODULE_SPECIFIER, /**< export with module specifier */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } scanner_info_type_t; /** @@ -147,10 +147,10 @@ typedef enum SCANNER_STREAM_HAS_ESCAPE = (1 << 6), /**< binding has escape */ SCANNER_STREAM_NO_REG = (1 << 5), /**< binding cannot be stored in register */ SCANNER_STREAM_EARLY_CREATE = (1 << 4), /**< binding must be created with ECMA_VALUE_UNINITIALIZED */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT SCANNER_STREAM_LOCAL_ARGUMENTS = SCANNER_STREAM_EARLY_CREATE, /**< arguments is redeclared * as let/const binding later */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* Update SCANNER_STREAM_TYPE_MASK macro if more bits are added. */ } scanner_compressed_stream_flags_t; @@ -162,35 +162,35 @@ typedef enum SCANNER_STREAM_TYPE_END, /**< end of scanner data */ SCANNER_STREAM_TYPE_HOLE, /**< no name is assigned to this argument */ SCANNER_STREAM_TYPE_ARGUMENTS, /**< arguments object should be created */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT SCANNER_STREAM_TYPE_ARGUMENTS_FUNC, /**< arguments object should be created which * is later initialized with a function */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ SCANNER_STREAM_TYPE_VAR, /**< var declaration */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT SCANNER_STREAM_TYPE_LET, /**< let declaration */ SCANNER_STREAM_TYPE_CONST, /**< const declaration */ SCANNER_STREAM_TYPE_LOCAL, /**< local declaration (e.g. catch block) */ -#endif /* ENABLED (JERRY_ESNEXT) */ -#if ENABLED (JERRY_MODULE_SYSTEM) +#endif /* JERRY_ESNEXT */ +#if JERRY_MODULE_SYSTEM SCANNER_STREAM_TYPE_IMPORT, /**< module import */ -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ /* The next four types must be in this order (see SCANNER_STREAM_TYPE_IS_ARG). */ SCANNER_STREAM_TYPE_ARG, /**< argument declaration */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT SCANNER_STREAM_TYPE_ARG_VAR, /**< argument declaration which is later copied * into a variable declared by var statement */ SCANNER_STREAM_TYPE_DESTRUCTURED_ARG, /**< destructuring argument declaration */ SCANNER_STREAM_TYPE_DESTRUCTURED_ARG_VAR, /**< destructuring argument declaration which is later * copied into a variable declared by var statement */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* Function types should be at the end. See the SCANNER_STREAM_TYPE_IS_FUNCTION macro. */ SCANNER_STREAM_TYPE_ARG_FUNC, /**< argument declaration which * is later initialized with a function */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT SCANNER_STREAM_TYPE_DESTRUCTURED_ARG_FUNC, /**< destructuring argument declaration which * is later initialized with a function */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ SCANNER_STREAM_TYPE_FUNC, /**< function declaration */ } scanner_compressed_stream_types_t; @@ -204,7 +204,7 @@ typedef enum */ #define SCANNER_STREAM_TYPE_IS_FUNCTION(type) ((type) >= SCANNER_STREAM_TYPE_ARG_FUNC) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Checks whether the decoded type represents a function argument. @@ -224,7 +224,7 @@ typedef enum #define SCANNER_STREAM_TYPE_IS_ARGUMENTS(type) \ ((type) == SCANNER_STREAM_TYPE_ARGUMENTS || (type) == SCANNER_STREAM_TYPE_ARGUMENTS_FUNC) -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ /** * Checks whether the decoded type represents a function argument. @@ -242,7 +242,7 @@ typedef enum #define SCANNER_STREAM_TYPE_IS_ARGUMENTS(type) \ ((type) == SCANNER_STREAM_TYPE_ARGUMENTS) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Constants for u8_arg flags in scanner_function_info_t. @@ -251,16 +251,16 @@ typedef enum { SCANNER_FUNCTION_ARGUMENTS_NEEDED = (1 << 0), /**< arguments object needs to be created */ SCANNER_FUNCTION_HAS_COMPLEX_ARGUMENT = (1 << 1), /**< function has complex (ES2015+) argument definition */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT SCANNER_FUNCTION_LEXICAL_ENV_NEEDED = (1 << 2), /**< lexical environment is needed for the function body */ SCANNER_FUNCTION_STATEMENT = (1 << 3), /**< function is function statement (not arrow expression) * this flag must be combined with the type of function (e.g. async) */ SCANNER_FUNCTION_ASYNC = (1 << 4), /**< function is async function */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ SCANNER_FUNCTION_IS_STRICT = (1 << 5), /**< function is strict */ } scanner_function_flags_t; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Object or array literal constants for u8_arg flags in scanner_info_t. @@ -275,7 +275,7 @@ typedef enum SCANNER_LITERAL_OBJECT_HAS_REST = (1 << 3), /**< the object literal has a member prefixed with three dots */ } scanner_literal_flags_t; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Option bits for scanner_create_variables function. diff --git a/jerry-core/parser/regexp/re-bytecode.c b/jerry-core/parser/regexp/re-bytecode.c index 8e84d05e3..fe30029fb 100644 --- a/jerry-core/parser/regexp/re-bytecode.c +++ b/jerry-core/parser/regexp/re-bytecode.c @@ -18,7 +18,7 @@ #include "lit-strings.h" #include "re-bytecode.h" -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP /** \addtogroup parser Parser * @{ @@ -275,22 +275,22 @@ void re_append_char (re_compiler_ctx_t *re_ctx_p, /**< RegExp bytecode context */ const lit_code_point_t cp) /**< code point */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const size_t size = (re_ctx_p->flags & RE_FLAG_UNICODE) ? sizeof (lit_code_point_t) : sizeof (ecma_char_t); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_UNUSED (re_ctx_p); const size_t size = sizeof (ecma_char_t); -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ uint8_t *dest_p = re_bytecode_reserve (re_ctx_p, size); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (re_ctx_p->flags & RE_FLAG_UNICODE) { re_encode_u32 (dest_p, cp); return; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ JERRY_ASSERT (cp <= LIT_UTF16_CODE_UNIT_MAX); re_encode_u16 (dest_p, (ecma_char_t) cp); @@ -304,22 +304,22 @@ re_insert_char (re_compiler_ctx_t *re_ctx_p, /**< RegExp bytecode context */ const uint32_t offset, /**< bytecode offset */ const lit_code_point_t cp) /**< code point*/ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT const size_t size = (re_ctx_p->flags & RE_FLAG_UNICODE) ? sizeof (lit_code_point_t) : sizeof (ecma_char_t); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_UNUSED (re_ctx_p); const size_t size = sizeof (ecma_char_t); -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ uint8_t *dest_p = re_bytecode_insert (re_ctx_p, offset, size); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (re_ctx_p->flags & RE_FLAG_UNICODE) { re_encode_u32 (dest_p, cp); return; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ JERRY_ASSERT (cp <= LIT_UTF16_CODE_UNIT_MAX); re_encode_u16 (dest_p, (ecma_char_t) cp); @@ -336,16 +336,16 @@ re_get_char (const uint8_t **bc_p, /**< reference to bytecode pointer */ { lit_code_point_t cp; -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT JERRY_UNUSED (unicode); -#else /* ENABLED (JERRY_ESNEXT) */ +#else /* JERRY_ESNEXT */ if (unicode) { cp = re_decode_u32 (*bc_p); *bc_p += sizeof (lit_code_point_t); } else -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { cp = re_decode_u16 (*bc_p); *bc_p += sizeof (ecma_char_t); @@ -354,7 +354,7 @@ re_get_char (const uint8_t **bc_p, /**< reference to bytecode pointer */ return cp; } /* re_get_char */ -#if ENABLED (JERRY_REGEXP_DUMP_BYTE_CODE) +#if JERRY_REGEXP_DUMP_BYTE_CODE static uint32_t re_get_bytecode_offset (const uint8_t *start_p, /**< bytecode start pointer */ const uint8_t *current_p) /**< current bytecode pointer */ @@ -592,13 +592,13 @@ re_dump_bytecode (re_compiler_ctx_t *re_ctx_p) /**< RegExp bytecode context */ JERRY_DEBUG_MSG ("\n"); break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case RE_OP_UNICODE_PERIOD: { JERRY_DEBUG_MSG ("UNICODE_PERIOD\n"); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case RE_OP_PERIOD: { JERRY_DEBUG_MSG ("PERIOD\n"); @@ -628,7 +628,7 @@ re_dump_bytecode (re_compiler_ctx_t *re_ctx_p) /**< RegExp bytecode context */ } } } /* re_dump_bytecode */ -#endif /* ENABLED (JERRY_REGEXP_DUMP_BYTE_CODE) */ +#endif /* JERRY_REGEXP_DUMP_BYTE_CODE */ /** * @} @@ -636,4 +636,4 @@ re_dump_bytecode (re_compiler_ctx_t *re_ctx_p) /**< RegExp bytecode context */ * @} */ -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ diff --git a/jerry-core/parser/regexp/re-bytecode.h b/jerry-core/parser/regexp/re-bytecode.h index 61d2a7adb..942f6fdc1 100644 --- a/jerry-core/parser/regexp/re-bytecode.h +++ b/jerry-core/parser/regexp/re-bytecode.h @@ -16,7 +16,7 @@ #ifndef RE_BYTECODE_H #define RE_BYTECODE_H -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP #include "ecma-globals.h" #include "re-compiler-context.h" @@ -81,9 +81,9 @@ typedef enum RE_OP_CLASS_ESCAPE, /**< class escape */ RE_OP_CHAR_CLASS, /**< character class */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT RE_OP_UNICODE_PERIOD, /**< period in full unicode mode */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ RE_OP_PERIOD, /**< period in non-unicode mode */ RE_OP_CHAR, /**< any code point */ RE_OP_BYTE, /**< 1-byte utf8 character */ @@ -118,9 +118,9 @@ uint8_t re_get_byte (const uint8_t **bc_p); lit_code_point_t re_get_char (const uint8_t **bc_p, bool unicode); uint32_t re_get_value (const uint8_t **bc_p); -#if ENABLED (JERRY_REGEXP_DUMP_BYTE_CODE) +#if JERRY_REGEXP_DUMP_BYTE_CODE void re_dump_bytecode (re_compiler_ctx_t *bc_ctx); -#endif /* ENABLED (JERRY_REGEXP_DUMP_BYTE_CODE) */ +#endif /* JERRY_REGEXP_DUMP_BYTE_CODE */ /** * @} @@ -128,5 +128,5 @@ void re_dump_bytecode (re_compiler_ctx_t *bc_ctx); * @} */ -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ #endif /* !RE_BYTECODE_H */ diff --git a/jerry-core/parser/regexp/re-compiler-context.h b/jerry-core/parser/regexp/re-compiler-context.h index 6d7b7537e..720891065 100644 --- a/jerry-core/parser/regexp/re-compiler-context.h +++ b/jerry-core/parser/regexp/re-compiler-context.h @@ -16,7 +16,7 @@ #ifndef RE_COMPILER_CONTEXT_H #define RE_COMPILER_CONTEXT_H -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP #include "re-token.h" @@ -56,5 +56,5 @@ typedef struct * @} */ -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ #endif /* !RE_COMPILER_CONTEXT_H */ diff --git a/jerry-core/parser/regexp/re-compiler.c b/jerry-core/parser/regexp/re-compiler.c index 899f8db1e..a5a17dccd 100644 --- a/jerry-core/parser/regexp/re-compiler.c +++ b/jerry-core/parser/regexp/re-compiler.c @@ -25,7 +25,7 @@ #include "re-compiler-context.h" #include "re-parser.h" -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP /** \addtogroup parser Parser * @{ @@ -154,12 +154,12 @@ re_compile_bytecode (ecma_string_t *pattern_str_p, /**< pattern */ re_compiled_code_p->captures_count = re_ctx.captures_count; re_compiled_code_p->non_captures_count = re_ctx.non_captures_count; -#if ENABLED (JERRY_REGEXP_DUMP_BYTE_CODE) +#if JERRY_REGEXP_DUMP_BYTE_CODE if (JERRY_CONTEXT (jerry_init_flags) & ECMA_INIT_SHOW_REGEXP_OPCODES) { re_dump_bytecode (&re_ctx); } -#endif /* ENABLED (JERRY_REGEXP_DUMP_BYTE_CODE) */ +#endif /* JERRY_REGEXP_DUMP_BYTE_CODE */ uint8_t cache_idx = JERRY_CONTEXT (re_cache_idx); @@ -180,4 +180,4 @@ re_compile_bytecode (ecma_string_t *pattern_str_p, /**< pattern */ * @} */ -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ diff --git a/jerry-core/parser/regexp/re-compiler.h b/jerry-core/parser/regexp/re-compiler.h index b5f1e8a75..06602c59e 100644 --- a/jerry-core/parser/regexp/re-compiler.h +++ b/jerry-core/parser/regexp/re-compiler.h @@ -16,7 +16,7 @@ #ifndef RE_COMPILER_H #define RE_COMPILER_H -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP #include "ecma-globals.h" #include "re-bytecode.h" @@ -42,5 +42,5 @@ void re_cache_gc (void); * @} */ -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ #endif /* !RE_COMPILER_H */ diff --git a/jerry-core/parser/regexp/re-parser.c b/jerry-core/parser/regexp/re-parser.c index 7e8159486..ac362c19c 100644 --- a/jerry-core/parser/regexp/re-parser.c +++ b/jerry-core/parser/regexp/re-parser.c @@ -21,7 +21,7 @@ #include "re-compiler.h" #include "re-parser.h" -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP /** \addtogroup parser Parser * @{ @@ -393,7 +393,7 @@ re_count_groups (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context */ } } /* re_count_groups */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Check if a code point is a Syntax character * @@ -418,7 +418,7 @@ re_is_syntax_char (lit_code_point_t cp) /**< code point */ || cp == LIT_CHAR_RIGHT_BRACE || cp == LIT_CHAR_VLINE); } /* re_is_syntax_char */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Parse a Character Escape or a Character Class Escape. @@ -444,12 +444,12 @@ re_parse_char_escape (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context return ECMA_VALUE_EMPTY; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (re_ctx_p->flags & RE_FLAG_UNICODE) { return ecma_raise_syntax_error (ECMA_ERR_MSG ("Invalid escape sequence")); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* Legacy octal escape sequence */ if (lit_char_is_octal_digit (*re_ctx_p->input_curr_p)) @@ -546,12 +546,12 @@ re_parse_char_escape (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (re_ctx_p->flags & RE_FLAG_UNICODE) { return ecma_raise_syntax_error (ECMA_ERR_MSG ("Invalid control escape sequence")); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ re_ctx_p->token.value = LIT_CHAR_BACKSLASH; re_ctx_p->input_curr_p--; @@ -569,12 +569,12 @@ re_parse_char_escape (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (re_ctx_p->flags & RE_FLAG_UNICODE) { return ecma_raise_syntax_error (ECMA_ERR_MSG ("Invalid hex escape sequence")); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ re_ctx_p->token.value = LIT_CHAR_LOWERCASE_X; break; @@ -588,7 +588,7 @@ re_parse_char_escape (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context re_ctx_p->token.value = hex_value; re_ctx_p->input_curr_p += 4; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (re_ctx_p->flags & RE_FLAG_UNICODE && lit_is_code_point_utf16_high_surrogate (re_ctx_p->token.value) && re_ctx_p->input_curr_p + 6 <= re_ctx_p->input_end_p @@ -603,12 +603,12 @@ re_parse_char_escape (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context re_ctx_p->input_curr_p += 6; } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (re_ctx_p->flags & RE_FLAG_UNICODE) { if (re_ctx_p->input_curr_p + 1 < re_ctx_p->input_end_p @@ -638,7 +638,7 @@ re_parse_char_escape (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context return ecma_raise_syntax_error (ECMA_ERR_MSG ("Invalid unicode escape sequence")); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ re_ctx_p->token.value = LIT_CHAR_LOWERCASE_U; break; @@ -646,7 +646,7 @@ re_parse_char_escape (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context /* Identity escape */ default: { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /* Must be '/', or one of SyntaxCharacter */ if (re_ctx_p->flags & RE_FLAG_UNICODE && ch != LIT_CHAR_SLASH @@ -654,7 +654,7 @@ re_parse_char_escape (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context { return ecma_raise_syntax_error (ECMA_ERR_MSG ("Invalid escape")); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ re_ctx_p->token.value = ch; } } @@ -831,12 +831,12 @@ re_parse_next_token (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context * return ecma_raise_syntax_error (ECMA_ERR_MSG ("Nothing to repeat")); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (re_ctx_p->flags & RE_FLAG_UNICODE) { return ecma_raise_syntax_error (ECMA_ERR_MSG ("Lone quantifier bracket")); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ re_ctx_p->input_curr_p++; re_ctx_p->token.type = RE_TOK_CHAR; @@ -845,7 +845,7 @@ re_parse_next_token (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context * /* Check quantifier */ break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case LIT_CHAR_RIGHT_SQUARE: case LIT_CHAR_RIGHT_BRACE: { @@ -856,13 +856,13 @@ re_parse_next_token (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context * /* FALLTHRU */ } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { re_ctx_p->token.type = RE_TOK_CHAR; re_ctx_p->token.value = ch; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (re_ctx_p->flags & RE_FLAG_UNICODE && lit_is_code_point_utf16_high_surrogate (ch) && re_ctx_p->input_curr_p < re_ctx_p->input_end_p) @@ -874,7 +874,7 @@ re_parse_next_token (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context * re_ctx_p->input_curr_p += LIT_UTF8_MAX_BYTES_IN_CODE_UNIT; } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* Check quantifier */ break; @@ -995,13 +995,13 @@ re_parse_char_class (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context * re_ctx_p->input_curr_p++; current = LIT_CHAR_BS; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (*re_ctx_p->input_curr_p == LIT_CHAR_MINUS) { re_ctx_p->input_curr_p++; current = LIT_CHAR_MINUS; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ else if ((re_ctx_p->flags & RE_FLAG_UNICODE) == 0 && *re_ctx_p->input_curr_p == LIT_CHAR_LOWERCASE_C && re_ctx_p->input_curr_p + 1 < re_ctx_p->input_end_p @@ -1031,12 +1031,12 @@ re_parse_char_class (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context * } } } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (re_ctx_p->flags & RE_FLAG_UNICODE) { current = ecma_regexp_unicode_advance (&re_ctx_p->input_curr_p, re_ctx_p->input_end_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ else { current = lit_cesu8_read_next (&re_ctx_p->input_curr_p); @@ -1058,12 +1058,12 @@ re_parse_char_class (re_compiler_ctx_t *re_ctx_p) /**< RegExp compiler context * continue; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (re_ctx_p->flags & RE_FLAG_UNICODE) { return ecma_raise_syntax_error (ECMA_ERR_MSG ("Invalid character class")); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (start != RE_INVALID_CP) { @@ -1203,11 +1203,11 @@ re_parse_alternative (re_compiler_ctx_t *re_ctx_p, /**< RegExp compiler context } case RE_TOK_PERIOD: { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT re_append_opcode (re_ctx_p, (re_ctx_p->flags & RE_FLAG_UNICODE) ? RE_OP_UNICODE_PERIOD : RE_OP_PERIOD); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ re_append_opcode (re_ctx_p, RE_OP_PERIOD); -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ re_insert_atom_iterator (re_ctx_p, atom_offset); break; @@ -1254,7 +1254,7 @@ re_parse_alternative (re_compiler_ctx_t *re_ctx_p, /**< RegExp compiler context return result; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (re_ctx_p->flags & RE_FLAG_UNICODE) { re_ctx_p->token.qmin = 1; @@ -1262,7 +1262,7 @@ re_parse_alternative (re_compiler_ctx_t *re_ctx_p, /**< RegExp compiler context re_ctx_p->token.greedy = true; } else -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ { re_parse_quantifier (re_ctx_p); @@ -1379,4 +1379,4 @@ re_parse_alternative (re_compiler_ctx_t *re_ctx_p, /**< RegExp compiler context * @} */ -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ diff --git a/jerry-core/parser/regexp/re-parser.h b/jerry-core/parser/regexp/re-parser.h index 1540968b2..0c0ccfc91 100644 --- a/jerry-core/parser/regexp/re-parser.h +++ b/jerry-core/parser/regexp/re-parser.h @@ -16,7 +16,7 @@ #ifndef RE_PARSER_H #define RE_PARSER_H -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP #include "re-compiler-context.h" @@ -55,5 +55,5 @@ ecma_value_t re_parse_alternative (re_compiler_ctx_t *re_ctx_p, bool expect_eof) * @} */ -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ #endif /* !RE_PARSER_H */ diff --git a/jerry-core/parser/regexp/re-token.h b/jerry-core/parser/regexp/re-token.h index fd203a196..a1df1c337 100644 --- a/jerry-core/parser/regexp/re-token.h +++ b/jerry-core/parser/regexp/re-token.h @@ -16,7 +16,7 @@ #ifndef RE_TOKEN_H #define RE_TOKEN_H -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP /** \addtogroup parser Parser * @{ @@ -68,5 +68,5 @@ typedef struct * @} */ -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ #endif /* !RE_TOKEN_H */ diff --git a/jerry-core/vm/opcodes-ecma-arithmetics.c b/jerry-core/vm/opcodes-ecma-arithmetics.c index e688fe7ad..17cb1f397 100644 --- a/jerry-core/vm/opcodes-ecma-arithmetics.c +++ b/jerry-core/vm/opcodes-ecma-arithmetics.c @@ -56,10 +56,10 @@ do_number_arithmetic (number_arithmetic_op op, /**< number arithmetic operation ecma_value_t ret_value = ECMA_VALUE_EMPTY; -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (JERRY_LIKELY (!ecma_is_value_bigint (left_value))) { -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ ecma_number_t right_number; if (ECMA_IS_VALUE_ERROR (ecma_op_to_number (right_value, &right_number))) @@ -91,17 +91,17 @@ do_number_arithmetic (number_arithmetic_op op, /**< number arithmetic operation result = ecma_op_number_remainder (left_number, right_number); break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case NUMBER_ARITHMETIC_EXPONENTIATION: { result = ecma_number_pow (left_number, right_number); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } ret_value = ecma_make_number_value (result); -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT } else { @@ -136,13 +136,13 @@ do_number_arithmetic (number_arithmetic_op op, /**< number arithmetic operation ret_value = ecma_bigint_div_mod (left_value, right_value, true); break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case NUMBER_ARITHMETIC_EXPONENTIATION: { ret_value = ecma_bigint_pow (left_value, right_value); break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } ecma_free_value (left_value); @@ -151,7 +151,7 @@ do_number_arithmetic (number_arithmetic_op op, /**< number arithmetic operation ecma_free_value (right_value); } } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ return ret_value; } /* do_number_arithmetic */ @@ -239,13 +239,13 @@ opfunc_addition (ecma_value_t left_value, /**< left value */ ecma_deref_ecma_string (string2_p); } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT else if (JERRY_UNLIKELY (ecma_is_value_bigint (left_value)) && JERRY_UNLIKELY (ecma_is_value_bigint (right_value))) { ret_value = ecma_bigint_add_sub (left_value, right_value, true); } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ else { ecma_number_t num_left; @@ -294,7 +294,7 @@ opfunc_unary_operation (ecma_value_t left_value, /**< left value */ return left_value; } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (JERRY_LIKELY (!ecma_is_value_bigint (left_value))) { return ecma_make_number_value (is_plus ? left_number : -left_number); @@ -318,9 +318,9 @@ opfunc_unary_operation (ecma_value_t left_value, /**< left value */ ecma_free_value (left_value); return ret_value; -#else /* !ENABLED (JERRY_BUILTIN_BIGINT) */ +#else /* !JERRY_BUILTIN_BIGINT */ return ecma_make_number_value (is_plus ? left_number : -left_number); -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ } /* opfunc_unary_operation */ /** diff --git a/jerry-core/vm/opcodes-ecma-bitwise.c b/jerry-core/vm/opcodes-ecma-bitwise.c index 584b7e446..90075655d 100644 --- a/jerry-core/vm/opcodes-ecma-bitwise.c +++ b/jerry-core/vm/opcodes-ecma-bitwise.c @@ -57,10 +57,10 @@ do_number_bitwise_logic (number_bitwise_logic_op op, /**< number bitwise logic o ecma_value_t ret_value = ECMA_VALUE_EMPTY; -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (JERRY_LIKELY (!ecma_is_value_bigint (left_value))) { -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ ecma_number_t right_number; if (ECMA_IS_VALUE_ERROR (ecma_op_to_number (right_value, &right_number))) @@ -113,7 +113,7 @@ do_number_bitwise_logic (number_bitwise_logic_op op, /**< number bitwise logic o ret_value = ecma_make_number_value (result); -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT } else { @@ -168,7 +168,7 @@ do_number_bitwise_logic (number_bitwise_logic_op op, /**< number bitwise logic o ecma_free_value (right_value); } } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ return ret_value; } /* do_number_bitwise_logic */ @@ -192,18 +192,18 @@ do_number_bitwise_not (ecma_value_t value) /**< value */ return value; } -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (JERRY_LIKELY (!ecma_is_value_bigint (value))) { -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ return ecma_make_number_value ((ecma_number_t) ((int32_t) ~ecma_number_to_uint32 (number))); -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT } ecma_value_t ret_value = ecma_bigint_unary (value, ECMA_BIGINT_UNARY_BITWISE_NOT); ecma_free_value (value); return ret_value; -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ } /* do_number_bitwise_not */ /** diff --git a/jerry-core/vm/opcodes-ecma-relational-equality.c b/jerry-core/vm/opcodes-ecma-relational-equality.c index fa4dbc0c9..6391dfaf1 100644 --- a/jerry-core/vm/opcodes-ecma-relational-equality.c +++ b/jerry-core/vm/opcodes-ecma-relational-equality.c @@ -109,7 +109,7 @@ opfunc_instanceof (ecma_value_t left_value, /**< left value */ return ecma_raise_type_error (ECMA_ERR_MSG ("Right value of 'instanceof' must be an object")); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t has_instance_method = ecma_op_get_method_by_symbol_id (right_value, LIT_GLOBAL_SYMBOL_HAS_INSTANCE); if (ECMA_IS_VALUE_ERROR (has_instance_method)) { @@ -133,7 +133,7 @@ opfunc_instanceof (ecma_value_t left_value, /**< left value */ return ecma_make_boolean_value (has_instance); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_object_t *right_value_obj_p = ecma_get_object_from_value (right_value); return ecma_op_object_has_instance (right_value_obj_p, left_value); diff --git a/jerry-core/vm/opcodes.c b/jerry-core/vm/opcodes.c index dec801286..37fec106c 100644 --- a/jerry-core/vm/opcodes.c +++ b/jerry-core/vm/opcodes.c @@ -82,12 +82,12 @@ opfunc_set_data_property (ecma_object_t *object_p, /**< object */ if (!(*property_p & ECMA_PROPERTY_FLAG_DATA)) { -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT ecma_getter_setter_pointers_t *getter_setter_pair_p; getter_setter_pair_p = ECMA_GET_NON_NULL_POINTER (ecma_getter_setter_pointers_t, ECMA_PROPERTY_VALUE_PTR (property_p)->getter_setter_pair_cp); jmem_pools_free (getter_setter_pair_p, sizeof (ecma_getter_setter_pointers_t)); -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ *property_p |= ECMA_PROPERTY_FLAG_DATA | ECMA_PROPERTY_FLAG_WRITABLE; prop_value_p->value = ecma_copy_value_if_not_object (value); @@ -143,22 +143,22 @@ opfunc_set_accessor (bool is_getter, /**< is getter accessor */ if (*property_p & ECMA_PROPERTY_FLAG_DATA) { -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT ecma_getter_setter_pointers_t *getter_setter_pair_p; getter_setter_pair_p = jmem_pools_alloc (sizeof (ecma_getter_setter_pointers_t)); -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ ecma_free_value_if_not_object (prop_value_p->value); *property_p = (uint8_t) (*property_p & ~(ECMA_PROPERTY_FLAG_DATA | ECMA_PROPERTY_FLAG_WRITABLE)); -#if ENABLED (JERRY_CPOINTER_32_BIT) +#if JERRY_CPOINTER_32_BIT ECMA_SET_POINTER (getter_setter_pair_p->getter_cp, getter_func_p); ECMA_SET_POINTER (getter_setter_pair_p->setter_cp, setter_func_p); ECMA_SET_NON_NULL_POINTER (prop_value_p->getter_setter_pair_cp, getter_setter_pair_p); -#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */ +#else /* !JERRY_CPOINTER_32_BIT */ ECMA_SET_POINTER (prop_value_p->getter_setter_pair.getter_cp, getter_func_p); ECMA_SET_POINTER (prop_value_p->getter_setter_pair.setter_cp, setter_func_p); -#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */ +#endif /* JERRY_CPOINTER_32_BIT */ return; } @@ -184,12 +184,12 @@ vm_op_delete_prop (ecma_value_t object, /**< base object */ ecma_value_t property, /**< property name */ bool is_strict) /**< strict mode */ { -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT if (ecma_is_value_undefined (object)) { return ECMA_VALUE_TRUE; } -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ if (!ecma_op_require_object_coercible (object)) { @@ -215,12 +215,12 @@ vm_op_delete_prop (ecma_value_t object, /**< base object */ ecma_deref_object (obj_p); ecma_deref_ecma_string (name_string_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (is_strict && ecma_is_value_false (delete_op_ret)) { return ecma_raise_type_error (ECMA_ERR_MSG ("Operator delete returned false in strict mode")); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return delete_op_ret; } /* vm_op_delete_prop */ @@ -241,12 +241,12 @@ vm_op_delete_var (ecma_value_t name_literal, /**< name literal */ ecma_object_t *ref_base_lex_env_p = ecma_op_resolve_reference_base (lex_env_p, var_name_str_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (JERRY_UNLIKELY (ref_base_lex_env_p == ECMA_OBJECT_POINTER_ERROR)) { return ECMA_VALUE_ERROR; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ if (ref_base_lex_env_p == NULL) { @@ -297,14 +297,14 @@ opfunc_for_in (ecma_value_t iterable_value, /**< ideally an iterable value */ ecma_object_t *obj_p = ecma_get_object_from_value (obj_expr_value); ecma_collection_t *prop_names_p = ecma_op_object_enumerate (obj_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (prop_names_p == NULL)) { ecma_deref_object (obj_p); *result_obj_p = ECMA_VALUE_ERROR; return NULL; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (prop_names_p->item_count != 0) { @@ -318,7 +318,7 @@ opfunc_for_in (ecma_value_t iterable_value, /**< ideally an iterable value */ return NULL; } /* opfunc_for_in */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * 'VM_OC_APPEND_ARRAY' opcode handler specialized for spread objects @@ -499,7 +499,7 @@ opfunc_spread_arguments (ecma_value_t *stack_top_p, /**< pointer to the current return buff_p; } /* opfunc_spread_arguments */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * 'VM_OC_APPEND_ARRAY' opcode handler, for setting array object properties @@ -512,12 +512,12 @@ opfunc_append_array (ecma_value_t *stack_top_p, /**< current stack top */ uint16_t values_length) /**< number of elements to set * with potential OPFUNC_HAS_SPREAD_ELEMENT flag */ { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (values_length >= OPFUNC_HAS_SPREAD_ELEMENT) { return opfunc_append_to_spread_array (stack_top_p, (uint16_t) (values_length & ~OPFUNC_HAS_SPREAD_ELEMENT)); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_object_t *array_obj_p = ecma_get_object_from_value (stack_top_p[-1]); JERRY_ASSERT (ecma_get_object_type (array_obj_p) == ECMA_OBJECT_TYPE_ARRAY); @@ -575,7 +575,7 @@ opfunc_append_array (ecma_value_t *stack_top_p, /**< current stack top */ return ECMA_VALUE_EMPTY; } /* opfunc_append_array */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Create an executable object using the current frame context @@ -779,16 +779,16 @@ opfunc_resume_executable_object (vm_executable_object_t *executable_object_p, /* ecma_object_t *old_new_target = JERRY_CONTEXT (current_new_target_p); JERRY_CONTEXT (current_new_target_p) = NULL; -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_global_object_t *saved_global_object_p = JERRY_CONTEXT (global_object_p); JERRY_CONTEXT (global_object_p) = ecma_op_function_get_realm (bytecode_header_p); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ ecma_value_t result = vm_execute (&executable_object_p->frame_ctx); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS JERRY_CONTEXT (global_object_p) = saved_global_object_p; -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ JERRY_CONTEXT (current_new_target_p) = old_new_target; executable_object_p->extended_object.u.class_prop.extra_info &= (uint16_t) ~ECMA_EXECUTABLE_OBJECT_RUNNING; @@ -1143,10 +1143,10 @@ opfunc_create_implicit_class_constructor (uint8_t opcode) /**< current cbc opcod ecma_native_function_t *native_function_p = (ecma_native_function_t *) function_obj_p; -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ECMA_SET_INTERNAL_VALUE_POINTER (native_function_p->realm_value, ecma_builtin_get_global ()); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ /* 10.a.i */ if (opcode == CBC_EXT_PUSH_IMPLICIT_CONSTRUCTOR_HERITAGE) @@ -1345,7 +1345,7 @@ opfunc_set_class_attributes (ecma_object_t *obj_p, /**< object */ { jmem_cpointer_t prop_iter_cp = obj_p->u1.property_list_cp; -#if ENABLED (JERRY_PROPRETY_HASHMAP) +#if JERRY_PROPRETY_HASHMAP if (prop_iter_cp != JMEM_CP_NULL) { ecma_property_header_t *prop_iter_p = ECMA_GET_NON_NULL_POINTER (ecma_property_header_t, prop_iter_cp); @@ -1354,7 +1354,7 @@ opfunc_set_class_attributes (ecma_object_t *obj_p, /**< object */ prop_iter_cp = prop_iter_p->next_property_cp; } } -#endif /* ENABLED (JERRY_PROPRETY_HASHMAP) */ +#endif /* JERRY_PROPRETY_HASHMAP */ while (prop_iter_cp != JMEM_CP_NULL) { @@ -1643,13 +1643,13 @@ opfunc_copy_data_properties (ecma_value_t target_object, /**< target object */ ecma_object_t *source_object_p = ecma_get_object_from_value (source_object); ecma_collection_t *names_p = ecma_op_object_own_property_keys (source_object_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (names_p == NULL) { JERRY_ASSERT (!source_to_object); return ECMA_VALUE_ERROR; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ ecma_object_t *target_object_p = ecma_get_object_from_value (target_object); ecma_value_t *buffer_p = names_p->buffer_p; @@ -1760,11 +1760,11 @@ opfunc_lexical_scope_has_restricted_binding (vm_frame_ctx_t *frame_ctx_p, /**< f { JERRY_ASSERT (ecma_get_lex_env_type (frame_ctx_p->lex_env_p) == ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS JERRY_ASSERT (frame_ctx_p->this_binding == JERRY_CONTEXT (global_object_p)->this_binding); -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ JERRY_ASSERT (frame_ctx_p->this_binding == ecma_builtin_get_global ()); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ ecma_object_t *lex_env_p = frame_ctx_p->lex_env_p; ecma_property_t *binding_p = ecma_find_named_property (lex_env_p, name_p); @@ -1774,11 +1774,11 @@ opfunc_lexical_scope_has_restricted_binding (vm_frame_ctx_t *frame_ctx_p, /**< f return ECMA_VALUE_TRUE; } -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_object_t *const global_scope_p = ecma_get_global_scope ((ecma_object_t *) JERRY_CONTEXT (global_object_p)); -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ ecma_object_t *const global_scope_p = ecma_get_global_scope (global_obj_p); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ if (global_scope_p != lex_env_p) { @@ -1787,7 +1787,7 @@ opfunc_lexical_scope_has_restricted_binding (vm_frame_ctx_t *frame_ctx_p, /**< f ecma_object_t *global_obj_p = ecma_get_object_from_value (frame_ctx_p->this_binding); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_OBJECT_IS_PROXY (global_obj_p)) { ecma_property_descriptor_t prop_desc; @@ -1801,7 +1801,7 @@ opfunc_lexical_scope_has_restricted_binding (vm_frame_ctx_t *frame_ctx_p, /**< f return status; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ ecma_property_t property = ecma_op_object_get_own_property (global_obj_p, name_p, @@ -1812,7 +1812,7 @@ opfunc_lexical_scope_has_restricted_binding (vm_frame_ctx_t *frame_ctx_p, /**< f && !ecma_is_property_configurable (property))); } /* opfunc_lexical_scope_has_restricted_binding */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} diff --git a/jerry-core/vm/opcodes.h b/jerry-core/vm/opcodes.h index 6f4ac5dc7..0a4fa92be 100644 --- a/jerry-core/vm/opcodes.h +++ b/jerry-core/vm/opcodes.h @@ -35,9 +35,9 @@ typedef enum NUMBER_ARITHMETIC_MULTIPLICATION, /**< multiplication */ NUMBER_ARITHMETIC_DIVISION, /**< division */ NUMBER_ARITHMETIC_REMAINDER, /**< remainder calculation */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT NUMBER_ARITHMETIC_EXPONENTIATION, /**< exponentiation */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } number_arithmetic_op; /** @@ -53,7 +53,7 @@ typedef enum NUMBER_BITWISE_SHIFT_URIGHT, /**< bitwise UNSIGNED RIGHT SHIFT calculation */ } number_bitwise_logic_op; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Types for opfunc_create_executable_object. @@ -64,7 +64,7 @@ typedef enum VM_CREATE_EXECUTABLE_OBJECT_ASYNC, /**< create an async function */ } vm_create_executable_object_type_t; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * The stack contains spread object during the upcoming APPEND_ARRAY operation @@ -116,15 +116,15 @@ vm_op_delete_var (ecma_value_t name_literal, ecma_object_t *lex_env_p); ecma_collection_t * opfunc_for_in (ecma_value_t left_value, ecma_value_t *result_obj_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_collection_t * opfunc_spread_arguments (ecma_value_t *stack_top_p, uint8_t argument_list_len); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_value_t opfunc_append_array (ecma_value_t *stack_top_p, uint16_t values_length); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT vm_executable_object_t * opfunc_create_executable_object (vm_frame_ctx_t *frame_ctx_p, vm_create_executable_object_type_t type); @@ -180,7 +180,7 @@ opfunc_copy_data_properties (ecma_value_t target_object, ecma_value_t source_obj ecma_value_t opfunc_lexical_scope_has_restricted_binding (vm_frame_ctx_t *vm_frame_ctx_p, ecma_string_t *name_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} diff --git a/jerry-core/vm/vm-defines.h b/jerry-core/vm/vm-defines.h index b26ece893..35262e2be 100644 --- a/jerry-core/vm/vm-defines.h +++ b/jerry-core/vm/vm-defines.h @@ -44,11 +44,11 @@ typedef enum VM_FRAME_CTX_SHARED_DIRECT_EVAL = (1 << 1), /**< direct eval call */ VM_FRAME_CTX_SHARED_FREE_THIS = (1 << 2), /**< free this binding */ VM_FRAME_CTX_SHARED_FREE_LOCAL_ENV = (1 << 3), /**< free local environment */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT VM_FRAME_CTX_SHARED_NON_ARROW_FUNC = (1 << 4), /**< non-arrow function */ VM_FRAME_CTX_SHARED_HERITAGE_PRESENT = (1 << 5), /**< class heritage present */ VM_FRAME_CTX_SHARED_HAS_CLASS_FIELDS = (1 << 6), /**< has class fields */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } vm_frame_ctx_shared_flags_t; /** @@ -71,7 +71,7 @@ typedef struct uint32_t arg_list_len; /**< arguments list length */ } vm_frame_ctx_shared_args_t; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define VM_FRAME_CTX_GET_FUNCTION_OBJECT(frame_ctx_p) \ (((vm_frame_ctx_shared_args_t *) (frame_ctx_p)->shared_p)->function_object_p) @@ -91,7 +91,7 @@ typedef struct #define VM_GET_COMPUTED_CLASS_FIELDS(frame_ctx_p) \ (((vm_frame_ctx_shared_class_fields_t *) ((frame_ctx_p)->shared_p))->computed_class_fields_p) -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Flag bits of vm_frame_ctx_t @@ -116,9 +116,9 @@ typedef struct vm_frame_ctx_t struct vm_frame_ctx_t *prev_context_p; /**< previous context */ ecma_value_t this_binding; /**< this binding */ ecma_value_t block_result; /**< block result */ -#if ENABLED (JERRY_LINE_INFO) +#if JERRY_LINE_INFO uint32_t current_line; /**< currently executed line */ -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ uint16_t context_depth; /**< current context depth */ uint8_t status_flags; /**< combination of vm_frame_ctx_flags_t bits */ uint8_t call_operation; /**< perform a call or construct operation */ diff --git a/jerry-core/vm/vm-stack.c b/jerry-core/vm/vm-stack.c index 851c05e95..68cd58cad 100644 --- a/jerry-core/vm/vm-stack.c +++ b/jerry-core/vm/vm-stack.c @@ -41,7 +41,7 @@ JERRY_STATIC_ASSERT (PARSER_WITH_CONTEXT_STACK_ALLOCATION == PARSER_TRY_CONTEXT_ JERRY_STATIC_ASSERT (PARSER_FOR_OF_CONTEXT_STACK_ALLOCATION == PARSER_FOR_AWAIT_OF_CONTEXT_STACK_ALLOCATION, for_of_context_stack_allocation_must_be_equal_to_for_await_of_context_stack_allocation); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Abort (finalize) the current variable length stack context, and remove it. * @@ -74,7 +74,7 @@ vm_stack_context_abort_variable_length (vm_frame_ctx_t *frame_ctx_p, /**< frame return vm_stack_top_p; } /* vm_stack_context_abort_variable_length */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Abort (finalize) the current stack context, and remove it. @@ -111,16 +111,16 @@ vm_stack_context_abort (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ } case VM_CONTEXT_TRY: case VM_CONTEXT_CATCH: -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case VM_CONTEXT_BLOCK: -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case VM_CONTEXT_WITH: { VM_MINUS_EQUAL_U16 (frame_ctx_p->context_depth, PARSER_WITH_CONTEXT_STACK_ALLOCATION); vm_stack_top_p -= PARSER_WITH_CONTEXT_STACK_ALLOCATION; break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case VM_CONTEXT_ITERATOR: case VM_CONTEXT_OBJ_INIT: case VM_CONTEXT_OBJ_INIT_REST: @@ -139,7 +139,7 @@ vm_stack_context_abort (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ vm_stack_top_p -= PARSER_FOR_OF_CONTEXT_STACK_ALLOCATION; break; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { JERRY_ASSERT (VM_GET_CONTEXT_TYPE (vm_stack_top_p[-1]) == VM_CONTEXT_FOR_IN); @@ -199,7 +199,7 @@ vm_decode_branch_offset (const uint8_t *branch_offset_p, /**< start offset of by return branch_offset; } /* vm_decode_branch_offset */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Byte code which resumes an executable object with throw @@ -209,7 +209,7 @@ static const uint8_t vm_stack_resume_executable_object_with_context_end[1] = CBC_CONTEXT_END }; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Find a finally up to the end position. @@ -253,7 +253,7 @@ vm_stack_find_finally (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ return VM_CONTEXT_FOUND_EXPECTED; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (stack_top_p[-1] & VM_CONTEXT_HAS_LEX_ENV) { ecma_object_t *lex_env_p = frame_ctx_p->lex_env_p; @@ -261,7 +261,7 @@ vm_stack_find_finally (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ frame_ctx_p->lex_env_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, lex_env_p->u2.outer_reference_cp); ecma_deref_object (lex_env_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ byte_code_p = frame_ctx_p->byte_code_start_p + context_end; @@ -302,7 +302,7 @@ vm_stack_find_finally (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ { JERRY_ASSERT (context_type == VM_CONTEXT_CATCH); -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT if (stack_top_p[-1] & VM_CONTEXT_HAS_LEX_ENV) { ecma_object_t *lex_env_p = frame_ctx_p->lex_env_p; @@ -310,7 +310,7 @@ vm_stack_find_finally (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ frame_ctx_p->lex_env_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, lex_env_p->u2.outer_reference_cp); ecma_deref_object (lex_env_p); } -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ if (byte_code_p[0] == CBC_CONTEXT_END) { @@ -325,7 +325,7 @@ vm_stack_find_finally (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ VM_PLUS_EQUAL_U16 (frame_ctx_p->context_depth, PARSER_FINALLY_CONTEXT_EXTRA_STACK_ALLOCATION); stack_top_p += PARSER_FINALLY_CONTEXT_EXTRA_STACK_ALLOCATION; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (byte_code_p[1] == CBC_EXT_ASYNC_EXIT)) { branch_offset = (uint32_t) (byte_code_p - frame_ctx_p->byte_code_start_p); @@ -335,7 +335,7 @@ vm_stack_find_finally (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ frame_ctx_p->stack_top_p = stack_top_p; return VM_CONTEXT_FOUND_FINALLY; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ JERRY_ASSERT (byte_code_p[1] >= CBC_EXT_FINALLY && byte_code_p[1] <= CBC_EXT_FINALLY_3); @@ -353,7 +353,7 @@ vm_stack_find_finally (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ frame_ctx_p->stack_top_p = stack_top_p; return VM_CONTEXT_FOUND_FINALLY; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT else if (stack_top_p[-1] & VM_CONTEXT_CLOSE_ITERATOR) { JERRY_ASSERT (context_type == VM_CONTEXT_FOR_OF @@ -455,7 +455,7 @@ vm_stack_find_finally (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ jcontext_raise_exception (exception); } } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ stack_top_p = vm_stack_context_abort (frame_ctx_p, stack_top_p); } @@ -464,7 +464,7 @@ vm_stack_find_finally (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ return VM_CONTEXT_FOUND_EXPECTED; } /* vm_stack_find_finally */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT /** * Get the offsets of ecma values corresponding to the passed context. @@ -586,7 +586,7 @@ vm_ref_lex_env_chain (ecma_object_t *lex_env_p, /**< top of lexical environment while (context_top_p > context_end_p); } /* vm_ref_lex_env_chain */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * @} diff --git a/jerry-core/vm/vm-stack.h b/jerry-core/vm/vm-stack.h index 2dae2e1b0..2fa543462 100644 --- a/jerry-core/vm/vm-stack.h +++ b/jerry-core/vm/vm-stack.h @@ -67,12 +67,12 @@ typedef enum VM_CONTEXT_FINALLY_RETURN, /**< finally context with a return */ VM_CONTEXT_TRY, /**< try context */ VM_CONTEXT_CATCH, /**< catch context */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT VM_CONTEXT_BLOCK, /**< block context */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ VM_CONTEXT_WITH, /**< with context */ VM_CONTEXT_FOR_IN, /**< for-in context */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT VM_CONTEXT_FOR_OF, /**< for-of context */ VM_CONTEXT_FOR_AWAIT_OF, /**< for-await-of context */ @@ -80,7 +80,7 @@ typedef enum VM_CONTEXT_ITERATOR, /**< iterator context */ VM_CONTEXT_OBJ_INIT, /**< object-initializer context */ VM_CONTEXT_OBJ_INIT_REST, /**< object-initializer-rest context */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ } vm_stack_context_type_t; /** @@ -89,10 +89,10 @@ typedef enum typedef enum { VM_CONTEXT_FOUND_FINALLY, /**< found finally */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT VM_CONTEXT_FOUND_ERROR, /**< found an error */ VM_CONTEXT_FOUND_AWAIT, /**< found an await operation */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ VM_CONTEXT_FOUND_EXPECTED, /**< found the type specified in finally_type */ } vm_stack_found_type; @@ -104,12 +104,12 @@ typedef enum * - [JS values belong to the context] * - [previous JS values stored by the VM stack] */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT #define VM_CONTEXT_IS_VARIABLE_LENGTH(context_type) \ ((context_type) >= VM_CONTEXT_ITERATOR) -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ #define VM_CONTEXT_IS_VARIABLE_LENGTH(context_type) false -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * Checks whether the context type is a finally type. @@ -132,10 +132,10 @@ typedef enum */ #define VM_CONTEXT_GET_NEXT_OFFSET(offsets) (-((int32_t) ((offsets) & ((1 << VM_CONTEXT_OFFSET_SHIFT) - 1)))) -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t *vm_stack_context_abort_variable_length (vm_frame_ctx_t *frame_ctx_p, ecma_value_t *vm_stack_top_p, - uint32_t context_stack_allocation); -#endif /* ENABLED (JERRY_ESNEXT) */ + uint32_t context_stack_allocation); +#endif /* JERRY_ESNEXT */ ecma_value_t *vm_stack_context_abort (vm_frame_ctx_t *frame_ctx_p, ecma_value_t *vm_stack_top_p); vm_stack_found_type vm_stack_find_finally (vm_frame_ctx_t *frame_ctx_p, ecma_value_t *stack_top_p, vm_stack_context_type_t finally_type, uint32_t search_limit); diff --git a/jerry-core/vm/vm-utils.c b/jerry-core/vm/vm-utils.c index 78bd15bab..753b0adec 100644 --- a/jerry-core/vm/vm-utils.c +++ b/jerry-core/vm/vm-utils.c @@ -61,7 +61,7 @@ vm_is_direct_eval_form_call (void) ecma_value_t vm_get_backtrace (uint32_t max_depth) /**< maximum backtrace depth, 0 = unlimited */ { -#if ENABLED (JERRY_LINE_INFO) +#if JERRY_LINE_INFO vm_frame_ctx_t *context_p = JERRY_CONTEXT (vm_top_context_p); if (max_depth == 0) @@ -107,9 +107,9 @@ vm_get_backtrace (uint32_t max_depth) /**< maximum backtrace depth, 0 = unlimite } return ecma_make_object_value (array_p); -#else /* !ENABLED (JERRY_LINE_INFO) */ +#else /* !JERRY_LINE_INFO */ JERRY_UNUSED (max_depth); return ecma_make_object_value (ecma_op_new_array_object (0)); -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ } /* vm_get_backtrace */ diff --git a/jerry-core/vm/vm.c b/jerry-core/vm/vm.c index 59664f6db..5681d5047 100644 --- a/jerry-core/vm/vm.c +++ b/jerry-core/vm/vm.c @@ -91,16 +91,16 @@ vm_op_get_value (ecma_value_t object, /**< base object */ property_name_p = ecma_get_string_from_value (property); } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ecma_is_value_symbol (property)) { property_name_p = ecma_get_symbol_from_value (property); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ if (property_name_p != NULL) { -#if ENABLED (JERRY_LCACHE) +#if JERRY_LCACHE ecma_property_t *property_p = ecma_lcache_lookup (object_p, property_name_p); if (property_p != NULL && (*property_p & ECMA_PROPERTY_FLAG_DATA)) @@ -108,7 +108,7 @@ vm_op_get_value (ecma_value_t object, /**< base object */ JERRY_ASSERT (!ECMA_PROPERTY_IS_INTERNAL (*property_p)); return ecma_fast_copy_value (ECMA_PROPERTY_VALUE_PTR (property_p)->value); } -#endif /* ENABLED (JERRY_LCACHE) */ +#endif /* JERRY_LCACHE */ /* There is no need to free the name. */ return ecma_op_object_get (object_p, property_name_p); @@ -117,14 +117,14 @@ vm_op_get_value (ecma_value_t object, /**< base object */ if (JERRY_UNLIKELY (ecma_is_value_undefined (object) || ecma_is_value_null (object))) { -#if ENABLED (JERRY_ERROR_MESSAGES) +#if JERRY_ERROR_MESSAGES ecma_value_t error_value = ecma_raise_standard_error_with_format (ECMA_ERROR_TYPE, "Cannot read property '%' of %", property, object); -#else /* !ENABLED (JERRY_ERROR_MESSAGES) */ +#else /* !JERRY_ERROR_MESSAGES */ ecma_value_t error_value = ecma_raise_type_error (NULL); -#endif /* ENABLED (JERRY_ERROR_MESSAGES) */ +#endif /* JERRY_ERROR_MESSAGES */ return error_value; } @@ -164,14 +164,14 @@ vm_op_set_value (ecma_value_t base, /**< base object */ { if (JERRY_UNLIKELY (ecma_is_value_null (base) || ecma_is_value_undefined (base))) { -#if ENABLED (JERRY_ERROR_MESSAGES) +#if JERRY_ERROR_MESSAGES result = ecma_raise_standard_error_with_format (ECMA_ERROR_TYPE, "Cannot set property '%' of %", property, base); -#else /* !ENABLED (JERRY_ERROR_MESSAGES) */ +#else /* !JERRY_ERROR_MESSAGES */ result = ecma_raise_type_error (NULL); -#endif /* ENABLED (JERRY_ERROR_MESSAGES) */ +#endif /* JERRY_ERROR_MESSAGES */ ecma_free_value (property); return result; } @@ -262,7 +262,7 @@ static const uint16_t vm_decode_table[] JERRY_ATTR_CONST_DATA = #undef CBC_OPCODE -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM /** * Run module code * @@ -287,7 +287,7 @@ vm_run_module (ecma_module_t *module_p) /**< module to be executed */ return vm_run (&shared, ECMA_VALUE_UNDEFINED, module_p->scope_p); } /* vm_run_module */ -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ /** * Run global code @@ -300,18 +300,18 @@ vm_run_module (ecma_module_t *module_p) /**< module to be executed */ ecma_value_t vm_run_global (const ecma_compiled_code_t *bytecode_p) /**< pointer to bytecode to run */ { -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_object_t *global_obj_p = (ecma_object_t *) ecma_op_function_get_realm (bytecode_p); -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ ecma_object_t *global_obj_p = ecma_builtin_get_global (); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (bytecode_p->status_flags & CBC_CODE_FLAGS_LEXICAL_BLOCK_NEEDED) { ecma_create_global_lexical_block (global_obj_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_object_t *const global_scope_p = ecma_get_global_scope (global_obj_p); @@ -319,20 +319,20 @@ vm_run_global (const ecma_compiled_code_t *bytecode_p) /**< pointer to bytecode shared.bytecode_header_p = bytecode_p; shared.status_flags = 0; -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_value_t this_binding = ((ecma_global_object_t *) global_obj_p)->this_binding; ecma_global_object_t *saved_global_object_p = JERRY_CONTEXT (global_object_p); JERRY_CONTEXT (global_object_p) = (ecma_global_object_t *) global_obj_p; -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ ecma_value_t this_binding = ecma_make_object_value (global_obj_p); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ ecma_value_t result = vm_run (&shared, this_binding, global_scope_p); -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS JERRY_CONTEXT (global_object_p) = saved_global_object_p; -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ return result; } /* vm_run_global */ @@ -355,7 +355,7 @@ vm_run_eval (ecma_compiled_code_t *bytecode_data_p, /**< byte-code data */ this_binding = ecma_copy_value (JERRY_CONTEXT (vm_top_context_p)->this_binding); lex_env_p = JERRY_CONTEXT (vm_top_context_p)->lex_env_p; -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER uint32_t chain_index = parse_opts >> ECMA_PARSE_CHAIN_INDEX_SHIFT; parse_opts &= (1 << ECMA_PARSE_CHAIN_INDEX_SHIFT) - 1; @@ -374,19 +374,19 @@ vm_run_eval (ecma_compiled_code_t *bytecode_data_p, /**< byte-code data */ chain_index--; } } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ } else { -#if ENABLED (JERRY_BUILTIN_REALMS) +#if JERRY_BUILTIN_REALMS ecma_object_t *global_obj_p = (ecma_object_t *) ecma_op_function_get_realm (bytecode_data_p); this_binding = ((ecma_global_object_t *) global_obj_p)->this_binding; ecma_ref_object (ecma_get_object_from_value (this_binding)); -#else /* !ENABLED (JERRY_BUILTIN_REALMS) */ +#else /* !JERRY_BUILTIN_REALMS */ ecma_object_t *global_obj_p = ecma_builtin_get_global (); ecma_ref_object (global_obj_p); this_binding = ecma_make_object_value (global_obj_p); -#endif /* ENABLED (JERRY_BUILTIN_REALMS) */ +#endif /* JERRY_BUILTIN_REALMS */ lex_env_p = ecma_get_global_scope (global_obj_p); } @@ -418,14 +418,14 @@ vm_run_eval (ecma_compiled_code_t *bytecode_data_p, /**< byte-code data */ ecma_deref_object (lex_env_p); ecma_free_value (this_binding); -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC if (!(bytecode_data_p->status_flags & CBC_CODE_FLAGS_STATIC_FUNCTION)) { ecma_bytecode_deref (bytecode_data_p); } -#else /* !ENABLED (JERRY_SNAPSHOT_EXEC) */ +#else /* !JERRY_SNAPSHOT_EXEC */ ecma_bytecode_deref (bytecode_data_p); -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ return completion_value; } /* vm_run_eval */ @@ -441,22 +441,22 @@ vm_construct_literal_object (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ { ecma_compiled_code_t *bytecode_p; -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC if (JERRY_LIKELY (!(frame_ctx_p->shared_p->bytecode_header_p->status_flags & CBC_CODE_FLAGS_STATIC_FUNCTION))) { -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ bytecode_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_compiled_code_t, lit_value); -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC } else { uint8_t *byte_p = ((uint8_t *) frame_ctx_p->shared_p->bytecode_header_p) + lit_value; bytecode_p = (ecma_compiled_code_t *) byte_p; } -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ -#if ENABLED (JERRY_BUILTIN_REGEXP) +#if JERRY_BUILTIN_REGEXP if (JERRY_UNLIKELY (!CBC_IS_FUNCTION (bytecode_p->status_flags))) { ecma_object_t *regexp_obj_p = ecma_op_regexp_alloc (NULL); @@ -468,13 +468,13 @@ vm_construct_literal_object (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ return ecma_op_create_regexp_from_bytecode (regexp_obj_p, (re_compiled_code_t *) bytecode_p); } -#else /* !ENABLED (JERRY_BUILTIN_REGEXP) */ +#else /* !JERRY_BUILTIN_REGEXP */ JERRY_ASSERT (CBC_IS_FUNCTION (bytecode_p->status_flags)); -#endif /* ENABLED (JERRY_BUILTIN_REGEXP) */ +#endif /* JERRY_BUILTIN_REGEXP */ ecma_object_t *func_obj_p; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (CBC_FUNCTION_IS_ARROW (bytecode_p->status_flags))) { func_obj_p = ecma_op_create_arrow_function_object (frame_ctx_p->lex_env_p, @@ -485,9 +485,9 @@ vm_construct_literal_object (vm_frame_ctx_t *frame_ctx_p, /**< frame context */ { func_obj_p = ecma_op_create_any_function_object (frame_ctx_p->lex_env_p, bytecode_p); } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ func_obj_p = ecma_op_create_simple_function_object (frame_ctx_p->lex_env_p, bytecode_p); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ return ecma_make_object_value (func_obj_p); } /* vm_construct_literal_object */ @@ -527,7 +527,7 @@ static const uint8_t vm_error_byte_code_p[] = CBC_EXT_OPCODE, CBC_EXT_ERROR }; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT static ecma_object_t * vm_get_class_function (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ @@ -627,9 +627,9 @@ vm_super_call (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ if (JERRY_UNLIKELY (ECMA_IS_VALUE_ERROR (completion_value))) { -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER JERRY_CONTEXT (debugger_exception_byte_code_p) = frame_ctx_p->byte_code_p; -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ frame_ctx_p->byte_code_p = (uint8_t *) vm_error_byte_code_p; } else @@ -723,9 +723,9 @@ vm_spread_operation (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ if (JERRY_UNLIKELY (ECMA_IS_VALUE_ERROR (completion_value))) { -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER JERRY_CONTEXT (debugger_exception_byte_code_p) = frame_ctx_p->byte_code_p; -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ frame_ctx_p->byte_code_p = (uint8_t *) vm_error_byte_code_p; } else @@ -750,7 +750,7 @@ vm_spread_operation (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ frame_ctx_p->byte_code_p += 3; } } /* vm_spread_operation */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /** * 'Function call' opcode handler. @@ -811,9 +811,9 @@ opfunc_call (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ if (JERRY_UNLIKELY (ECMA_IS_VALUE_ERROR (completion_value))) { -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER JERRY_CONTEXT (debugger_exception_byte_code_p) = frame_ctx_p->byte_code_p; -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ frame_ctx_p->byte_code_p = (uint8_t *) vm_error_byte_code_p; } else @@ -888,9 +888,9 @@ opfunc_construct (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ if (JERRY_UNLIKELY (ECMA_IS_VALUE_ERROR (completion_value))) { -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER JERRY_CONTEXT (debugger_exception_byte_code_p) = frame_ctx_p->byte_code_p; -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ frame_ctx_p->byte_code_p = (uint8_t *) vm_error_byte_code_p; } else @@ -1155,7 +1155,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ if (opcode_data & VM_OC_BACKWARD_BRANCH) { -#if ENABLED (JERRY_VM_EXEC_STOP) +#if JERRY_VM_EXEC_STOP if (JERRY_CONTEXT (vm_exec_stop_cb) != NULL && --JERRY_CONTEXT (vm_exec_stop_counter) == 0) { @@ -1184,7 +1184,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ goto error; } } -#endif /* ENABLED (JERRY_VM_EXEC_STOP) */ +#endif /* JERRY_VM_EXEC_STOP */ branch_offset = -branch_offset; } @@ -1327,9 +1327,9 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ } case VM_OC_CREATE_BINDING: { -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT JERRY_ASSERT (opcode == CBC_CREATE_VAR); -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ uint32_t literal_index; @@ -1342,7 +1342,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ uint8_t prop_attributes = ECMA_PROPERTY_FLAG_WRITABLE; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (opcode == CBC_CREATE_LET) { prop_attributes = ECMA_PROPERTY_ENUMERABLE_WRITABLE; @@ -1359,9 +1359,9 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ { property_value_p->value = ECMA_VALUE_UNINITIALIZED; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ ecma_create_named_data_property (frame_ctx_p->lex_env_p, name_p, prop_attributes, NULL); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ continue; } @@ -1388,37 +1388,37 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ while (lex_env_p->type_flags_refs & ECMA_OBJECT_FLAG_BLOCK) { -#if ENABLED (JERRY_ESNEXT) && !(defined JERRY_NDEBUG) +#if JERRY_ESNEXT && !(defined JERRY_NDEBUG) if (ecma_get_lex_env_type (lex_env_p) == ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE) { ecma_property_t *property_p = ecma_find_named_property (lex_env_p, name_p); JERRY_ASSERT (property_p == NULL || !(*property_p & ECMA_PROPERTY_FLAG_ENUMERABLE)); } -#endif /* ENABLED (JERRY_ESNEXT) && !JERRY_NDEBUG */ +#endif /* JERRY_ESNEXT && !JERRY_NDEBUG */ JERRY_ASSERT (lex_env_p->u2.outer_reference_cp != JMEM_CP_NULL); lex_env_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, lex_env_p->u2.outer_reference_cp); } -#if ENABLED (JERRY_ESNEXT) && !(defined JERRY_NDEBUG) +#if JERRY_ESNEXT && !(defined JERRY_NDEBUG) if (ecma_get_lex_env_type (lex_env_p) == ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE) { ecma_property_t *property_p = ecma_find_named_property (lex_env_p, name_p); JERRY_ASSERT (property_p == NULL || !(*property_p & ECMA_PROPERTY_FLAG_ENUMERABLE)); } -#endif /* ENABLED (JERRY_ESNEXT) && !JERRY_NDEBUG */ +#endif /* JERRY_ESNEXT && !JERRY_NDEBUG */ /* 'Variable declaration' */ result = ecma_op_has_binding (lex_env_p, name_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (result)) { goto error; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ ecma_property_t *prop_p = NULL; @@ -1458,7 +1458,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ } continue; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case VM_OC_EXT_VAR_EVAL: { uint32_t literal_index; @@ -1533,7 +1533,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ ecma_deref_object (ecma_get_object_from_value (lit_value)); continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case VM_OC_CREATE_ARGUMENTS: { uint32_t literal_index; @@ -1564,14 +1564,14 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ ecma_deref_object (ecma_get_object_from_value (result)); continue; } -#if ENABLED (JERRY_SNAPSHOT_EXEC) +#if JERRY_SNAPSHOT_EXEC case VM_OC_SET_BYTECODE_PTR: { - memcpy (&byte_code_p, byte_code_p++, sizeof (uint8_t *)); + memcpy (&byte_code_p, byte_code_p++, sizeof (uintptr_t)); frame_ctx_p->byte_code_start_p = byte_code_p; continue; } -#endif /* ENABLED (JERRY_SNAPSHOT_EXEC) */ +#endif /* JERRY_SNAPSHOT_EXEC */ case VM_OC_INIT_ARG_OR_FUNC: { uint32_t literal_index, value_index; @@ -1622,7 +1622,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ continue; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case VM_OC_CHECK_VAR: { JERRY_ASSERT (CBC_FUNCTION_GET_TYPE (frame_ctx_p->shared_p->bytecode_header_p->status_flags) @@ -1678,12 +1678,12 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ result = ecma_op_has_binding (lex_env_p, literal_name_p); -#if ENABLED (JERRY_BUILTIN_PROXY) +#if JERRY_BUILTIN_PROXY if (ECMA_IS_VALUE_ERROR (result)) { goto error; } -#endif /* ENABLED (JERRY_BUILTIN_PROXY) */ +#endif /* JERRY_BUILTIN_PROXY */ if (ecma_is_value_true (result)) { @@ -1928,7 +1928,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ left_value ^= right_value; /* FALLTHRU */ } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case VM_OC_SET_PROPERTY: { JERRY_STATIC_ASSERT (VM_OC_NON_STATIC_FLAG == VM_OC_BACKWARD_BRANCH, @@ -1944,7 +1944,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ goto error; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (ecma_compare_ecma_string_to_magic_id (prop_name_p, LIT_MAGIC_STRING_PROTOTYPE)) && !(opcode_data & VM_OC_NON_STATIC_FLAG)) { @@ -1953,9 +1953,9 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ } const int index = (int) (opcode_data >> VM_OC_NON_STATIC_SHIFT) - 2; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ const int index = -1; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_object_t *object_p = ecma_get_object_from_value (stack_top_p[index]); @@ -1977,7 +1977,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ goto error; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (ecma_compare_ecma_string_to_magic_id (prop_name_p, LIT_MAGIC_STRING_PROTOTYPE)) && !(opcode_data & VM_OC_NON_STATIC_FLAG)) { @@ -1986,9 +1986,9 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ } const int index = (int) (opcode_data >> VM_OC_NON_STATIC_SHIFT) - 2; -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ const int index = -1; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ opfunc_set_accessor (VM_OC_GROUP_GET_INDEX (opcode_data) == VM_OC_SET_GETTER, stack_top_p[index], @@ -2005,7 +2005,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ *stack_top_p++ = ecma_make_object_value (ecma_op_new_array_object (0)); continue; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case VM_OC_LOCAL_EVAL: { ECMA_CLEAR_LOCAL_PARSE_OPTS (); @@ -2817,7 +2817,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ } continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case VM_OC_PUSH_ELISON: { *stack_top_p++ = ECMA_VALUE_ARRAY_HOLE; @@ -2828,22 +2828,22 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ uint16_t values_length = *byte_code_p++; stack_top_p -= values_length; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (*byte_code_start_p == CBC_EXT_OPCODE) { values_length = (uint16_t) (values_length | OPFUNC_HAS_SPREAD_ELEMENT); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ result = opfunc_append_array (stack_top_p, values_length); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (ECMA_IS_VALUE_ERROR (result)) { goto error; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_ASSERT (ecma_is_value_empty (result)); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ continue; } case VM_OC_IDENT_REFERENCE: @@ -3009,7 +3009,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ ecma_free_value (left_value); left_value = ECMA_VALUE_UNDEFINED; -#if ENABLED (JERRY_BUILTIN_BIGINT) +#if JERRY_BUILTIN_BIGINT if (JERRY_UNLIKELY (ecma_is_value_bigint (result))) { ecma_bigint_unary_operation_type operation_type = ECMA_BIGINT_UNARY_INCREASE; @@ -3039,7 +3039,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ } break; } -#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */ +#endif /* JERRY_BUILTIN_BIGINT */ result = ecma_make_number_value (result_number); } @@ -3160,9 +3160,9 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ case VM_OC_ERROR: { JERRY_ASSERT (frame_ctx_p->byte_code_p[1] == CBC_EXT_ERROR); -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER frame_ctx_p->byte_code_p = JERRY_CONTEXT (debugger_exception_byte_code_p); -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ result = ECMA_VALUE_ERROR; goto error; @@ -3272,7 +3272,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ ecma_fast_free_value (value); continue; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case VM_OC_BRANCH_IF_NULLISH: { left_value = stack_top_p[-1]; @@ -3285,7 +3285,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ --stack_top_p; continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case VM_OC_PLUS: case VM_OC_MINUS: { @@ -3584,7 +3584,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ *stack_top_p++ = result; goto free_both_values; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case VM_OC_EXP: { result = do_number_arithmetic (NUMBER_ARITHMETIC_EXPONENTIATION, @@ -3599,7 +3599,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ *stack_top_p++ = result; goto free_both_values; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case VM_OC_EQUAL: { result = opfunc_equality (left_value, right_value); @@ -3791,7 +3791,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ if (ecma_are_values_integer_numbers (left_value, right_value)) { bool is_less = (ecma_integer_value_t) left_value < (ecma_integer_value_t) right_value; -#if !ENABLED (JERRY_VM_EXEC_STOP) +#if !JERRY_VM_EXEC_STOP /* This is a lookahead to the next opcode to improve performance. * If it is CBC_BRANCH_IF_TRUE_BACKWARD, execute it. */ if (*byte_code_p <= CBC_BRANCH_IF_TRUE_BACKWARD_3 && *byte_code_p >= CBC_BRANCH_IF_TRUE_BACKWARD) @@ -3825,7 +3825,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ continue; } -#endif /* !ENABLED (JERRY_VM_EXEC_STOP) */ +#endif /* !JERRY_VM_EXEC_STOP */ *stack_top_p++ = ecma_make_boolean_value (is_less); continue; } @@ -3965,7 +3965,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ } case VM_OC_BLOCK_CREATE_CONTEXT: { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT ecma_value_t *stack_context_top_p; stack_context_top_p = VM_GET_REGISTERS (frame_ctx_p) + register_end + frame_ctx_p->context_depth; @@ -4000,12 +4000,12 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ stack_context_top_p[-1] |= VM_CONTEXT_HAS_LEX_ENV; } -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ JERRY_ASSERT (VM_GET_CONTEXT_TYPE (stack_top_p[-2]) == VM_CONTEXT_CATCH && !(stack_top_p[-2] & VM_CONTEXT_HAS_LEX_ENV)); stack_top_p[-2] |= VM_CONTEXT_HAS_LEX_ENV; -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ frame_ctx_p->lex_env_p = ecma_create_decl_lex_env (frame_ctx_p->lex_env_p); frame_ctx_p->lex_env_p->type_flags_refs |= ECMA_OBJECT_FLAG_BLOCK; @@ -4058,13 +4058,13 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ if (prop_names_p == NULL) { -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (JERRY_UNLIKELY (ECMA_IS_VALUE_ERROR (expr_obj_value))) { result = expr_obj_value; goto error; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* The collection is already released */ byte_code_p = byte_code_start_p + branch_offset; @@ -4080,13 +4080,13 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ stack_top_p[-3] = 0; stack_top_p[-4] = expr_obj_value; -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (byte_code_p[0] == CBC_EXT_OPCODE && byte_code_p[1] == CBC_EXT_CLONE_CONTEXT) { /* No need to duplicate the first context. */ byte_code_p += 2; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ continue; } case VM_OC_FOR_IN_GET_NEXT: @@ -4152,7 +4152,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ } continue; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case VM_OC_FOR_OF_INIT: { ecma_value_t value = *(--stack_top_p); @@ -4366,7 +4366,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ frame_ctx_p->stack_top_p = stack_top_p; return ECMA_VALUE_UNDEFINED; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case VM_OC_TRY: { /* Try opcode simply creates the try context. */ @@ -4428,7 +4428,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ continue; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (stack_top_p[-1] & VM_CONTEXT_HAS_LEX_ENV) { ecma_object_t *lex_env_p = frame_ctx_p->lex_env_p; @@ -4436,7 +4436,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ frame_ctx_p->lex_env_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, lex_env_p->u2.outer_reference_cp); ecma_deref_object (lex_env_p); } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ VM_MINUS_EQUAL_U16 (frame_ctx_p->context_depth, PARSER_FINALLY_CONTEXT_STACK_ALLOCATION); @@ -4453,9 +4453,9 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ jcontext_raise_exception (*stack_top_p); result = ECMA_VALUE_ERROR; -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER JERRY_DEBUGGER_SET_FLAGS (JERRY_DEBUGGER_VM_EXCEPTION_THROWN); -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ goto error; } @@ -4478,7 +4478,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ stack_top_p[-2] = jump_target; break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case VM_CONTEXT_FOUND_ERROR: { JERRY_ASSERT (jcontext_has_pending_exception ()); @@ -4491,7 +4491,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ stack_top_p[-2] = jump_target; return ECMA_VALUE_UNDEFINED; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { byte_code_p = frame_ctx_p->byte_code_start_p + jump_target; @@ -4524,7 +4524,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ stack_top_p[-2] = (uint32_t) branch_offset; break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case VM_CONTEXT_FOUND_ERROR: { JERRY_ASSERT (jcontext_has_pending_exception ()); @@ -4537,7 +4537,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ stack_top_p[-2] = (uint32_t) branch_offset; return ECMA_VALUE_UNDEFINED; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { byte_code_p = frame_ctx_p->byte_code_start_p + branch_offset; @@ -4548,7 +4548,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ JERRY_ASSERT (VM_GET_REGISTERS (frame_ctx_p) + register_end + frame_ctx_p->context_depth == stack_top_p); continue; } -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER case VM_OC_BREAKPOINT_ENABLED: { if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_VM_IGNORE) @@ -4622,8 +4622,8 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ } continue; } -#endif /* ENABLED (JERRY_DEBUGGER) */ -#if ENABLED (JERRY_LINE_INFO) +#endif /* JERRY_DEBUGGER */ +#if JERRY_LINE_INFO case VM_OC_LINE: { uint32_t value = 0; @@ -4639,7 +4639,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ frame_ctx_p->current_line = value; continue; } -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ case VM_OC_NONE: default: { @@ -4756,17 +4756,17 @@ error: while (stack_top_p > stack_bottom_p) { ecma_value_t stack_item = *(--stack_top_p); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT if (stack_item == ECMA_VALUE_RELEASE_LEX_ENV) { opfunc_pop_lexical_environment (frame_ctx_p); continue; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ ecma_fast_free_value (stack_item); } -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER const uint32_t dont_stop = (JERRY_DEBUGGER_VM_IGNORE_EXCEPTION | JERRY_DEBUGGER_VM_IGNORE | JERRY_DEBUGGER_VM_EXCEPTION_THROWN); @@ -4796,7 +4796,7 @@ error: JERRY_DEBUGGER_SET_FLAGS (JERRY_DEBUGGER_VM_EXCEPTION_THROWN); } } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ } JERRY_ASSERT (VM_GET_REGISTERS (frame_ctx_p) + register_end + frame_ctx_p->context_depth == stack_top_p); @@ -4826,7 +4826,7 @@ error: stack_top_p[-2] = result; continue; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case VM_CONTEXT_FOUND_ERROR: { JERRY_ASSERT (jcontext_has_pending_exception ()); @@ -4844,7 +4844,7 @@ error: stack_top_p[-2] = result; return ECMA_VALUE_UNDEFINED; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { goto finish; @@ -4869,9 +4869,9 @@ error: JERRY_ASSERT (VM_GET_REGISTERS (frame_ctx_p) + register_end + frame_ctx_p->context_depth == stack_top_p); JERRY_ASSERT (!(stack_top_p[-1] & VM_CONTEXT_HAS_LEX_ENV)); -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER JERRY_DEBUGGER_CLEAR_FLAGS (JERRY_DEBUGGER_VM_EXCEPTION_THROWN); -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ result = jcontext_take_exception (); @@ -4886,13 +4886,13 @@ error: *stack_top_p++ = result; continue; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case VM_CONTEXT_FOUND_AWAIT: { JERRY_ASSERT (VM_GET_CONTEXT_TYPE (frame_ctx_p->stack_top_p[-1]) == VM_CONTEXT_FINALLY_THROW); return ECMA_VALUE_UNDEFINED; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ default: { break; @@ -4940,9 +4940,9 @@ vm_init_exec (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ frame_ctx_p->prev_context_p = JERRY_CONTEXT (vm_top_context_p); frame_ctx_p->block_result = ECMA_VALUE_UNDEFINED; -#if ENABLED (JERRY_LINE_INFO) +#if JERRY_LINE_INFO frame_ctx_p->current_line = 0; -#endif /* ENABLED (JERRY_LINE_INFO) */ +#endif /* JERRY_LINE_INFO */ frame_ctx_p->context_depth = 0; frame_ctx_p->status_flags = (uint8_t) ((shared_p->status_flags & VM_FRAME_CTX_DIRECT_EVAL) | (bytecode_header_p->status_flags & VM_FRAME_CTX_IS_STRICT)); @@ -5034,7 +5034,7 @@ vm_execute (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ opfunc_call (frame_ctx_p); break; } -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT case VM_EXEC_SUPER_CALL: { vm_super_call (frame_ctx_p); @@ -5049,7 +5049,7 @@ vm_execute (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ { return completion_value; } -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ case VM_EXEC_CONSTRUCT: { opfunc_construct (frame_ctx_p); @@ -5078,14 +5078,14 @@ vm_execute (vm_frame_ctx_t *frame_ctx_p) /**< frame context */ ecma_fast_free_value (registers_p[i]); } -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER if (JERRY_CONTEXT (debugger_stop_context) == JERRY_CONTEXT (vm_top_context_p)) { /* The engine will stop when the next breakpoint is reached. */ JERRY_ASSERT (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_VM_STOP); JERRY_CONTEXT (debugger_stop_context) = NULL; } -#endif /* ENABLED (JERRY_DEBUGGER) */ +#endif /* JERRY_DEBUGGER */ JERRY_CONTEXT (vm_top_context_p) = frame_ctx_p->prev_context_p; return completion_value; diff --git a/jerry-core/vm/vm.h b/jerry-core/vm/vm.h index f8bd161c7..0210089bc 100644 --- a/jerry-core/vm/vm.h +++ b/jerry-core/vm/vm.h @@ -162,9 +162,9 @@ typedef enum VM_OC_ERROR, /**< error while the vm_loop is suspended */ VM_OC_JUMP, /**< jump */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT VM_OC_BRANCH_IF_NULLISH, /** branch if undefined or null */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ VM_OC_BRANCH_IF_STRICT_EQUAL, /**< branch if strict equal */ /* These four opcodes must be in this order. */ @@ -186,9 +186,9 @@ typedef enum VM_OC_MUL, /**< mul */ VM_OC_DIV, /**< div */ VM_OC_MOD, /**< mod */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT VM_OC_EXP, /**< exponentiation */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ VM_OC_EQUAL, /**< equal */ VM_OC_NOT_EQUAL, /**< not equal */ @@ -224,20 +224,20 @@ typedef enum VM_OC_CREATE_ARGUMENTS, /**< create arguments object */ VM_OC_SET_BYTECODE_PTR, /**< setting bytecode pointer */ VM_OC_VAR_EVAL, /**< variable and function evaluation */ -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT VM_OC_EXT_VAR_EVAL, /**< variable and function evaluation for * functions with separate argument context */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ VM_OC_INIT_ARG_OR_FUNC, /**< create and init a function or argument binding */ -#if ENABLED (JERRY_DEBUGGER) +#if JERRY_DEBUGGER VM_OC_BREAKPOINT_ENABLED, /**< enabled breakpoint for debugger */ VM_OC_BREAKPOINT_DISABLED, /**< disabled breakpoint for debugger */ -#endif /* ENABLED (JERRY_DEBUGGER) */ -#if ENABLED (JERRY_LINE_INFO) +#endif /* JERRY_DEBUGGER */ +#if JERRY_LINE_INFO VM_OC_LINE, /**< line number of the next statement */ -#endif /* ENABLED (JERRY_LINE_INFO) */ -#if ENABLED (JERRY_ESNEXT) +#endif /* JERRY_LINE_INFO */ +#if JERRY_ESNEXT VM_OC_CHECK_VAR, /**< check redeclared vars in the global scope */ VM_OC_CHECK_LET, /**< check redeclared lets in the global scope */ VM_OC_ASSIGN_LET_CONST, /**< assign values to let/const declarations */ @@ -302,7 +302,7 @@ typedef enum VM_OC_SET__PROTO__, /**< set prototype when __proto__: form is used */ VM_OC_PUSH_STATIC_FIELD_FUNC, /**< push static field initializer function */ VM_OC_ADD_COMPUTED_FIELD, /**< add computed field name */ -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ VM_OC_NONE, /**< a special opcode for unsupported byte codes */ } vm_oc_types; @@ -311,18 +311,18 @@ typedef enum */ typedef enum { -#if !ENABLED (JERRY_ESNEXT) +#if !JERRY_ESNEXT VM_OC_EXP = VM_OC_NONE, /**< exponentiation */ VM_OC_BRANCH_IF_NULLISH = VM_OC_NONE, /** branch if undefined or null */ -#endif /* !ENABLED (JERRY_ESNEXT) */ -#if !ENABLED (JERRY_DEBUGGER) +#endif /* !JERRY_ESNEXT */ +#if !JERRY_DEBUGGER VM_OC_BREAKPOINT_ENABLED = VM_OC_NONE, /**< enabled breakpoint for debugger is unused */ VM_OC_BREAKPOINT_DISABLED = VM_OC_NONE, /**< disabled breakpoint for debugger is unused */ -#endif /* !ENABLED (JERRY_DEBUGGER) */ -#if !ENABLED (JERRY_LINE_INFO) +#endif /* !JERRY_DEBUGGER */ +#if !JERRY_LINE_INFO VM_OC_LINE = VM_OC_NONE, /**< line number of the next statement is unused */ -#endif /* !ENABLED (JERRY_LINE_INFO) */ -#if !ENABLED (JERRY_ESNEXT) +#endif /* !JERRY_LINE_INFO */ +#if !JERRY_ESNEXT VM_OC_EXT_VAR_EVAL = VM_OC_NONE, /**< variable and function evaluation for * functions with separate argument context */ VM_OC_CHECK_VAR = VM_OC_NONE, /**< check redeclared vars in the global scope */ @@ -389,7 +389,7 @@ typedef enum VM_OC_SET__PROTO__ = VM_OC_NONE, /**< set prototype when __proto__: form is used */ VM_OC_PUSH_STATIC_FIELD_FUNC = VM_OC_NONE, /**< push static field initializer function */ VM_OC_ADD_COMPUTED_FIELD = VM_OC_NONE, /**< add computed field name */ -#endif /* !ENABLED (JERRY_ESNEXT) */ +#endif /* !JERRY_ESNEXT */ VM_OC_UNUSED = VM_OC_NONE /**< placeholder if the list is empty */ } vm_oc_unused_types; @@ -479,9 +479,9 @@ typedef enum ecma_value_t vm_run_global (const ecma_compiled_code_t *bytecode_p); ecma_value_t vm_run_eval (ecma_compiled_code_t *bytecode_data_p, uint32_t parse_opts); -#if ENABLED (JERRY_MODULE_SYSTEM) +#if JERRY_MODULE_SYSTEM ecma_value_t vm_run_module (ecma_module_t *module_p); -#endif /* ENABLED (JERRY_MODULE_SYSTEM) */ +#endif /* JERRY_MODULE_SYSTEM */ ecma_value_t vm_run (vm_frame_ctx_shared_t *shared_p, ecma_value_t this_binding_value, ecma_object_t *lex_env_p); ecma_value_t vm_execute (vm_frame_ctx_t *frame_ctx_p); diff --git a/tests/unit-core/test-arraybuffer.c b/tests/unit-core/test-arraybuffer.c index c4be5c443..7b6717a65 100644 --- a/tests/unit-core/test-arraybuffer.c +++ b/tests/unit-core/test-arraybuffer.c @@ -312,13 +312,11 @@ main (void) /* Test ArrayBuffer external memory map/unmap */ { const uint32_t buffer_size = 20; - /* cppcheck-suppress variableScope */ JERRY_VLA (uint8_t, buffer_p, buffer_size); - { - jerry_value_t input_buffer = jerry_create_arraybuffer_external (buffer_size, buffer_p, NULL); - register_js_value ("input_buffer", input_buffer); - jerry_release_value (input_buffer); - } + + jerry_value_t input_buffer = jerry_create_arraybuffer_external (buffer_size, buffer_p, NULL); + register_js_value ("input_buffer", input_buffer); + jerry_release_value (input_buffer); const jerry_char_t eval_arraybuffer_src[] = TEST_STRING_LITERAL ( "var array = new Uint8Array(input_buffer);" diff --git a/tests/unit-core/test-to-length.c b/tests/unit-core/test-to-length.c index ed7cf240b..4b0094cc9 100644 --- a/tests/unit-core/test-to-length.c +++ b/tests/unit-core/test-to-length.c @@ -73,11 +73,11 @@ main (void) ecma_free_value (negative); TEST_ASSERT (!ECMA_IS_VALUE_ERROR (result)); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT TEST_ASSERT (num == 0); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ TEST_ASSERT (num == 4294967270); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* +infinity */ ecma_value_t positive_infinity = ecma_make_number_value (ecma_number_make_infinity (false)); @@ -87,11 +87,11 @@ main (void) ecma_free_value (positive_infinity); TEST_ASSERT (!ECMA_IS_VALUE_ERROR (result)); -#if ENABLED (JERRY_ESNEXT) +#if JERRY_ESNEXT TEST_ASSERT ((ecma_number_t) num == ECMA_NUMBER_MAX_SAFE_INTEGER); -#else /* !ENABLED (JERRY_ESNEXT) */ +#else /* !JERRY_ESNEXT */ TEST_ASSERT (num == 0); -#endif /* ENABLED (JERRY_ESNEXT) */ +#endif /* JERRY_ESNEXT */ /* -infinity */ ecma_value_t negative_infinity = ecma_make_number_value (ecma_number_make_infinity (true)); diff --git a/tools/check-cppcheck.sh b/tools/check-cppcheck.sh index bf92ebb97..bb3b08790 100755 --- a/tools/check-cppcheck.sh +++ b/tools/check-cppcheck.sh @@ -37,6 +37,8 @@ done cppcheck -j$CPPCHECK_JOBS --force \ --language=c --std=c99 \ --quiet \ + -D'JERRY_LIKELY(x)=(x)' \ + -D'JERRY_UNLIKELY(x)=(x)' \ --enable=warning,style,performance,portability,information \ --template="{file}:{line}: {severity}({id}): {message}" \ --error-exitcode=1 \ diff --git a/tools/cppcheck/suppressions-list b/tools/cppcheck/suppressions-list index 704648f8e..2d7bcca46 100644 --- a/tools/cppcheck/suppressions-list +++ b/tools/cppcheck/suppressions-list @@ -2,8 +2,4 @@ wrongmathcall:tests/unit-math/test-math.inc.h variableScope:jerry-math/*.c invalidPointerCast:jerry-math/*.c -ConfigurationNotChecked:jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h -ConfigurationNotChecked:jerry-core/ecma/builtin-objects/ecma-builtin-helpers-macro-defines.inc.h -ConfigurationNotChecked:jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.inc.h -ConfigurationNotChecked:jerry-core/ecma/builtin-objects/ecma-builtin-object.inc.h -ConfigurationNotChecked:jerry-core/ecma/builtin-objects/ecma-builtin-helpers-macro-undefs.inc.h +ConfigurationNotChecked:jerry-core/*.inc.h