Merge pull request #341 from pvginkel/invalid-config-block-delimiters

Fixed invalid configuration block delimiters.
This commit is contained in:
Brian Terlson 2015-06-29 11:58:17 -07:00
commit 1e80bf22f6
2 changed files with 4 additions and 4 deletions

View File

@ -1,11 +1,11 @@
// Copyright 2015 Microsoft Corporation. All rights reserved. // Copyright 2015 Microsoft Corporation. All rights reserved.
// This code is governed by the license found in the LICENSE file. // This code is governed by the license found in the LICENSE file.
/*-- /*---
description: Object properties are assigned to target in ascending index order, description: Object properties are assigned to target in ascending index order,
i.e. a later assignment to the same property overrides an earlier assignment. i.e. a later assignment to the same property overrides an earlier assignment.
es6id: 19.1.2.1 es6id: 19.1.2.1
--*/ ---*/
var target = {a: 1}; var target = {a: 1};
var result = Object.assign(target,{a:2},{a:"c"}); var result = Object.assign(target,{a:2},{a:"c"});

View File

@ -1,11 +1,11 @@
// Copyright 2015 Microsoft Corporation. All rights reserved. // Copyright 2015 Microsoft Corporation. All rights reserved.
// This code is governed by the license found in the LICENSE file. // This code is governed by the license found in the LICENSE file.
/*-- /*---
description: Number,Boolean,Symbol cannot have own enumerable properties, description: Number,Boolean,Symbol cannot have own enumerable properties,
So cannot be Assigned.Here result should be original object. So cannot be Assigned.Here result should be original object.
es6id: 19.1.2.1.5.c es6id: 19.1.2.1.5.c
--*/ ---*/
var target = new Object(); var target = new Object();
var result = Object.assign(target,123,true,Symbol('foo')); var result = Object.assign(target,123,true,Symbol('foo'));