author | twisti |
Wed, 11 Nov 2015 14:40:38 -1000 | |
changeset 34173 | 01bb07d23a5b |
parent 24778 | 2ff5d7041566 |
permissions | -rw-r--r-- |
18629
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
1 |
/* |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
2 |
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
24778
2ff5d7041566
8044638: Tidy up Nashorn codebase for code standards
attila
parents:
20929
diff
changeset
|
4 |
* |
18629
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
24778
2ff5d7041566
8044638: Tidy up Nashorn codebase for code standards
attila
parents:
20929
diff
changeset
|
8 |
* |
18629
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
13 |
* accompanied this code). |
24778
2ff5d7041566
8044638: Tidy up Nashorn codebase for code standards
attila
parents:
20929
diff
changeset
|
14 |
* |
18629
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
24778
2ff5d7041566
8044638: Tidy up Nashorn codebase for code standards
attila
parents:
20929
diff
changeset
|
18 |
* |
18629
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
21 |
* questions. |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
22 |
*/ |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
23 |
|
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
24 |
/** |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
25 |
* JDK-8019508: Comma handling in object literal parsing is wrong |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
26 |
* |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
27 |
* @test |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
28 |
* @run |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
29 |
*/ |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
30 |
|
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
31 |
function checkObjLiteral(str) { |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
32 |
try { |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
33 |
eval(str); |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
34 |
fail("SyntaxError expected for: " + str); |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
35 |
} catch (e) { |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
36 |
if (! (e instanceof SyntaxError)) { |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
37 |
fail("expected SyntaxError, got " + e); |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
38 |
} |
20929
f2bd18181940
8026167: Class cache/reuse of 'eval' scripts results in ClassCastException in some cases.
sundar
parents:
18629
diff
changeset
|
39 |
printError(e); |
18629
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
40 |
} |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
41 |
} |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
42 |
|
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
43 |
// only comma |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
44 |
checkObjLiteral("({,})"); |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
45 |
|
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
46 |
// starting with comma |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
47 |
checkObjLiteral("({, a:2 })"); |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
48 |
|
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
49 |
// consecutive commas |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
50 |
checkObjLiteral("({a:3,,})"); |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
51 |
|
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
52 |
// missing comma |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
53 |
checkObjLiteral("({a:3 b:2}"); |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
54 |
|
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
55 |
// single trailing comma is okay! |
6b0b6aab4280
8019508: Comma handling in object literal parsing is wrong
sundar
parents:
diff
changeset
|
56 |
var obj = { a: 3, }; |