hg: type-annotations/type-annotations/nashorn: 2 new changesets

[wdietl at gmail.com]

Changeset: b5ff11e00050
Author:    sundar
Date:      2013-09-04 14:29 +0530
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/b5ff11e00050

8024120: Setting __proto__ to null removes the __proto__ property
Reviewed-by: lagergren, attila

! src/jdk/nashorn/internal/runtime/ScriptObject.java
! src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
! test/script/basic/JDK-8023368.js
! test/script/basic/JDK-8023368.js.EXPECTED
+ test/script/basic/JDK-8024120.js
! test/script/basic/circular_proto.js
! test/script/basic/nonextensible_proto_assign.js

Changeset: e43ab4062636
Author:    sundar
Date:      2013-09-04 19:58 +0530
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/nashorn/rev/e43ab4062636

8024174: Setting __proto__ property in Object literal should be supported
Reviewed-by: jlaskey, lagergren

! src/jdk/nashorn/internal/codegen/CodeGenerator.java
! src/jdk/nashorn/internal/runtime/ScriptObject.java
+ test/script/basic/JDK-8024174.js