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

Conditional expression should be parsed as AssignmentExpression (#3610)

Browse Source 
This patch fixes #3553 and fixes #3608.

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
This commit is contained in:
Robert Fancsik
2020-03-16 14:44:39 +01:00
committed by GitHub
parent bfd2639634
commit 1a8276c493
3 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/parser/js/js-parser-expr.c
+11 -4
View File
@@ -2934,9 +2934,13 @@ parser_parse_initializer_by_next_char (parser_context_t *context_p, /**< context
/**
* Process ternary expression.
*
* @return true - continue with primary expression parsing
* false - otherwise
*/
static void
parser_process_ternary_expression (parser_context_t *context_p) /**< context */
static bool
parser_process_ternary_expression (parser_context_t *context_p, /**< context */
size_t grouping_level) /**< grouping level */
{
JERRY_ASSERT (context_p->token.type == LEXER_QUESTION_MARK);
@@ -2978,6 +2982,9 @@ parser_process_ternary_expression (parser_context_t *context_p) /**< context */
/* Last opcode rewrite is not allowed because
* the result may come from the first branch. */
parser_flush_cbc (context_p);
parser_process_binary_opcodes (context_p, 0);
return grouping_level >= PARSER_GROUPING_LEVEL_INCREASE;
} /* parser_process_ternary_expression */
/**
@@ -3122,9 +3129,9 @@ process_unary_expression:
}
if (JERRY_UNLIKELY (context_p->token.type == LEXER_QUESTION_MARK)
&& (grouping_level != PARSE_EXPR_LEFT_HAND_SIDE))
&& (grouping_level != PARSE_EXPR_LEFT_HAND_SIDE)
&& parser_process_ternary_expression (context_p, grouping_level))
{
parser_process_ternary_expression (context_p);
continue;
}
break;