aboutsummaryrefslogtreecommitdiff
path: root/src/jdk/nashorn/internal/runtime/resources
diff options
context:
space:
mode:
authorsundar <none@none>2013-08-21 17:28:53 +0530
committersundar <none@none>2013-08-21 17:28:53 +0530
commitad0b7134c964c53194d2de0ce12a4173c23de8fa (patch)
treec1e686543b208eeeeb6529532f4eeebf02eea859 /src/jdk/nashorn/internal/runtime/resources
parent2970f8e4a3ad0776ef9c240cb5def70a2c3e2a18 (diff)
downloadnashorn-ad0b7134c964c53194d2de0ce12a4173c23de8fa.tar.gz
8023368: Instance __proto__ property should exist and be writable.
Reviewed-by: attila, hannesw
Diffstat (limited to 'src/jdk/nashorn/internal/runtime/resources')
-rw-r--r--src/jdk/nashorn/internal/runtime/resources/Messages.properties2
-rw-r--r--src/jdk/nashorn/internal/runtime/resources/Options.properties9
-rw-r--r--src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js2
3 files changed, 3 insertions, 10 deletions
diff --git a/src/jdk/nashorn/internal/runtime/resources/Messages.properties b/src/jdk/nashorn/internal/runtime/resources/Messages.properties
index dadde637..68f68c0a 100644
--- a/src/jdk/nashorn/internal/runtime/resources/Messages.properties
+++ b/src/jdk/nashorn/internal/runtime/resources/Messages.properties
@@ -94,6 +94,8 @@ type.error.cant.delete.property=Cannot delete property "{0}" of {1}
type.error.cant.redefine.property=Cannot redefine property "{0}" of {1}
type.error.property.not.writable="{0}" is not a writable property of {1}
type.error.object.non.extensible=Cannot add new property "{0}" to non-extensible {1}
+type.error.__proto__.set.non.extensible=Cannot set __proto__ of non-extensible {0}
+type.error.circular.__proto__.set=Cannot create__proto__ cycle for {0}
# miscellaneous
type.error.regex.cant.supply.flags=Cannot supply flags when constructing one RegExp from another
diff --git a/src/jdk/nashorn/internal/runtime/resources/Options.properties b/src/jdk/nashorn/internal/runtime/resources/Options.properties
index 452ae88c..e3510fa1 100644
--- a/src/jdk/nashorn/internal/runtime/resources/Options.properties
+++ b/src/jdk/nashorn/internal/runtime/resources/Options.properties
@@ -216,15 +216,6 @@ nashorn.option.no.typed.arrays = { \
default=false \
}
-nashorn.option.package = { \
- name="--package", \
- is_undocumented=true, \
- desc="Package to which generated .class files are added.", \
- params="<package>", \
- type=String, \
- default="" \
-}
-
nashorn.option.parse.only = { \
name="--parse-only", \
is_undocumented=true, \
diff --git a/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js b/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
index 8a9fcc7d..60bdc7b1 100644
--- a/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
+++ b/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
@@ -144,7 +144,7 @@ Object.defineProperty(Object.prototype, "__proto__", {
return Object.getPrototypeOf(this);
},
set: function(x) {
- throw new TypeError("__proto__ set not supported");
+ Object.setPrototypeOf(this, x);
}
});