Skip to content

Commit bf7fa39

Browse files
rerobikarerobika
authored
Rework export default parsing (#4505)
- Remove SCANNER_LITERAL_POOL_DEFAULT_CLASS_NAME workaround - Add async and generator function support - Fix auto semicolon insertion after export statement - fixes #4150. JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik [email protected]
1 parent 3e54840 commit bf7fa39

17 files changed

+387
-112
lines changed

‎jerry-core/parser/js/js-parser-statm.c

+25-2
Original file line numberDiff line numberDiff line change
@@ -2535,8 +2535,11 @@ parser_parse_import_statement (parser_context_t *context_p) /**< parser context
25352535

25362536
/**
25372537
* Parse export statement.
2538+
*
2539+
* @return true - if function of class statement was found
2540+
* false - otherwise
25382541
*/
2539-
static void
2542+
static bool
25402543
parser_parse_export_statement (parser_context_t *context_p) /**< context */
25412544
{
25422545
JERRY_ASSERT (context_p->token.type == LEXER_KEYW_EXPORT);
@@ -2545,6 +2548,8 @@ parser_parse_export_statement (parser_context_t *context_p) /**< context */
25452548

25462549
context_p->module_current_node_p = parser_module_create_module_node (context_p);
25472550

2551+
bool consume_last_statement = false;
2552+
25482553
lexer_next_token (context_p);
25492554
switch (context_p->token.type)
25502555
{
@@ -2556,15 +2561,26 @@ parser_parse_export_statement (parser_context_t *context_p) /**< context */
25562561
context_p->status_flags |= PARSER_MODULE_STORE_IDENT;
25572562

25582563
lexer_next_token (context_p);
2564+
2565+
if (context_p->token.type == LEXER_LITERAL
2566+
&& lexer_token_is_async (context_p)
2567+
&& context_p->next_scanner_info_p->source_p == context_p->source_p
2568+
&& context_p->next_scanner_info_p->type == SCANNER_TYPE_FUNCTION)
2569+
{
2570+
lexer_next_token (context_p);
2571+
}
2572+
25592573
if (context_p->token.type == LEXER_KEYW_CLASS)
25602574
{
25612575
context_p->status_flags |= PARSER_MODULE_DEFAULT_CLASS_OR_FUNC;
25622576
parser_parse_class (context_p, true);
2577+
consume_last_statement = true;
25632578
}
25642579
else if (context_p->token.type == LEXER_KEYW_FUNCTION)
25652580
{
25662581
context_p->status_flags |= PARSER_MODULE_DEFAULT_CLASS_OR_FUNC;
25672582
parser_parse_function_statement (context_p);
2583+
consume_last_statement = true;
25682584
}
25692585
else
25702586
{
@@ -2627,12 +2643,14 @@ parser_parse_export_statement (parser_context_t *context_p) /**< context */
26272643
{
26282644
context_p->status_flags |= PARSER_MODULE_STORE_IDENT;
26292645
parser_parse_class (context_p, true);
2646+
consume_last_statement = true;
26302647
break;
26312648
}
26322649
case LEXER_KEYW_FUNCTION:
26332650
{
26342651
context_p->status_flags |= PARSER_MODULE_STORE_IDENT;
26352652
parser_parse_function_statement (context_p);
2653+
consume_last_statement = true;
26362654
break;
26372655
}
26382656
case LEXER_LEFT_BRACE:
@@ -2656,6 +2674,8 @@ parser_parse_export_statement (parser_context_t *context_p) /**< context */
26562674
context_p->status_flags &= (uint32_t) ~(PARSER_MODULE_DEFAULT_CLASS_OR_FUNC | PARSER_MODULE_STORE_IDENT);
26572675
parser_module_finalize_export_node (context_p);
26582676
context_p->module_current_node_p = NULL;
2677+
2678+
return consume_last_statement;
26592679
} /* parser_parse_export_statement */
26602680
#endif /* ENABLED (JERRY_MODULE_SYSTEM) */
26612681

@@ -2948,7 +2968,10 @@ parser_parse_statements (parser_context_t *context_p) /**< context */
29482968

29492969
case LEXER_KEYW_EXPORT:
29502970
{
2951-
parser_parse_export_statement (context_p);
2971+
if (parser_parse_export_statement (context_p))
2972+
{
2973+
goto consume_last_statement;
2974+
}
29522975
break;
29532976
}
29542977
#endif /* ENABLED (JERRY_MODULE_SYSTEM) */

‎jerry-core/parser/js/js-scanner-internal.h

+3-5
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ typedef enum
119119
SCAN_STACK_FOR_START_PATTERN, /**< possible assignment pattern for "for" iterator */
120120
SCAN_STACK_USE_ASYNC, /**< an "async" identifier is used */
121121
#endif /* ENABLED (JERRY_ESNEXT) */
122+
#if ENABLED (JERRY_MODULE_SYSTEM)
123+
SCAN_STACK_EXPORT_DEFAULT, /**< scan primary expression after export default */
124+
#endif /* ENABLED (JERRY_MODULE_SYSTEM) */
122125
} scan_stack_modes_t;
123126

124127
/**
@@ -337,11 +340,6 @@ typedef enum
337340
#define SCANNER_LITERAL_POOL_MAY_HAVE_ARGUMENTS(status_flags) \
338341
(!((status_flags) & (SCANNER_LITERAL_POOL_CLASS_NAME | SCANNER_LITERAL_POOL_CLASS_FIELD)))
339342

340-
/**
341-
* The class name is the *default* class name
342-
*/
343-
#define SCANNER_LITERAL_POOL_DEFAULT_CLASS_NAME SCANNER_LITERAL_POOL_HAS_SUPER_REFERENCE
344-
345343
#else /* !ENABLED (JERRY_ESNEXT) */
346344

347345
/**

‎jerry-core/parser/js/js-scanner-util.c

+40-15
Original file line numberDiff line numberDiff line change
@@ -640,19 +640,6 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */
640640

641641
parser_list_iterator_init (&literal_pool_p->literal_pool, &literal_iterator);
642642

643-
#if ENABLED (JERRY_ESNEXT)
644-
if (JERRY_UNLIKELY (status_flags & SCANNER_LITERAL_POOL_CLASS_NAME))
645-
{
646-
literal_p = (lexer_lit_location_t *) parser_list_iterator_next (&literal_iterator);
647-
648-
if ((literal_p != NULL || (status_flags & SCANNER_LITERAL_POOL_DEFAULT_CLASS_NAME))
649-
&& no_declarations < PARSER_MAXIMUM_DEPTH_OF_SCOPE_STACK)
650-
{
651-
no_declarations++;
652-
}
653-
}
654-
#endif /* ENABLED (JERRY_ESNEXT) */
655-
656643
uint8_t arguments_stream_type = SCANNER_STREAM_TYPE_ARGUMENTS;
657644
const uint8_t *prev_source_p = literal_pool_p->source_p - 1;
658645
lexer_lit_location_t *last_argument_p = NULL;
@@ -1702,23 +1689,61 @@ scanner_push_class_declaration (parser_context_t *context_p, /**< context */
17021689
const uint8_t *source_p = context_p->source_p;
17031690
lexer_lit_location_t *literal_p = NULL;
17041691

1692+
#if ENABLED (JERRY_MODULE_SYSTEM)
1693+
bool is_export_default = context_p->stack_top_uint8 == SCAN_STACK_EXPORT_DEFAULT;
1694+
JERRY_ASSERT (!is_export_default || stack_mode == SCAN_STACK_CLASS_EXPRESSION);
1695+
#endif /* ENABLED (JERRY_MODULE_SYSTEM) */
1696+
17051697
parser_stack_push_uint8 (context_p, stack_mode);
17061698
lexer_next_token (context_p);
17071699

17081700
bool class_has_name = (context_p->token.type == LEXER_LITERAL
17091701
&& context_p->token.lit_location.type == LEXER_IDENT_LITERAL);
17101702

1711-
if (stack_mode == SCAN_STACK_CLASS_STATEMENT && class_has_name)
1703+
if (class_has_name)
17121704
{
1713-
literal_p = scanner_add_literal (context_p, scanner_context_p);
1705+
if (stack_mode == SCAN_STACK_CLASS_STATEMENT)
1706+
{
1707+
literal_p = scanner_add_literal (context_p, scanner_context_p);
1708+
scanner_context_p->active_literal_pool_p->no_declarations++;
1709+
}
1710+
#if ENABLED (JERRY_MODULE_SYSTEM)
1711+
else if (is_export_default)
1712+
{
1713+
literal_p = scanner_add_literal (context_p, scanner_context_p);
1714+
scanner_context_p->active_literal_pool_p->no_declarations++;
1715+
1716+
scanner_detect_invalid_let (context_p, literal_p);
1717+
1718+
if (literal_p->type & SCANNER_LITERAL_IS_USED)
1719+
{
1720+
literal_p->type |= SCANNER_LITERAL_EARLY_CREATE;
1721+
}
1722+
1723+
literal_p->type |= SCANNER_LITERAL_IS_LET | SCANNER_LITERAL_NO_REG;
1724+
}
1725+
#endif /* ENABLED (JERRY_MODULE_SYSTEM) */
17141726
}
17151727

17161728
scanner_literal_pool_t *literal_pool_p = scanner_push_literal_pool (context_p, scanner_context_p, 0);
17171729

17181730
if (class_has_name)
17191731
{
17201732
scanner_add_literal (context_p, scanner_context_p);
1733+
scanner_context_p->active_literal_pool_p->no_declarations++;
17211734
}
1735+
#if ENABLED (JERRY_MODULE_SYSTEM)
1736+
else if (is_export_default)
1737+
{
1738+
lexer_lit_location_t *name_literal_p;
1739+
name_literal_p = scanner_add_custom_literal (context_p,
1740+
scanner_context_p->active_literal_pool_p->prev_p,
1741+
&lexer_default_literal);
1742+
1743+
name_literal_p->type |= SCANNER_LITERAL_IS_LET | SCANNER_LITERAL_NO_REG;
1744+
scanner_context_p->active_literal_pool_p->no_declarations++;
1745+
}
1746+
#endif /* ENABLED (JERRY_MODULE_SYSTEM) */
17221747

17231748
literal_pool_p->source_p = source_p;
17241749
literal_pool_p->status_flags |= SCANNER_LITERAL_POOL_CLASS_NAME;

‎jerry-core/parser/js/js-scanner.c

+71-78
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */
101101
case LEXER_KEYW_FUNCTION:
102102
{
103103
uint16_t status_flags = SCANNER_LITERAL_POOL_FUNCTION;
104+
#if ENABLED (JERRY_MODULE_SYSTEM)
105+
bool is_export_default = stack_top == SCAN_STACK_EXPORT_DEFAULT;
106+
#endif /* ENABLED (JERRY_MODULE_SYSTEM) */
104107

105108
#if ENABLED (JERRY_ESNEXT)
106109
if (scanner_context_p->async_source_p != NULL)
@@ -121,8 +124,30 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */
121124
if (context_p->token.type == LEXER_LITERAL
122125
&& context_p->token.lit_location.type == LEXER_IDENT_LITERAL)
123126
{
127+
#if ENABLED (JERRY_MODULE_SYSTEM)
128+
if (is_export_default)
129+
{
130+
lexer_lit_location_t *location_p;
131+
location_p = scanner_add_custom_literal (context_p,
132+
scanner_context_p->active_literal_pool_p->prev_p,
133+
&context_p->token.lit_location);
134+
135+
scanner_detect_invalid_let (context_p, location_p);
136+
location_p->type |= SCANNER_LITERAL_IS_FUNC | SCANNER_LITERAL_IS_LET;
137+
}
138+
#endif /* ENABLED (JERRY_MODULE_SYSTEM) */
124139
lexer_next_token (context_p);
125140
}
141+
#if ENABLED (JERRY_MODULE_SYSTEM)
142+
else if (is_export_default)
143+
{
144+
lexer_lit_location_t *location_p;
145+
location_p = scanner_add_custom_literal (context_p,
146+
scanner_context_p->active_literal_pool_p->prev_p,
147+
&lexer_default_literal);
148+
location_p->type |= SCANNER_LITERAL_IS_FUNC | SCANNER_LITERAL_IS_LET;
149+
}
150+
#endif /* ENABLED (JERRY_MODULE_SYSTEM) */
126151

127152
parser_stack_push_uint8 (context_p, SCAN_STACK_FUNCTION_EXPRESSION);
128153
scanner_context_p->mode = SCAN_MODE_FUNCTION_ARGUMENTS;
@@ -179,7 +204,8 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */
179204
scanner_scan_simple_arrow (context_p, scanner_context_p, source_p);
180205
return SCAN_KEEP_TOKEN;
181206
}
182-
else if (JERRY_UNLIKELY (lexer_token_is_async (context_p)))
207+
208+
if (JERRY_UNLIKELY (lexer_token_is_async (context_p)))
183209
{
184210
scanner_context_p->async_source_p = source_p;
185211
scanner_check_async_function (context_p, scanner_context_p);
@@ -189,6 +215,17 @@ scanner_scan_primary_expression (parser_context_t *context_p, /**< context */
189215

190216
if (context_p->token.lit_location.type == LEXER_IDENT_LITERAL)
191217
{
218+
#if ENABLED (JERRY_MODULE_SYSTEM)
219+
if (stack_top == SCAN_STACK_EXPORT_DEFAULT)
220+
{
221+
lexer_lit_location_t *location_p = scanner_add_literal (context_p, scanner_context_p);
222+
location_p->type |= (SCANNER_LITERAL_IS_USED | SCANNER_LITERAL_IS_VAR);
223+
scanner_detect_eval_call (context_p, scanner_context_p);
224+
scanner_context_p->mode = SCAN_MODE_POST_PRIMARY_EXPRESSION;
225+
break;
226+
}
227+
#endif /* ENABLED (JERRY_MODULE_SYSTEM) */
228+
192229
scanner_add_reference (context_p, scanner_context_p);
193230
}
194231
/* FALLTHRU */
@@ -1804,84 +1841,9 @@ scanner_scan_statement (parser_context_t *context_p, /**< context */
18041841
if (context_p->token.type == LEXER_KEYW_DEFAULT)
18051842
{
18061843
lexer_next_token (context_p);
1807-
1808-
if (context_p->token.type == LEXER_KEYW_FUNCTION)
1809-
{
1810-
lexer_next_token (context_p);
1811-
if (context_p->token.type == LEXER_LITERAL
1812-
&& context_p->token.lit_location.type == LEXER_IDENT_LITERAL)
1813-
{
1814-
lexer_lit_location_t *location_p = scanner_add_literal (context_p, scanner_context_p);
1815-
1816-
if (location_p->type & SCANNER_LITERAL_IS_LOCAL
1817-
&& !(location_p->type & SCANNER_LITERAL_IS_FUNC))
1818-
{
1819-
scanner_raise_redeclaration_error (context_p);
1820-
}
1821-
location_p->type |= SCANNER_LITERAL_IS_FUNC | SCANNER_LITERAL_IS_LET;
1822-
1823-
lexer_next_token (context_p);
1824-
}
1825-
else
1826-
{
1827-
lexer_lit_location_t *location_p;
1828-
location_p = scanner_add_custom_literal (context_p,
1829-
scanner_context_p->active_literal_pool_p,
1830-
&lexer_default_literal);
1831-
location_p->type |= SCANNER_LITERAL_IS_FUNC | SCANNER_LITERAL_IS_LET;
1832-
}
1833-
1834-
scanner_push_literal_pool (context_p, scanner_context_p, SCANNER_LITERAL_POOL_FUNCTION);
1835-
1836-
parser_stack_push_uint8 (context_p, SCAN_STACK_FUNCTION_STATEMENT);
1837-
scanner_context_p->mode = SCAN_MODE_FUNCTION_ARGUMENTS;
1838-
return SCAN_KEEP_TOKEN;
1839-
}
1840-
1841-
if (context_p->token.type == LEXER_KEYW_CLASS)
1842-
{
1843-
lexer_lit_location_t *literal_p;
1844-
literal_p = scanner_push_class_declaration (context_p, scanner_context_p, SCAN_STACK_CLASS_STATEMENT);
1845-
1846-
if (literal_p != NULL)
1847-
{
1848-
scanner_detect_invalid_let (context_p, literal_p);
1849-
1850-
if (literal_p->type & SCANNER_LITERAL_IS_USED)
1851-
{
1852-
literal_p->type |= SCANNER_LITERAL_EARLY_CREATE;
1853-
}
1854-
1855-
literal_p->type |= SCANNER_LITERAL_IS_LET | SCANNER_LITERAL_NO_REG;
1856-
return SCAN_NEXT_TOKEN;
1857-
}
1858-
1859-
literal_p = scanner_add_custom_literal (context_p,
1860-
scanner_context_p->active_literal_pool_p,
1861-
&lexer_default_literal);
1862-
1863-
literal_p->type |= SCANNER_LITERAL_IS_LET | SCANNER_LITERAL_NO_REG;
1864-
scanner_context_p->active_literal_pool_p->status_flags |= SCANNER_LITERAL_POOL_DEFAULT_CLASS_NAME;
1865-
return SCAN_KEEP_TOKEN;
1866-
}
1867-
1868-
/* Assignment expression. */
1869-
lexer_lit_location_t *location_p;
1870-
location_p = scanner_add_custom_literal (context_p,
1871-
scanner_context_p->active_literal_pool_p,
1872-
&lexer_default_literal);
1873-
location_p->type |= SCANNER_LITERAL_IS_VAR;
1844+
parser_stack_push_uint8 (context_p, SCAN_STACK_EXPORT_DEFAULT);
18741845
scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION;
1875-
1876-
if (context_p->token.type != LEXER_LITERAL || context_p->token.lit_location.type != LEXER_IDENT_LITERAL)
1877-
{
1878-
return SCAN_KEEP_TOKEN;
1879-
}
1880-
1881-
location_p = scanner_add_literal (context_p, scanner_context_p);
1882-
location_p->type |= SCANNER_LITERAL_IS_VAR;
1883-
scanner_context_p->mode = SCAN_MODE_POST_PRIMARY_EXPRESSION;
1884-
return SCAN_NEXT_TOKEN;
1846+
return SCAN_KEEP_TOKEN;
18851847
}
18861848

18871849
scanner_context_p->mode = SCAN_MODE_STATEMENT_END;
@@ -2152,6 +2114,16 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */
21522114

21532115
scanner_pop_literal_pool (context_p, scanner_context_p);
21542116
parser_stack_pop_uint8 (context_p);
2117+
2118+
#if ENABLED (JERRY_MODULE_SYSTEM)
2119+
if (context_p->stack_top_uint8 == SCAN_STACK_EXPORT_DEFAULT)
2120+
{
2121+
terminator_found = true;
2122+
parser_stack_pop_uint8 (context_p);
2123+
lexer_next_token (context_p);
2124+
continue;
2125+
}
2126+
#endif /* ENABLED (JERRY_MODULE_SYSTEM) */
21552127
return SCAN_NEXT_TOKEN;
21562128
}
21572129
case SCAN_STACK_FUNCTION_PROPERTY:
@@ -2306,6 +2278,17 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */
23062278
continue;
23072279
}
23082280
#endif /* ENABLED (JERRY_ESNEXT) */
2281+
#if ENABLED (JERRY_MODULE_SYSTEM)
2282+
case SCAN_STACK_EXPORT_DEFAULT:
2283+
{
2284+
parser_stack_pop_uint8 (context_p);
2285+
lexer_lit_location_t *location_p = scanner_add_custom_literal (context_p,
2286+
scanner_context_p->active_literal_pool_p,
2287+
&lexer_default_literal);
2288+
location_p->type |= SCANNER_LITERAL_IS_VAR;
2289+
continue;
2290+
}
2291+
#endif /* ENABLED (JERRY_MODULE_SYSTEM) */
23092292
default:
23102293
{
23112294
JERRY_ASSERT (context_p->stack_top_uint8 == SCAN_STACK_TRY_STATEMENT
@@ -2617,6 +2600,16 @@ scanner_scan_all (parser_context_t *context_p, /**< context */
26172600

26182601
scanner_context.mode = SCAN_MODE_POST_PRIMARY_EXPRESSION;
26192602
parser_stack_pop_uint8 (context_p);
2603+
2604+
#if ENABLED (JERRY_MODULE_SYSTEM)
2605+
if (context_p->stack_top_uint8 == SCAN_STACK_EXPORT_DEFAULT)
2606+
{
2607+
/* The token is kept to disallow consuming a semicolon after it. */
2608+
parser_stack_change_last_uint8 (context_p, SCAN_STACK_CLASS_STATEMENT);
2609+
scanner_context.mode = SCAN_MODE_STATEMENT_END;
2610+
continue;
2611+
}
2612+
#endif /* ENABLED (JERRY_MODULE_SYSTEM) */
26202613
break;
26212614
}
26222615

0 commit comments

Comments
 (0)