Changeset 205328 in webkit

Timestamp:

Sep 1, 2016 6:01:29 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

jsc: provide printErr()
​https://bugs.webkit.org/show_bug.cgi?id=161513

Patch by JF Bastien <​jfbastien@apple.com> on 2016-09-01
Reviewed by Mark Lam.

• jsc.cpp:

(GlobalObject::finishCreation):
(printInternal): renamed from functionPrint, add error checking
(functionPrintStdOut): punt to printInternal
(functionPrintStdErr): punt to printInternal
(functionPrint): Deleted.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jsc.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-09-01  JF Bastien  <jfbastien@apple.com>
+
+        jsc: provide printErr()
+        https://bugs.webkit.org/show_bug.cgi?id=161513
+
+        Reviewed by Mark Lam.
+
+        * jsc.cpp:
+        (GlobalObject::finishCreation):
+        (printInternal): renamed from functionPrint, add error checking
+        (functionPrintStdOut): punt to printInternal
+        (functionPrintStdErr): punt to printInternal
+        (functionPrint): Deleted.
+
 2016-09-01  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/jsc.cpp

@@ -579 +579 @@
 static EncodedJSValue JSC_HOST_CALL functionGetHiddenValue(ExecState*);
 static EncodedJSValue JSC_HOST_CALL functionSetHiddenValue(ExecState*);
-static EncodedJSValue JSC_HOST_CALL functionPrint(ExecState*);
+static EncodedJSValue JSC_HOST_CALL functionPrintStdOut(ExecState*);
+static EncodedJSValue JSC_HOST_CALL functionPrintStdErr(ExecState*);
 static EncodedJSValue JSC_HOST_CALL functionDebug(ExecState*);
 static EncodedJSValue JSC_HOST_CALL functionDescribe(ExecState*);
@@ -780 +781 @@
         addFunction(vm, "describe", functionDescribe, 1);
         addFunction(vm, "describeArray", functionDescribeArray, 1);
-        addFunction(vm, "print", functionPrint, 1);
+        addFunction(vm, "print", functionPrintStdOut, 1);
+        addFunction(vm, "printErr", functionPrintStdErr, 1);
         addFunction(vm, "quit", functionQuit, 0);
         addFunction(vm, "abort", functionAbort, 0);
@@ -1153 +1155 @@
 
 
-EncodedJSValue JSC_HOST_CALL functionPrint(ExecState* exec)
+static EncodedJSValue printInternal(ExecState* exec, FILE* out)
 {
     if (test262AsyncTest) {
@@ -1164 +1166 @@
     for (unsigned i = 0; i < exec->argumentCount(); ++i) {
         if (i)
-            putchar(' ');
-
-        printf("%s", exec->uncheckedArgument(i).toString(exec)->view(exec).get().utf8().data());
-    }
-
-    putchar('\n');
-    fflush(stdout);
+            if (EOF == fputc(' ', out))
+                goto fail;
+
+        if (fprintf(out, "%s", exec->uncheckedArgument(i).toString(exec)->view(exec).get().utf8().data()) < 0)
+            goto fail;
+    }
+
+    fputc('\n', out);
+fail:
+    fflush(out);
     return JSValue::encode(jsUndefined());
 }
+
+EncodedJSValue JSC_HOST_CALL functionPrintStdOut(ExecState* exec) { return printInternal(exec, stdout); }
+EncodedJSValue JSC_HOST_CALL functionPrintStdErr(ExecState* exec) { return printInternal(exec, stderr); }
 
 #ifndef NDEBUG