archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2025-12-15 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix function skipping in preparse_scope: properly detect usage of 'function' keyword as property name.

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Andrey Shitov a.shitov@samsung.com
This commit is contained in:
Andrey Shitov 2015-07-10 14:41:08 +03:00
parent 7f1a7981b9
commit b3fa7d9765
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
jerry-core/parser/js/parser.cpp
View File

@ -2855,31 +2855,47 @@ parse_source_element (void)
}
}
static void
/**
* Skip function's optional name and parentheses
*
* @return: true, if skipped successfully
* false, if open parentheses wasn't found (this means that keyword 'function' is used as
* a property name)
*/
static bool
skip_optional_name_and_parens (void)
{
if (token_is (TOK_NAME))
{
token_after_newlines_must_be (TOK_OPEN_PAREN);
}
if (token_is (TOK_OPEN_PAREN))
{
skip_newlines ();
}
else
{
current_token_must_be (TOK_OPEN_PAREN);
return false;
}
while (!token_is (TOK_CLOSE_PAREN))
{
skip_newlines ();
}
}
return true;
} /* skip_optional_name_and_parens */
static void
skip_function (void)
{
skip_newlines ();
skip_optional_name_and_parens ();
skip_newlines ();
jsp_skip_braces (TOK_OPEN_BRACE);
if (skip_optional_name_and_parens ())
{
skip_newlines ();
jsp_skip_braces (TOK_OPEN_BRACE);
}
}
static bool