Skip to content

Fix parse of simple for statement #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ruben-ayrapetyan merged 3 commits into from
Jun 25, 2015
Merged

Fix parse of simple for statement #237

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f174cf
Remove 'process_keyword_names' stage, as keyword literals now can be …
Jun 24, 2015
601f1ee
Introduce jsp_skip_braces function for skiping blocks, surrounded wit…
Jun 24, 2015
f849cc6
Fix parse of simple for statement.
Jun 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Introduce jsp_skip_braces function for skiping blocks, surrounded wit… 
…h braces.

JerryScript-DCO-1.0-Signed-off-by: Ruben Ayrapetyan [email protected]
  • Loading branch information
Ruben Ayrapetyan committed Jun 25, 2015
commit 601f1eea58ea281578d8b71fef25da2ad60f013b
125 changes: 56 additions & 69 deletions jerry-core/parser/js/parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ static void parse_statement (jsp_label_t *outermost_stmt_label_p);
static operand parse_assignment_expression (bool);
static void parse_source_element_list (bool);
static operand parse_argument_list (varg_list_type, operand, uint8_t *, operand *);
static void skip_braces (void);
static void skip_parens (void);

static bool
token_is (token_type tt)
Expand Down Expand Up @@ -173,6 +171,55 @@ is_strict_mode (void)
return scopes_tree_strict_mode (STACK_TOP (scopes));
}

/**
* Skip block, defined with braces of specified type
*
* Note:
* Missing corresponding brace is considered a syntax error
*
* Note:
* Opening brace of the block to skip should be set as current
* token when the routine is called
*/
static void
jsp_skip_braces (token_type brace_type) /**< type of the opening brace */
{
current_token_must_be (brace_type);

token_type closing_bracket_type;

if (brace_type == TOK_OPEN_PAREN)
{
closing_bracket_type = TOK_CLOSE_PAREN;
}
else if (brace_type == TOK_OPEN_BRACE)
{
closing_bracket_type = TOK_CLOSE_BRACE;
}
else
{
JERRY_ASSERT (brace_type == TOK_OPEN_SQUARE);
closing_bracket_type = TOK_CLOSE_SQUARE;
}

skip_newlines ();

while (!token_is (closing_bracket_type)
&& !token_is (TOK_EOF))
{
if (token_is (TOK_OPEN_PAREN)
|| token_is (TOK_OPEN_BRACE)
|| token_is (TOK_OPEN_SQUARE))
{
jsp_skip_braces (tok.type);
}

skip_newlines ();
}

current_token_must_be (closing_bracket_type);
} /* jsp_skip_braces */

/* property_name
: Identifier
| Keyword
Expand Down Expand Up @@ -1964,7 +2011,7 @@ parse_while_statement (jsp_label_t *outermost_stmt_label_p) /**< outermost (firs

token_after_newlines_must_be (TOK_OPEN_PAREN);
const locus cond_loc = tok.loc;
skip_parens ();
jsp_skip_braces (TOK_OPEN_PAREN);

dump_jump_to_end_for_rewrite ();

Expand Down Expand Up @@ -2020,7 +2067,7 @@ skip_case_clause_body (void)
{
if (token_is (TOK_OPEN_BRACE))
{
skip_braces ();
jsp_skip_braces (TOK_OPEN_BRACE);
}
skip_newlines ();
}
Expand Down Expand Up @@ -2565,73 +2612,13 @@ skip_optional_name_and_parens (void)
}
}

static void
skip_braces (void)
{
current_token_must_be (TOK_OPEN_BRACE);

uint8_t nesting_level = 1;
while (nesting_level > 0)
{
skip_newlines ();
if (token_is (TOK_OPEN_BRACE))
{
nesting_level++;
}
else if (token_is (TOK_CLOSE_BRACE))
{
nesting_level--;
}
}
}

static void
skip_function (void)
{
skip_newlines ();
skip_optional_name_and_parens ();
skip_newlines ();
skip_braces ();
}

static void
skip_squares (void)
{
current_token_must_be (TOK_OPEN_SQUARE);

uint8_t nesting_level = 1;
while (nesting_level > 0)
{
skip_newlines ();
if (token_is (TOK_OPEN_SQUARE))
{
nesting_level++;
}
else if (token_is (TOK_CLOSE_SQUARE))
{
nesting_level--;
}
}
}

static void
skip_parens (void)
{
current_token_must_be (TOK_OPEN_PAREN);

uint8_t nesting_level = 1;
while (nesting_level > 0)
{
skip_newlines ();
if (token_is (TOK_OPEN_PAREN))
{
nesting_level++;
}
else if (token_is (TOK_CLOSE_PAREN))
{
nesting_level--;
}
}
jsp_skip_braces (TOK_OPEN_BRACE);
}

static bool
Expand Down Expand Up @@ -2670,15 +2657,15 @@ preparse_var_decls (void)
}
else if (token_is (TOK_OPEN_BRACE))
{
skip_braces ();
jsp_skip_braces (TOK_OPEN_BRACE);
}
else if (token_is (TOK_OPEN_SQUARE))
{
skip_squares ();
jsp_skip_braces (TOK_OPEN_SQUARE);
}
else if (token_is (TOK_OPEN_PAREN))
{
skip_parens ();
jsp_skip_braces (TOK_OPEN_PAREN);
}
skip_token ();
}
Expand Down Expand Up @@ -2739,7 +2726,7 @@ preparse_scope (bool is_global)
}
else if (token_is (TOK_OPEN_BRACE))
{
skip_braces ();
jsp_skip_braces (TOK_OPEN_BRACE);
}
else
{
Expand Down