infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-14 04:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Lana Steuck 2016-08-25 22:36:15 +00:00
commit e536eb85bc
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java
View File

@ -172,7 +172,7 @@ public final class Main extends Shell {
final Consumer<String> evaluator = str -> {
// could be called from different thread (GUI), we need to handle Context set/reset
final Global _oldGlobal = Context.getGlobal();
final boolean _globalChanged = (oldGlobal != global);
final boolean _globalChanged = (_oldGlobal != global);
if (_globalChanged) {
Context.setGlobal(global);
}

2
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java
View File

@ -79,7 +79,7 @@ final class OptimisticTypesCalculator extends SimpleNodeVisitor {
@Override
public boolean enterPropertyNode(final PropertyNode propertyNode) {
if(propertyNode.getKeyName().equals(ScriptObject.PROTO_PROPERTY_NAME)) {
if(ScriptObject.PROTO_PROPERTY_NAME.equals(propertyNode.getKeyName())) {
tagNeverOptimistic(propertyNode.getValue());
}
return super.enterPropertyNode(propertyNode);

17
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Functions.properties
View File

@ -173,3 +173,20 @@ String.prototype.toUpperCase=returns a new string representing the calling strin
String.prototype.toLocaleUpperCase=returns a new string representing the calling string value converted to upper case according to any locale specific case mappings
String.prototype.trim=returns a new string representing the calling string with white space removed from both ends
Boolean.prototype.toString=returns string representation of specified Boolean object
Boolean.prototype.valueOf=returns the primitive value of the specified Boolean object
Number.prototype.toString=returns string representation of specified object in the specified radix
Number.prototype.toLocaleString=returns a string with a language sensitive representation of this number
Number.prototype.valueOf=returns the primitive value of the specified object
Number.prototype.toFixed=returns a string representing the number in decimal fixed-point notation
Number.prototype.toExponential=returns a string representing the number in decimal exponential notation
Number.prototype.toPrecision=returns a string representing the number to a specified precision in fixed-point or exponential notation