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

Move helpers from ecma-helpers-char.cpp to lit-char-helpers.cpp, rename them correspondingly.

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Ruben Ayrapetyan r.ayrapetyan@samsung.com
This commit is contained in:
Ruben Ayrapetyan
2015-06-30 21:17:01 +03:00
parent 017aa6b684
commit c37964f7a9
6 changed files with 66 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/parser/js/lexer.cpp
+16 -14
View File
@@ -18,7 +18,9 @@
#include "jrt-libc-includes.h"
#include "jsp-mm.h"
#include "lexer.h"
#include "lit-char-helpers.h"
#include "lit-magic-strings.h"
#include "lit-strings.h"
#include "syntax-errors.h"
static token saved_token, prev_token, sent_token, empty_token;
@@ -512,7 +514,7 @@ convert_string_to_token_transform_escape_seq (token_type tok_type, /**< type of
JERRY_ASSERT ((char_code & 0xF000u) == 0);
char_code = (uint16_t) (char_code << 4u);
char_code = (uint16_t) (char_code + ecma_char_hex_to_int (byte));
char_code = (uint16_t) (char_code + lit_char_hex_to_int (byte));
}
}
@@ -532,7 +534,7 @@ convert_string_to_token_transform_escape_seq (token_type tok_type, /**< type of
*/
converted_char = (ecma_char_t) char_code;
}
else if (ecma_char_is_line_terminator (escape_character))
else if (lit_char_is_line_terminator (escape_character))
{
if (source_str_iter_p + 1 <= source_str_p + source_str_size)
{
@@ -729,11 +731,11 @@ parse_number (void)
{
if (!is_overflow)
{
res = (res << 4) + ecma_char_hex_to_int (token_start[i]);
res = (res << 4) + lit_char_hex_to_int (token_start[i]);
}
else
{
fp_res = fp_res * 16 + (ecma_number_t) ecma_char_hex_to_int (token_start[i]);
fp_res = fp_res * 16 + (ecma_number_t) lit_char_hex_to_int (token_start[i]);
}
if (res > 255)
@@ -843,11 +845,11 @@ parse_number (void)
{
if (!is_overflow)
{
res = res * 8 + ecma_char_hex_to_int (token_start[i]);
res = res * 8 + lit_char_hex_to_int (token_start[i]);
}
else
{
fp_res = fp_res * 8 + (ecma_number_t) ecma_char_hex_to_int (token_start[i]);
fp_res = fp_res * 8 + (ecma_number_t) lit_char_hex_to_int (token_start[i]);
}
if (res > 255)
{
@@ -863,11 +865,11 @@ parse_number (void)
{
if (!is_overflow)
{
res = res * 10 + ecma_char_hex_to_int (token_start[i]);
res = res * 10 + lit_char_hex_to_int (token_start[i]);
}
else
{
fp_res = fp_res * 10 + (ecma_number_t) ecma_char_hex_to_int (token_start[i]);
fp_res = fp_res * 10 + (ecma_number_t) lit_char_hex_to_int (token_start[i]);
}
if (res > 255)
{
@@ -916,7 +918,7 @@ parse_string (void)
{
PARSE_ERROR ("Unclosed string", token_start - buffer_start);
}
else if (ecma_char_is_line_terminator (c))
else if (lit_char_is_line_terminator (c))
{
PARSE_ERROR ("String literal shall not contain newline character", token_start - buffer_start);
}
@@ -928,15 +930,15 @@ parse_string (void)
{
consume_char ();
}
else if (ecma_char_is_line_terminator (nc))
else if (lit_char_is_line_terminator (nc))
{
consume_char ();
if (ecma_char_is_carriage_return (nc))
if (lit_char_is_carriage_return (nc))
{
nc = (ecma_char_t) LA (0);
if (ecma_char_is_new_line (nc))
if (lit_char_is_new_line (nc))
{
consume_char ();
}
@@ -1009,8 +1011,8 @@ parse_regexp (void)
ecma_char_t c = (ecma_char_t) LA (0);
if (c == '\0'
|| !ecma_char_is_word_char (c)
|| ecma_char_is_line_terminator (c))
|| !lit_char_is_word_char (c)
|| lit_char_is_line_terminator (c))
{
break;
}
jerry-core/parser/regexp/re-parser.cpp
+3 -3
View File
@@ -16,9 +16,9 @@
#include "ecma-exceptions.h"
#include "ecma-globals.h"
#include "ecma-helpers.h"
#include "ecma-try-catch-macro.h"
#include "jrt-libc-includes.h"
#include "lit-char-helpers.h"
#include "re-parser.h"
#include "syntax-errors.h"
@@ -126,7 +126,7 @@ parse_re_iterator (lit_utf8_byte_t *pattern_p, /**< RegExp pattern */
return ret_value;
}
digits++;
qmin = qmin * 10 + ecma_char_hex_to_int (ch1);
qmin = qmin * 10 + lit_char_hex_to_int (ch1);
}
else if (ch1 == ',')
{
@@ -677,7 +677,7 @@ re_parse_next_token (re_parser_ctx_t *parser_ctx_p, /**< RegExp parser context *
{
break;
}
number = number * 10 + ecma_char_hex_to_int (digit);
number = number * 10 + lit_char_hex_to_int (digit);
index++;
}
while (true);