diff options
| -rw-r--r-- | js/console.ts | 5 | ||||
| -rw-r--r-- | js/libdeno.ts | 2 | ||||
| -rw-r--r-- | libdeno/binding.cc | 12 | ||||
| -rw-r--r-- | libdeno/libdeno_test.js | 2 |
4 files changed, 13 insertions, 8 deletions
diff --git a/js/console.ts b/js/console.ts index c4c36e7b2..00a24e83c 100644 --- a/js/console.ts +++ b/js/console.ts @@ -110,7 +110,7 @@ export function stringifyArgs(args: any[]): string { return out.join(" "); } -type PrintFunc = (x: string) => void; +type PrintFunc = (x: string, isErr?: boolean) => void; export class Console { constructor(private printFunc: PrintFunc) {} @@ -125,8 +125,7 @@ export class Console { // tslint:disable-next-line:no-any warn(...args: any[]): void { - // TODO Log to stderr. - this.printFunc(stringifyArgs(args)); + this.printFunc(stringifyArgs(args), true); } error = this.warn; diff --git a/js/libdeno.ts b/js/libdeno.ts index 142d779c2..8445a2d2b 100644 --- a/js/libdeno.ts +++ b/js/libdeno.ts @@ -8,7 +8,7 @@ interface Libdeno { send(msg: ArrayBufferView): null | Uint8Array; - print(x: string): void; + print(x: string, isErr?: boolean): void; setGlobalErrorHandler: ( handler: ( diff --git a/libdeno/binding.cc b/libdeno/binding.cc index bc155b6db..b3c59c3ec 100644 --- a/libdeno/binding.cc +++ b/libdeno/binding.cc @@ -141,13 +141,19 @@ void ExitOnPromiseRejectCallback( } void Print(const v8::FunctionCallbackInfo<v8::Value>& args) { - CHECK_EQ(args.Length(), 1); + CHECK_GE(args.Length(), 1); + CHECK_LE(args.Length(), 2); auto* isolate = args.GetIsolate(); + Deno* d = static_cast<Deno*>(isolate->GetData(0)); + auto context = d->context.Get(d->isolate); v8::HandleScope handle_scope(isolate); v8::String::Utf8Value str(isolate, args[0]); + bool is_err = + args.Length() >= 2 ? args[1]->BooleanValue(context).ToChecked() : false; const char* cstr = ToCString(str); - printf("%s\n", cstr); - fflush(stdout); + auto stream = is_err ? stderr : stdout; + fprintf(stream, "%s\n", cstr); + fflush(stream); } static v8::Local<v8::Uint8Array> ImportBuf(v8::Isolate* isolate, deno_buf buf) { diff --git a/libdeno/libdeno_test.js b/libdeno/libdeno_test.js index ec8e4c752..e0d1d7252 100644 --- a/libdeno/libdeno_test.js +++ b/libdeno/libdeno_test.js @@ -112,7 +112,7 @@ global.SnapshotBug = () => { global.GlobalErrorHandling = () => { libdeno.setGlobalErrorHandler((message, source, line, col, error) => { - libdeno.print(`line ${line} col ${col}`); + libdeno.print(`line ${line} col ${col}`, true); assert("ReferenceError: notdefined is not defined" === message); assert(source === "helloworld.js"); assert(line === 3); |