Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Provide console API in shell. #1103

Closed
wants to merge 10 commits into from
Closed

Provide console API in shell. #1103

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8f7acd0
Provide console API in shell.
MaxisTekfield Nov 28, 2021
8452ed6
Make console API available in embedding usage.
MaxisTekfield Nov 29, 2021
bd692bf
Change args of ConsolePrinter to Object[].
MaxisTekfield Dec 1, 2021
ae1b6a9
Use String in findPrototypeId.
MaxisTekfield Feb 27, 2022
ee7b110
Add console API into man page.
MaxisTekfield Mar 1, 2022
868d043
Pass stack to printer when running console.trace().
MaxisTekfield Mar 1, 2022
3e8d849
Process BigInt arguments in console API.
MaxisTekfield Mar 2, 2022
2d17de4
Convert to long when using %d and %i.
MaxisTekfield Mar 3, 2022
13192a2
Add tests for NativeConsole.
MaxisTekfield Mar 6, 2022
606e2c0
Add more tests.
MaxisTekfield Mar 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 71 additions & 37 deletions src/org/mozilla/javascript/NativeConsole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
package org.mozilla.javascript;

import java.io.Serializable;
import java.math.BigInteger;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
Expand Down Expand Up @@ -216,61 +217,94 @@ public static String format(Context cx, Scriptable scope, Object[] args) {
while (matcher.find()) {
String placeHolder = matcher.group();
String replaceArg;
switch (placeHolder) {
case "%%":
replaceArg = "%";
break;

case "%s":
replaceArg = ScriptRuntime.toString(args, argIndex);
break;

case "%d":
case "%i":
double number = ScriptRuntime.toNumber(args, argIndex);
if (Double.isInfinite(number) || Double.isNaN(number)) {
replaceArg = "0";
} else {
replaceArg = String.valueOf(((Double) number).intValue());
}
break;

case "%f":
replaceArg = String.valueOf(ScriptRuntime.toNumber(args, argIndex));
break;

case "%o":
case "%O":
replaceArg = formatObj(cx, scope, args, argIndex);
break;

default:
replaceArg = "";
break;
if (placeHolder.equals("%%")) {
replaceArg = "%";
} else if (argIndex >= args.length) {
replaceArg = placeHolder;
argIndex++;
} else {
Object val = args[argIndex];
switch (placeHolder) {
case "%s":
replaceArg = ScriptRuntime.toString(val);
break;

case "%d":
case "%i":
replaceArg = formatInt(val);
break;

case "%f":
replaceArg = formatFloat(val);
break;

case "%o":
case "%O":
replaceArg = formatObj(cx, scope, args, argIndex);
break;

default:
replaceArg = "";
break;
}
argIndex++;
}

argIndex++;
matcher.appendReplacement(buffer, Matcher.quoteReplacement(replaceArg));
}
matcher.appendTail(buffer);

return buffer.toString();
}

private static String formatObj(Context cx, Scriptable scope, Object[] args, int argIndex) {
if (argIndex >= args.length) {
return "";
private static String formatFloat(Object val) {
if (val instanceof BigInteger || val instanceof Symbol) {
return ScriptRuntime.NaNobj.toString();
}

return String.valueOf(ScriptRuntime.toNumber(val));
}

private static String formatInt(Object val) {
if (val instanceof BigInteger) {
return ScriptRuntime.bigIntToString((BigInteger) val, 10) + "n";
}

if (val instanceof Symbol) {
return ScriptRuntime.NaNobj.toString();
}

double number = ScriptRuntime.toNumber(val);

if (Double.isInfinite(number) || Double.isNaN(number)) {
return ScriptRuntime.toString(number);
}

return String.valueOf((int) number);
MaxisTekfield marked this conversation as resolved.
Show resolved Hide resolved
}

private static String formatObj(Context cx, Scriptable scope, Object[] args, int argIndex) {
Object arg = args[argIndex];
if (arg == null) {
return "null";
}
if (arg == Undefined.instance || arg == Undefined.SCRIPTABLE_UNDEFINED) {
return "undefined";

if (Undefined.isUndefined(arg)) {
return Undefined.SCRIPTABLE_UNDEFINED.toString();
}

return ScriptRuntime.toString(NativeJSON.stringify(cx, scope, arg, null, null));
try {
Object stringify = NativeJSON.stringify(cx, scope, arg, null, null);
return ScriptRuntime.toString(stringify);
} catch (EcmaError e) {
if ("TypeError".equals(e.getName())) {
// Fall back to use ScriptRuntime.toString() in some case such as
// NativeJSON.stringify not support BigInt yet.
return ScriptRuntime.toString(arg);
}
throw e;
}
}

private void jsAssert(Context cx, Scriptable scope, Object[] args) {
Expand Down