提交 b0da07c2 编写于 作者: S sundar

8021773: print function as defined by jrunscript's init.js script is...

8021773: print function as defined by jrunscript's init.js script is incompatible with nashorn's definition
Reviewed-by: hannesw, lagergren
上级 7facfcba
...@@ -332,7 +332,7 @@ function streamClose(stream) { ...@@ -332,7 +332,7 @@ function streamClose(stream) {
* @param str input from which script is loaded and evaluated * @param str input from which script is loaded and evaluated
*/ */
if (typeof(load) == 'undefined') { if (typeof(load) == 'undefined') {
var load = function(str) { this.load = function(str) {
var stream = inStream(str); var stream = inStream(str);
var bstream = new BufferedInputStream(stream); var bstream = new BufferedInputStream(stream);
var reader = new BufferedReader(new InputStreamReader(bstream)); var reader = new BufferedReader(new InputStreamReader(bstream));
...@@ -712,7 +712,7 @@ if (typeof(exit) == 'undefined') { ...@@ -712,7 +712,7 @@ if (typeof(exit) == 'undefined') {
* @param exitCode integer code returned to OS shell. * @param exitCode integer code returned to OS shell.
* optional, defaults to 0 * optional, defaults to 0
*/ */
var exit = function (code) { this.exit = function (code) {
if (code) { if (code) {
java.lang.System.exit(code + 0); java.lang.System.exit(code + 0);
} else { } else {
...@@ -725,7 +725,7 @@ if (typeof(quit) == 'undefined') { ...@@ -725,7 +725,7 @@ if (typeof(quit) == 'undefined') {
/** /**
* synonym for exit * synonym for exit
*/ */
var quit = function (code) { this.quit = function (code) {
exit(code); exit(code);
} }
} }
...@@ -881,7 +881,7 @@ if (typeof(printf) == 'undefined') { ...@@ -881,7 +881,7 @@ if (typeof(printf) == 'undefined') {
* @param format string to format the rest of the print items * @param format string to format the rest of the print items
* @param args variadic argument list * @param args variadic argument list
*/ */
var printf = function (format, args/*, more args*/) { this.printf = function (format, args/*, more args*/) {
var array = java.lang.reflect.Array.newInstance(java.lang.Object, var array = java.lang.reflect.Array.newInstance(java.lang.Object,
arguments.length - 1); arguments.length - 1);
for (var i = 0; i < array.length; i++) { for (var i = 0; i < array.length; i++) {
...@@ -921,25 +921,7 @@ function read(prompt, multiline) { ...@@ -921,25 +921,7 @@ function read(prompt, multiline) {
} }
if (typeof(println) == 'undefined') { if (typeof(println) == 'undefined') {
var print = function(str, newline) { // just synonym to print
if (typeof(str) == 'undefined') { this.println = print;
str = 'undefined';
} else if (str == null) {
str = 'null';
}
if (!(out instanceof java.io.PrintWriter)) {
out = new java.io.PrintWriter(out);
}
out.print(String(str));
if (newline) {
out.print('\n');
}
out.flush();
}
var println = function(str) {
print(str, true);
};
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册