Skip to content

Commit 6066ae4

Browse files
Fix raise of syntax errors for unmatched braces.
Related issue: #43, #183 JerryScript-DCO-1.0-Signed-off-by: Ruben Ayrapetyan r.ayrapetyan@samsung.com
1 parent c603d10 commit 6066ae4

File tree

2 files changed

+69
-0
lines changed

2 files changed

+69
-0
lines changed

jerry-core/parser/js/lexer.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,6 +1218,19 @@ lexer_next_token (void)
12181218
goto end;
12191219
}
12201220

1221+
/**
1222+
* FIXME:
1223+
* The way to raise syntax errors for unexpected EOF
1224+
* should be reworked so that EOF would be checked by
1225+
* caller of the routine, and the following condition
1226+
* would be checked as assertion in the routine.
1227+
*/
1228+
if (prev_token.type == TOK_EOF
1229+
&& sent_token.type == TOK_EOF)
1230+
{
1231+
PARSE_ERROR ("Unexpected EOF", buffer - buffer_start);
1232+
}
1233+
12211234
prev_token = sent_token;
12221235
sent_token = lexer_next_token_private ();
12231236

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
// Copyright 2015 Samsung Electronics Co., Ltd.
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
function check_syntax_error (script)
16+
{
17+
try
18+
{
19+
eval (script);
20+
assert (false);
21+
}
22+
catch (e)
23+
{
24+
assert (e instanceof SyntaxError);
25+
}
26+
}
27+
28+
check_syntax_error ('{');
29+
check_syntax_error ('}');
30+
check_syntax_error ('[');
31+
check_syntax_error (']');
32+
check_syntax_error ('(');
33+
check_syntax_error (')');
34+
35+
check_syntax_error ('function f (');
36+
check_syntax_error ('function f ()');
37+
check_syntax_error ('function f () {');
38+
check_syntax_error ('function f () }');
39+
check_syntax_error ('function f ({) }');
40+
check_syntax_error ('function f { }');
41+
check_syntax_error ('function f {');
42+
check_syntax_error ('function f }');
43+
44+
check_syntax_error ('a = [[];');
45+
46+
check_syntax_error ('a = {;');
47+
check_syntax_error ('a = };');
48+
check_syntax_error ('a = {{};');
49+
50+
check_syntax_error ('a = {get q {} };');
51+
check_syntax_error ('a = {get q ( {} };');
52+
check_syntax_error ('a = {get q ) {} };');
53+
check_syntax_error ('a = {get q () };');
54+
check_syntax_error ('a = {get q () { };');
55+
check_syntax_error ('a = {get q () };');
56+
check_syntax_error ('a = {get q () { };');

0 commit comments

Comments
 (0)