Merge branch 'master' into traceur

This commit is contained in:
Sebastian McKenzie 2015-01-04 20:26:41 +11:00
commit c8a404fb72
2 changed files with 11 additions and 14 deletions

View File

@ -3,9 +3,8 @@ var test = {
* Before bracket init
*/
["a"]: "1",
[( /*
* Inside bracket init
*/
"b"
)]: "2"
[/*
* Inside bracket init
*/
"b"]: "2"
}, ok = 42;

View File

@ -4,11 +4,10 @@ var test = {
*/
["a"]: "1",
[( /*
* Inside bracket init
*/
"b"
)]: "2",
[/*
* Inside bracket init
*/
"b"]: "2",
["c"
/*
@ -18,10 +17,9 @@ var test = {
// Before bracket, line comment
["d"]: "4",
[(
// Inside bracket, line comment
"e"
)]: "5",
[
// Inside bracket, line comment
"e"]: "5",
["f"
// After bracket, line comment