archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2025-12-15 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Introducing ecma_compare_zt_string_to_zt_string interface that is __strcmp for ecma_char_t* zero-terminated strings.

Browse Source
This commit is contained in:
Ruben Ayrapetyan 2014-08-12 18:51:49 +04:00
parent 389d88bbb8
commit eee1daec91
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libcoreint/opcodes.c
View File

@ -137,12 +137,13 @@ free_string_literal_copy (string_literal_copy *str_lit_descr_p) /**< string lite
static bool
do_strict_eval_arguments_check (ecma_reference_t ref) /**< ECMA-reference */
{
FIXME (Replace strcmp with ecma_char_t[] comparator);
const ecma_char_t* magic_string_eval = ecma_get_magic_string (ECMA_MAGIC_STRING_EVAL);
const ecma_char_t* magic_string_arguments = ecma_get_magic_string (ECMA_MAGIC_STRING_ARGUMENTS);
return (ref.is_strict
&& (__strcmp ((char*) ref.referenced_name_p,
(char*) ecma_get_magic_string (ECMA_MAGIC_STRING_EVAL)) == 0
|| __strcmp ((char*) ref.referenced_name_p,
(char*) ecma_get_magic_string (ECMA_MAGIC_STRING_ARGUMENTS)) == 0)
&& (ecma_compare_zt_string_to_zt_string (ref.referenced_name_p,
magic_string_eval) == 0
|| ecma_compare_zt_string_to_zt_string (ref.referenced_name_p,
magic_string_arguments) == 0)
&& (ref.base.value_type == ECMA_TYPE_OBJECT)
&& (ECMA_GET_POINTER (ref.base.value) != NULL)
&& (((ecma_object_t*) ECMA_GET_POINTER (ref.base.value))->is_lexical_environment));

16
src/libecmaobjects/ecma-helpers.c
View File

@ -678,6 +678,22 @@ ecma_compare_ecma_string_to_ecma_string (const ecma_array_first_chunk_t *string1
return true;
} /* ecma_compare_ecma_string_to_ecma_string */
/**
* Compare zero-terminated string to zero-terminated string
*
* @return 0 - if strings are equal;
* -1 - if first string is lexicographically less than second;
* 1 - otherwise.
*/
int32_t
ecma_compare_zt_string_to_zt_string (const ecma_char_t *string1_p, /**< zero-terminated string */
const ecma_char_t *string2_p) /**< zero-terminated string */
{
TODO (Implement comparison that supports UTF-16);
return __strcmp ( (char*)string1_p, (char*)string2_p);
} /* ecma_compare_zt_string_to_zt_string */
/**
* Compare zero-terminated string to ecma-string
*

1
src/libecmaobjects/ecma-helpers.h
View File

@ -131,6 +131,7 @@ extern ssize_t ecma_copy_ecma_string_chars_to_buffer (ecma_array_first_chunk_t *
uint8_t *buffer_p,
size_t buffer_size);
extern ecma_array_first_chunk_t* ecma_duplicate_ecma_string (ecma_array_first_chunk_t *first_chunk_p);
extern int32_t ecma_compare_zt_string_to_zt_string (const ecma_char_t *string1_p, const ecma_char_t *string2_p);
extern bool ecma_compare_zt_string_to_ecma_string (const ecma_char_t *string_p,
const ecma_array_first_chunk_t *ecma_string_p);
extern bool ecma_compare_ecma_string_to_ecma_string (const ecma_array_first_chunk_t *string1_p,