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

Fixes ENABLE_AMALGAM need FORCE set to ON when building with MSVC (#4392)

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Yonggang Luo luoyonggang@gmail.com
This commit is contained in:
Yonggang Luo
2021-01-16 15:44:55 +00:00
committed by GitHub
parent fd0ca7da69
commit fe3b0a8435
31 changed files with 171 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/parser/js/js-lexer.c
+7 -7
View File
@@ -1976,7 +1976,7 @@ lexer_check_next_characters (parser_context_t *context_p, /**< context */
*
* @return consumed character
*/
inline uint8_t JERRY_ATTR_ALWAYS_INLINE
extern inline uint8_t JERRY_ATTR_ALWAYS_INLINE
lexer_consume_next_character (parser_context_t *context_p) /**< context */
{
JERRY_ASSERT (context_p->source_p < context_p->source_end_p);
@@ -3662,7 +3662,7 @@ lexer_current_is_literal (parser_context_t *context_p, /**< context */
*
* @return true if "use strict" is found, false otherwise
*/
inline bool JERRY_ATTR_ALWAYS_INLINE
extern inline bool JERRY_ATTR_ALWAYS_INLINE
lexer_string_is_use_strict (parser_context_t *context_p) /**< context */
{
JERRY_ASSERT (context_p->token.type == LEXER_LITERAL
@@ -3678,7 +3678,7 @@ lexer_string_is_use_strict (parser_context_t *context_p) /**< context */
*
* @return true if the string is a directive, false otherwise
*/
inline bool JERRY_ATTR_ALWAYS_INLINE
extern inline bool JERRY_ATTR_ALWAYS_INLINE
lexer_string_is_directive (parser_context_t *context_p) /**< context */
{
return (context_p->token.type == LEXER_SEMICOLON
@@ -3701,7 +3701,7 @@ lexer_string_is_directive (parser_context_t *context_p) /**< context */
*
* @return true if they are the same, false otherwise
*/
inline bool JERRY_ATTR_ALWAYS_INLINE
extern inline bool JERRY_ATTR_ALWAYS_INLINE
lexer_token_is_identifier (parser_context_t *context_p, /**< context */
const char *identifier_p, /**< identifier */
size_t identifier_length) /**< identifier length */
@@ -3721,7 +3721,7 @@ lexer_token_is_identifier (parser_context_t *context_p, /**< context */
*
* @return true if "let" is found, false otherwise
*/
inline bool JERRY_ATTR_ALWAYS_INLINE
extern inline bool JERRY_ATTR_ALWAYS_INLINE
lexer_token_is_let (parser_context_t *context_p) /**< context */
{
JERRY_ASSERT (context_p->token.type == LEXER_LITERAL);
@@ -3738,7 +3738,7 @@ lexer_token_is_let (parser_context_t *context_p) /**< context */
*
* @return true if "async" is found, false otherwise
*/
inline bool JERRY_ATTR_ALWAYS_INLINE
extern inline bool JERRY_ATTR_ALWAYS_INLINE
lexer_token_is_async (parser_context_t *context_p) /**< context */
{
JERRY_ASSERT (context_p->token.type == LEXER_LITERAL
@@ -3758,7 +3758,7 @@ lexer_token_is_async (parser_context_t *context_p) /**< context */
*
* @return true if they are the same, false otherwise
*/
inline bool JERRY_ATTR_ALWAYS_INLINE
extern inline bool JERRY_ATTR_ALWAYS_INLINE
lexer_compare_literal_to_string (parser_context_t *context_p, /**< context */
const char *string_p, /**< string */
size_t string_length) /**< string length */
jerry-core/parser/js/js-parser-mem.c
+4 -4
View File
@@ -52,7 +52,7 @@ parser_malloc (parser_context_t *context_p, /**< context */
/**
* Free memory allocated by parser_malloc.
*/
inline void JERRY_ATTR_ALWAYS_INLINE
extern inline void JERRY_ATTR_ALWAYS_INLINE
parser_free (void *ptr, /**< pointer to free */
size_t size) /**< size of the memory block */
{
@@ -92,7 +92,7 @@ parser_free_local (void *ptr, /**< pointer to free */
/**
* Free the dynamically allocated buffer stored in the context
*/
inline void JERRY_ATTR_ALWAYS_INLINE
extern inline void JERRY_ATTR_ALWAYS_INLINE
parser_free_allocated_buffer (parser_context_t *context_p) /**< context */
{
if (context_p->u.allocated_buffer_p != NULL)
@@ -644,7 +644,7 @@ parser_stack_pop (parser_context_t *context_p, /**< context */
/**
* Initialize stack iterator.
*/
inline void
extern inline void
parser_stack_iterator_init (parser_context_t *context_p, /**< context */
parser_stack_iterator_t *iterator) /**< iterator */
{
@@ -657,7 +657,7 @@ parser_stack_iterator_init (parser_context_t *context_p, /**< context */
*
* @return byte
*/
inline uint8_t
extern inline uint8_t
parser_stack_iterator_read_uint8 (parser_stack_iterator_t *iterator) /**< iterator */
{
JERRY_ASSERT (iterator->current_position > 0 && iterator->current_position <= PARSER_STACK_PAGE_SIZE);
jerry-core/parser/js/js-scanner-util.c
+10 -10
View File
@@ -115,7 +115,7 @@ scanner_malloc (parser_context_t *context_p, /**< context */
/**
* Free memory allocated by scanner_malloc.
*/
inline void JERRY_ATTR_ALWAYS_INLINE
extern inline void JERRY_ATTR_ALWAYS_INLINE
scanner_free (void *ptr, /**< pointer to free */
size_t size) /**< size of the memory block */
{
@@ -268,7 +268,7 @@ scanner_insert_info_before (parser_context_t *context_p, /**< context */
/**
* Release the next scanner info.
*/
inline void JERRY_ATTR_ALWAYS_INLINE
extern inline void JERRY_ATTR_ALWAYS_INLINE
scanner_release_next (parser_context_t *context_p, /**< context */
size_t size) /**< size of the memory block */
{
@@ -281,7 +281,7 @@ scanner_release_next (parser_context_t *context_p, /**< context */
/**
* Set the active scanner info to the next scanner info.
*/
inline void JERRY_ATTR_ALWAYS_INLINE
extern inline void JERRY_ATTR_ALWAYS_INLINE
scanner_set_active (parser_context_t *context_p) /**< context */
{
scanner_info_t *scanner_info_p = context_p->next_scanner_info_p;
@@ -294,7 +294,7 @@ scanner_set_active (parser_context_t *context_p) /**< context */
/**
* Set the next scanner info to the active scanner info.
*/
inline void JERRY_ATTR_ALWAYS_INLINE
extern inline void JERRY_ATTR_ALWAYS_INLINE
scanner_revert_active (parser_context_t *context_p) /**< context */
{
scanner_info_t *scanner_info_p = context_p->active_scanner_info_p;
@@ -307,7 +307,7 @@ scanner_revert_active (parser_context_t *context_p) /**< context */
/**
* Release the active scanner info.
*/
inline void JERRY_ATTR_ALWAYS_INLINE
extern inline void JERRY_ATTR_ALWAYS_INLINE
scanner_release_active (parser_context_t *context_p, /**< context */
size_t size) /**< size of the memory block */
{
@@ -1453,7 +1453,7 @@ scanner_add_custom_literal (parser_context_t *context_p, /**< context */
*
* @return pointer to the literal
*/
inline lexer_lit_location_t * JERRY_ATTR_ALWAYS_INLINE
extern inline lexer_lit_location_t * JERRY_ATTR_ALWAYS_INLINE
scanner_add_literal (parser_context_t *context_p, /**< context */
scanner_context_t *scanner_context_p) /**< scanner context */
{
@@ -1468,7 +1468,7 @@ scanner_add_literal (parser_context_t *context_p, /**< context */
*
* @return pointer to the literal
*/
inline void JERRY_ATTR_ALWAYS_INLINE
extern inline void JERRY_ATTR_ALWAYS_INLINE
scanner_add_reference (parser_context_t *context_p, /**< context */
scanner_context_t *scanner_context_p) /**< scanner context */
{
@@ -2837,7 +2837,7 @@ scanner_create_variables (parser_context_t *context_p, /**< context */
/**
* Get location from context.
*/
inline void JERRY_ATTR_ALWAYS_INLINE
extern inline void JERRY_ATTR_ALWAYS_INLINE
scanner_get_location (scanner_location_t *location_p, /**< location */
parser_context_t *context_p) /**< context */
{
@@ -2849,7 +2849,7 @@ scanner_get_location (scanner_location_t *location_p, /**< location */
/**
* Set context location.
*/
inline void JERRY_ATTR_ALWAYS_INLINE
extern inline void JERRY_ATTR_ALWAYS_INLINE
scanner_set_location (parser_context_t *context_p, /**< context */
scanner_location_t *location_p) /**< location */
{
@@ -2861,7 +2861,7 @@ scanner_set_location (parser_context_t *context_p, /**< context */
/**
* Get the real map_to value.
*/
inline uint16_t JERRY_ATTR_ALWAYS_INLINE
extern inline uint16_t JERRY_ATTR_ALWAYS_INLINE
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);
jerry-core/parser/regexp/re-bytecode.c
+8 -8
View File
@@ -38,7 +38,7 @@ re_initialize_regexp_bytecode (re_compiler_ctx_t *re_ctx_p) /**< RegExp bytecode
re_ctx_p->bytecode_size = initial_size;
} /* re_initialize_regexp_bytecode */
inline uint32_t JERRY_ATTR_ALWAYS_INLINE
extern inline uint32_t JERRY_ATTR_ALWAYS_INLINE
re_bytecode_size (re_compiler_ctx_t *re_ctx_p) /**< RegExp bytecode context */
{
return (uint32_t) re_ctx_p->bytecode_size;
@@ -101,7 +101,7 @@ re_insert_byte (re_compiler_ctx_t *re_ctx_p, /**< RegExp bytecode context */
/**
* Get a single byte and icnrease bytecode position.
*/
inline uint8_t JERRY_ATTR_ALWAYS_INLINE
extern inline uint8_t JERRY_ATTR_ALWAYS_INLINE
re_get_byte (const uint8_t **bc_p) /**< pointer to bytecode start */
{
return *((*bc_p)++);
@@ -110,7 +110,7 @@ re_get_byte (const uint8_t **bc_p) /**< pointer to bytecode start */
/**
* Append a RegExp opcode
*/
inline void JERRY_ATTR_ALWAYS_INLINE
extern inline void JERRY_ATTR_ALWAYS_INLINE
re_append_opcode (re_compiler_ctx_t *re_ctx_p, /**< RegExp bytecode context */
const re_opcode_t opcode) /**< input opcode */
{
@@ -120,7 +120,7 @@ re_append_opcode (re_compiler_ctx_t *re_ctx_p, /**< RegExp bytecode context */
/**
* Insert a RegExp opcode
*/
inline void JERRY_ATTR_ALWAYS_INLINE
extern inline void JERRY_ATTR_ALWAYS_INLINE
re_insert_opcode (re_compiler_ctx_t *re_ctx_p, /**< RegExp bytecode context */
const uint32_t offset, /**< distance from the start of the container */
const re_opcode_t opcode) /**< input opcode */
@@ -133,7 +133,7 @@ re_insert_opcode (re_compiler_ctx_t *re_ctx_p, /**< RegExp bytecode context */
*
* @return current RegExp opcode
*/
inline re_opcode_t JERRY_ATTR_ALWAYS_INLINE
extern inline re_opcode_t JERRY_ATTR_ALWAYS_INLINE
re_get_opcode (const uint8_t **bc_p) /**< pointer to bytecode start */
{
return (re_opcode_t) re_get_byte (bc_p);
@@ -196,7 +196,7 @@ re_decode_u32 (const uint8_t *src_p) /**< source */
*
* @return encoded value size
*/
inline static size_t JERRY_ATTR_ALWAYS_INLINE
static inline size_t JERRY_ATTR_ALWAYS_INLINE
re_get_encoded_value_size (uint32_t value) /**< value */
{
if (JERRY_LIKELY (value <= RE_VALUE_1BYTE_MAX))
@@ -254,7 +254,7 @@ re_insert_value (re_compiler_ctx_t *re_ctx_p, /**< RegExp bytecode context */
*
* @return decoded value
*/
inline uint32_t JERRY_ATTR_ALWAYS_INLINE
extern inline uint32_t JERRY_ATTR_ALWAYS_INLINE
re_get_value (const uint8_t **bc_p) /** refence to bytecode pointer */
{
uint32_t value = *(*bc_p)++;
@@ -330,7 +330,7 @@ re_insert_char (re_compiler_ctx_t *re_ctx_p, /**< RegExp bytecode context */
*
* @return decoded character
*/
inline lit_code_point_t JERRY_ATTR_ALWAYS_INLINE
extern inline lit_code_point_t JERRY_ATTR_ALWAYS_INLINE
re_get_char (const uint8_t **bc_p, /**< reference to bytecode pointer */
bool unicode) /**< full unicode mode */
{