YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename internal lit identifiers (#1801)

Browse Source 
We should keep the `jerry_` prefix for public API which is either
declared in jerry-core/include or implemented in jerry-core/api.
Moreover, we should also keep the convention to use short
identifiers for componentization within jerry-core, and use these
identifiers as directory names, file name prefixes, and identifier
prefixes.

Therefore, the tools/gen-unicode.py-generated arrays in
jerry-core/lit are renamed to use `lit_` prefix instead of `jerry_`.

JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu
This commit is contained in:
Akos Kiss
2017-05-16 10:34:41 +02:00
committed by GitHub
parent 7837440cbb
commit 31cd3b8020
4 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/lit/lit-char-helpers.c
+39 -39
View File
@@ -136,11 +136,11 @@ lit_char_is_white_space (ecma_char_t c) /**< code unit */
{
return (c == LIT_CHAR_NBSP
|| c == LIT_CHAR_BOM
|| (c >= jerry_unicode_separator_char_interval_sps[0]
&& c <= jerry_unicode_separator_char_interval_sps[0] + jerry_unicode_separator_char_interval_lengths[0])
|| (c >= lit_unicode_separator_char_interval_sps[0]
&& c <= lit_unicode_separator_char_interval_sps[0] + lit_unicode_separator_char_interval_lengths[0])
|| search_char_in_char_array (c,
jerry_unicode_separator_chars,
NUM_OF_ELEMENTS (jerry_unicode_separator_chars)));
lit_unicode_separator_chars,
NUM_OF_ELEMENTS (lit_unicode_separator_chars)));
}
} /* lit_char_is_white_space */
@@ -181,10 +181,10 @@ static bool
lit_char_is_unicode_letter (ecma_char_t c) /**< code unit */
{
return (search_char_in_interval_array (c,
jerry_unicode_letter_interval_sps,
jerry_unicode_letter_interval_lengths,
NUM_OF_ELEMENTS (jerry_unicode_letter_interval_sps))
|| search_char_in_char_array (c, jerry_unicode_letter_chars, NUM_OF_ELEMENTS (jerry_unicode_letter_chars)));
lit_unicode_letter_interval_sps,
lit_unicode_letter_interval_lengths,
NUM_OF_ELEMENTS (lit_unicode_letter_interval_sps))
|| search_char_in_char_array (c, lit_unicode_letter_chars, NUM_OF_ELEMENTS (lit_unicode_letter_chars)));
} /* lit_char_is_unicode_letter */
/**
@@ -205,12 +205,12 @@ static bool
lit_char_is_unicode_non_letter_ident_part (ecma_char_t c) /**< code unit */
{
return (search_char_in_interval_array (c,
jerry_unicode_non_letter_ident_part_interval_sps,
jerry_unicode_non_letter_ident_part_interval_lengths,
NUM_OF_ELEMENTS (jerry_unicode_non_letter_ident_part_interval_sps))
lit_unicode_non_letter_ident_part_interval_sps,
lit_unicode_non_letter_ident_part_interval_lengths,
NUM_OF_ELEMENTS (lit_unicode_non_letter_ident_part_interval_sps))
|| search_char_in_char_array (c,
jerry_unicode_non_letter_ident_part_chars,
NUM_OF_ELEMENTS (jerry_unicode_non_letter_ident_part_chars)));
lit_unicode_non_letter_ident_part_chars,
NUM_OF_ELEMENTS (lit_unicode_non_letter_ident_part_chars)));
} /* lit_char_is_unicode_non_letter_ident_part */
/**
@@ -481,8 +481,8 @@ search_in_bidirectional_conversion_tables (ecma_char_t character, /**< co
ecma_char_t *output_buffer_p, /**< [out] buffer for the result characters */
bool is_lowercase) /**< is lowercase conversion */
{
/* 1, Check if the specified character is part of the jerry_character_case_ranges table. */
int number_of_case_ranges = NUM_OF_ELEMENTS (jerry_character_case_ranges);
/* 1, Check if the specified character is part of the lit_character_case_ranges table. */
int number_of_case_ranges = NUM_OF_ELEMENTS (lit_character_case_ranges);
int conv_counter = 0;
for (int i = 0; i < number_of_case_ranges; i++)
@@ -492,8 +492,8 @@ search_in_bidirectional_conversion_tables (ecma_char_t character, /**< co
conv_counter++;
}
int range_length = jerry_character_case_range_lengths[conv_counter];
ecma_char_t start_point = jerry_character_case_ranges[i];
int range_length = lit_character_case_range_lengths[conv_counter];
ecma_char_t start_point = lit_character_case_ranges[i];
if (start_point > character || character >= start_point + range_length)
{
@@ -504,11 +504,11 @@ search_in_bidirectional_conversion_tables (ecma_char_t character, /**< co
if (i % 2 == 0)
{
output_buffer_p[0] = is_lowercase ? (ecma_char_t) (jerry_character_case_ranges[i + 1] + char_dist) : character;
output_buffer_p[0] = is_lowercase ? (ecma_char_t) (lit_character_case_ranges[i + 1] + char_dist) : character;
}
else
{
output_buffer_p[0] = is_lowercase ? character : (ecma_char_t) (jerry_character_case_ranges[i - 1] + char_dist);
output_buffer_p[0] = is_lowercase ? character : (ecma_char_t) (lit_character_case_ranges[i - 1] + char_dist);
}
return 1;
@@ -516,14 +516,14 @@ search_in_bidirectional_conversion_tables (ecma_char_t character, /**< co
/* 2, Check if the specified character is part of the character_pair_ranges table. */
int bottom = 0;
int top = NUM_OF_ELEMENTS (jerry_character_pair_ranges) - 1;
int top = NUM_OF_ELEMENTS (lit_character_pair_ranges) - 1;
while (bottom <= top)
{
int middle = (bottom + top) / 2;
ecma_char_t current_sp = jerry_character_pair_ranges[middle];
ecma_char_t current_sp = lit_character_pair_ranges[middle];
if (current_sp <= character && character < current_sp + jerry_character_pair_range_lengths[middle])
if (current_sp <= character && character < current_sp + lit_character_pair_range_lengths[middle])
{
int char_dist = character - current_sp;
@@ -550,22 +550,22 @@ search_in_bidirectional_conversion_tables (ecma_char_t character, /**< co
}
/* 3, Check if the specified character is part of the character_pairs table. */
int number_of_character_pairs = NUM_OF_ELEMENTS (jerry_character_pairs);
int number_of_character_pairs = NUM_OF_ELEMENTS (lit_character_pairs);
for (int i = 0; i < number_of_character_pairs; i++)
{
if (character != jerry_character_pairs[i])
if (character != lit_character_pairs[i])
{
continue;
}
if (i % 2 == 0)
{
output_buffer_p[0] = is_lowercase ? jerry_character_pairs[i + 1] : character;
output_buffer_p[0] = is_lowercase ? lit_character_pairs[i + 1] : character;
}
else
{
output_buffer_p[0] = is_lowercase ? character : jerry_character_pairs[i - 1];
output_buffer_p[0] = is_lowercase ? character : lit_character_pairs[i - 1];
}
return 1;
@@ -676,24 +676,24 @@ lit_char_to_lower_case (ecma_char_t character, /**< input character value */
return lowercase_sequence;
}
int num_of_lowercase_ranges = NUM_OF_ELEMENTS (jerry_lower_case_ranges);
int num_of_lowercase_ranges = NUM_OF_ELEMENTS (lit_lower_case_ranges);
for (int i = 0, j = 0; i < num_of_lowercase_ranges; i += 2, j++)
{
int range_length = jerry_lower_case_range_lengths[j] - 1;
ecma_char_t start_point = jerry_lower_case_ranges[i];
int range_length = lit_lower_case_range_lengths[j] - 1;
ecma_char_t start_point = lit_lower_case_ranges[i];
if (start_point <= character && character <= start_point + range_length)
{
output_buffer_p[0] = (ecma_char_t) (jerry_lower_case_ranges[i + 1] + (character - start_point));
output_buffer_p[0] = (ecma_char_t) (lit_lower_case_ranges[i + 1] + (character - start_point));
return 1;
}
}
lowercase_sequence = search_in_conversion_table (character,
output_buffer_p,
jerry_lower_case_conversions,
jerry_lower_case_conversion_counters);
lit_lower_case_conversions,
lit_lower_case_conversion_counters);
if (lowercase_sequence != 0)
{
@@ -736,25 +736,25 @@ lit_char_to_upper_case (ecma_char_t character, /**< input character value */
return uppercase_sequence;
}
int num_of_upper_case_special_ranges = NUM_OF_ELEMENTS (jerry_upper_case_special_ranges);
int num_of_upper_case_special_ranges = NUM_OF_ELEMENTS (lit_upper_case_special_ranges);
for (int i = 0, j = 0; i < num_of_upper_case_special_ranges; i += 3, j++)
{
int range_length = jerry_upper_case_special_range_lengths[j];
ecma_char_t start_point = jerry_upper_case_special_ranges[i];
int range_length = lit_upper_case_special_range_lengths[j];
ecma_char_t start_point = lit_upper_case_special_ranges[i];
if (start_point <= character && character <= start_point + range_length)
{
output_buffer_p[0] = (ecma_char_t) (jerry_upper_case_special_ranges[i + 1] + (character - start_point));
output_buffer_p[1] = (ecma_char_t) (jerry_upper_case_special_ranges[i + 2]);
output_buffer_p[0] = (ecma_char_t) (lit_upper_case_special_ranges[i + 1] + (character - start_point));
output_buffer_p[1] = (ecma_char_t) (lit_upper_case_special_ranges[i + 2]);
return 2;
}
}
uppercase_sequence = search_in_conversion_table (character,
output_buffer_p,
jerry_upper_case_conversions,
jerry_upper_case_conversion_counters);
lit_upper_case_conversions,
lit_upper_case_conversion_counters);
if (uppercase_sequence != 0)
{