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

Some minor fixes in parser: Do not warn on escape sequences. Allow 'new' operator without parens. Fix 'var' parsing in preparser. Fix a test.

Browse Source
This commit is contained in:
Ilmir Usmanov
2014-10-08 16:31:50 +04:00
parent f2760fdac6
commit c3f493c693
3 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libjsparser/lexer.c
+1 -1
View File
@@ -777,7 +777,7 @@ parse_string (void)
/* Only single escape character is allowed. */ /* Only single escape character is allowed. */
if (LA (1) == 'x' || LA (1) == 'u' || __isdigit (LA (1))) if (LA (1) == 'x' || LA (1) == 'u' || __isdigit (LA (1)))
{ {
PARSE_WARN ("Escape sequences are ignored yet", token_start - buffer_start); // PARSE_WARN ("Escape sequences are ignored yet", token_start - buffer_start);
consume_char (); consume_char ();
consume_char (); consume_char ();
continue; continue;
src/libjsparser/parser.c
+26 -9
View File
@@ -1327,13 +1327,30 @@ parse_member_expression (idx_t *this_arg)
parse_member_expression (this_arg); parse_member_expression (this_arg);
skip_newlines (); skip_newlines ();
if (this_arg) if (token_is (TOK_OPEN_PAREN))
{ {
parse_argument_list (AL_CONSTRUCT_EXPR, ID(1), *this_arg); // push obj if (this_arg)
{
parse_argument_list (AL_CONSTRUCT_EXPR, ID(1), *this_arg); // push obj
}
else
{
parse_argument_list (AL_CONSTRUCT_EXPR, ID(1), INVALID_VALUE); // push obj
}
} }
else else
{ {
parse_argument_list (AL_CONSTRUCT_EXPR, ID(1), INVALID_VALUE); // push obj lexer_save_token (TOK ());
STACK_PUSH (IDX, next_temp_name ());
if (this_arg)
{
DUMP_OPCODE_3 (construct_n, ID (1), ID (2), 1);
DUMP_OPCODE_3 (meta, OPCODE_META_TYPE_THIS_ARG, *this_arg, INVALID_VALUE);
}
else
{
DUMP_OPCODE_3 (construct_n, ID (1), ID (2), 0);
}
} }
STACK_SWAP (IDX); STACK_SWAP (IDX);
@@ -1631,9 +1648,9 @@ parse_unary_expression (void)
else if (is_keyword (KW_VOID)) else if (is_keyword (KW_VOID))
{ {
STACK_PUSH (IDX, next_temp_name ()); STACK_PUSH (IDX, next_temp_name ());
DUMP_OPCODE_3 (assignment, ID(1), OPCODE_ARG_TYPE_VARIABLE, ID (2)); NEXT (unary_expression);
DUMP_OPCODE_3 (assignment, ID(1), OPCODE_ARG_TYPE_SIMPLE, ECMA_SIMPLE_VALUE_UNDEFINED); DUMP_OPCODE_3 (assignment, ID(2), OPCODE_ARG_TYPE_VARIABLE, ID (1));
STACK_SWAP (IDX); DUMP_OPCODE_3 (assignment, ID(2), OPCODE_ARG_TYPE_SIMPLE, ECMA_SIMPLE_VALUE_UNDEFINED);
STACK_DROP (IDX, 1); STACK_DROP (IDX, 1);
break; break;
} }
@@ -3225,7 +3242,7 @@ parse_source_element (void)
} }
static void static void
skip_optional_name_and_braces (void) skip_optional_name_and_parens (void)
{ {
if (token_is (TOK_NAME)) if (token_is (TOK_NAME))
{ {
@@ -3236,7 +3253,7 @@ skip_optional_name_and_braces (void)
current_token_must_be (TOK_OPEN_PAREN); current_token_must_be (TOK_OPEN_PAREN);
} }
while (!token_is (TOK_CLOSE_BRACE)) while (!token_is (TOK_CLOSE_PAREN))
{ {
skip_newlines (); skip_newlines ();
} }
@@ -3272,7 +3289,7 @@ static void
skip_function (void) skip_function (void)
{ {
skip_newlines (); skip_newlines ();
skip_optional_name_and_braces (); skip_optional_name_and_parens ();
skip_newlines (); skip_newlines ();
skip_braces (); skip_braces ();
} }
tests/jerry-test-suite/08/08.04/08.04-002.js
+1 -1
View File
@@ -12,4 +12,4 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
assert("x\0a" < "x\0b") && ("x\0b" < "x\0c")); assert(("x\0a" < "x\0b") && ("x\0b" < "x\0c"));