Changeset 283293 in webkit

Timestamp:

Sep 29, 2021, 6:39:22 PM (5 years ago)

Author:

sbarati@apple.com

Message:

Print values in a nicer way in the jsc shell
​https://bugs.webkit.org/show_bug.cgi?id=230931

Reviewed by Tadeu Zagallo.

JSTests:

• ChakraCore/test/jsc-lib.js:

Source/JavaScriptCore:

Currently, print(1), print("1"), and print([1]) all print to stdout
simply as "1" (without the quotes). Same for values when running the
REPL. This isn't super helpful. Let's print quotes for strings, and
brackets for arrays.

Some tests rely on the old print behavior. Those tests now use the legacyPrint
instead.

• jsc.cpp:

(toCString):
(printInternal):
(JSC_DEFINE_HOST_FUNCTION):
(runInteractive):
(cStringFromViewWithString): Deleted.

• runtime/JSCJSValue.cpp:

(JSC::JSValue::toWTFStringForConsole const):

• runtime/JSCJSValue.h:

LayoutTests:

• resources/standalone-pre.js:

Location:

trunk

Files:

• JSTests/ChakraCore/test/jsc-lib.js (modified) (1 diff)
• JSTests/ChangeLog (modified) (1 diff)
• JSTests/exceptionFuzz/3d-cube.js (modified) (1 diff)
• JSTests/exceptionFuzz/date-format-xparb.js (modified) (1 diff)
• JSTests/exceptionFuzz/earley-boyer.js (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/resources/standalone-pre.js (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/jsc.cpp (modified) (8 diffs)
• Source/JavaScriptCore/runtime/JSCJSValue.cpp (modified) (1 diff)
• Source/JavaScriptCore/runtime/JSCJSValue.h (modified) (1 diff)

trunk/JSTests/ChakraCore/test/jsc-lib.js

@@ +1 @@
+print = legacyPrint;
+
 WScript = {
     _jscGC: gc,

trunk/JSTests/ChangeLog

@@ +1 @@
+2021-09-29  Saam Barati  <sbarati@apple.com>
+
+        Print values in a nicer way in the jsc shell
+        https://bugs.webkit.org/show_bug.cgi?id=230931
+
+        Reviewed by Tadeu Zagallo.
+
+        * ChakraCore/test/jsc-lib.js:
+
 2021-09-29  Saam Barati  <sbarati@apple.com>
 

trunk/JSTests/exceptionFuzz/3d-cube.js

@@ -359 +359 @@
 })();
 } catch (e) {
-    print("JSC EXCEPTION FUZZ: Caught exception: " + e);
-}
+    legacyPrint("JSC EXCEPTION FUZZ: Caught exception: " + e);
+}

trunk/JSTests/exceptionFuzz/date-format-xparb.js

@@ -425 +425 @@
 })();
 } catch (e) {
-    print("JSC EXCEPTION FUZZ: Caught exception: " + e);
-}
+    legacyPrint("JSC EXCEPTION FUZZ: Caught exception: " + e);
+}

trunk/JSTests/exceptionFuzz/earley-boyer.js

@@ -4685 +4685 @@
 })();
 } catch (e) {
-    print("JSC EXCEPTION FUZZ: Caught exception: " + e);
-}
-
+    legacyPrint("JSC EXCEPTION FUZZ: Caught exception: " + e);
+}
+

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-09-29  Saam Barati  <sbarati@apple.com>
+
+        Print values in a nicer way in the jsc shell
+        https://bugs.webkit.org/show_bug.cgi?id=230931
+
+        Reviewed by Tadeu Zagallo.
+
+        * resources/standalone-pre.js:
+
 2021-09-29  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/resources/standalone-pre.js

@@ -13 +13 @@
 didPassSomeTestsSilently = false;
 didFailSomeTests = false;
+
+print = legacyPrint;
 
 function description(msg)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-09-29  Saam Barati  <sbarati@apple.com>
+
+        Print values in a nicer way in the jsc shell
+        https://bugs.webkit.org/show_bug.cgi?id=230931
+
+        Reviewed by Tadeu Zagallo.
+
+        Currently, print(1), print("1"), and print([1]) all print to stdout
+        simply as "1" (without the quotes). Same for values when running the
+        REPL. This isn't super helpful. Let's print quotes for strings, and
+        brackets for arrays.
+
+        Some tests rely on the old print behavior. Those tests now use the legacyPrint
+        instead.
+
+        * jsc.cpp:
+        (toCString):
+        (printInternal):
+        (JSC_DEFINE_HOST_FUNCTION):
+        (runInteractive):
+        (cStringFromViewWithString): Deleted.
+        * runtime/JSCJSValue.cpp:
+        (JSC::JSValue::toWTFStringForConsole const):
+        * runtime/JSCJSValue.h:
+
 2021-09-29  Saam Barati  <sbarati@apple.com>
 

trunk/Source/JavaScriptCore/jsc.cpp

@@ -279 +279 @@
 static JSC_DECLARE_HOST_FUNCTION(functionPrintStdOut);
 static JSC_DECLARE_HOST_FUNCTION(functionPrintStdErr);
+static JSC_DECLARE_HOST_FUNCTION(functionLegacyPrint);
 static JSC_DECLARE_HOST_FUNCTION(functionDebug);
 static JSC_DECLARE_HOST_FUNCTION(functionDescribe);
@@ -528 +529 @@
         addFunction(vm, "print", functionPrintStdOut, 1);
         addFunction(vm, "printErr", functionPrintStdErr, 1);
+        addFunction(vm, "legacyPrint", functionLegacyPrint, 1);
         addFunction(vm, "quit", functionQuit, 0);
         addFunction(vm, "gc", functionGCAndSweep, 0);
@@ -1239 +1241 @@
 }
 
-static CString cStringFromViewWithString(JSGlobalObject* globalObject, ThrowScope& scope, StringViewWithUnderlyingString& viewWithString)
-{
-    Expected<CString, UTF8ConversionError> expectedString = viewWithString.view.tryGetUtf8();
+template <typename T>
+static CString toCString(JSGlobalObject* globalObject, ThrowScope& scope, T& string)
+{
+    Expected<CString, UTF8ConversionError> expectedString = string.tryGetUtf8();
     if (expectedString)
         return expectedString.value();
@@ -1260 +1263 @@
 }
 
-static EncodedJSValue printInternal(JSGlobalObject* globalObject, CallFrame* callFrame, FILE* out)
+static EncodedJSValue printInternal(JSGlobalObject* globalObject, CallFrame* callFrame, FILE* out, bool legacy)
 {
     VM& vm = globalObject->vm();
@@ -1278 +1281 @@
                 goto fail;
 
-        auto* jsString = callFrame->uncheckedArgument(i).toString(globalObject);
+        String string = legacy ? callFrame->uncheckedArgument(i).toWTFString(globalObject) : callFrame->uncheckedArgument(i).toWTFStringForConsole(globalObject);
         RETURN_IF_EXCEPTION(scope, { });
-        auto viewWithString = jsString->viewWithUnderlyingString(globalObject);
+        auto cString = toCString(globalObject, scope, string);
         RETURN_IF_EXCEPTION(scope, { });
-        auto string = cStringFromViewWithString(globalObject, scope, viewWithString);
-        RETURN_IF_EXCEPTION(scope, { });
-        fwrite(string.data(), sizeof(char), string.length(), out);
+        fwrite(cString.data(), sizeof(char), cString.length(), out);
         if (ferror(out))
             goto fail;
@@ -1297 +1298 @@
 JSC_DEFINE_HOST_FUNCTION(functionPrintStdOut, (JSGlobalObject* globalObject, CallFrame* callFrame))
 {
-    return printInternal(globalObject, callFrame, stdout);
+    return printInternal(globalObject, callFrame, stdout, false);
 }
 
 JSC_DEFINE_HOST_FUNCTION(functionPrintStdErr, (JSGlobalObject* globalObject, CallFrame* callFrame))
 {
-    return printInternal(globalObject, callFrame, stderr);
+    return printInternal(globalObject, callFrame, stderr, false);
+}
+
+JSC_DEFINE_HOST_FUNCTION(functionLegacyPrint, (JSGlobalObject* globalObject, CallFrame* callFrame))
+{
+    return printInternal(globalObject, callFrame, stdout, true);
 }
 
@@ -1313 +1319 @@
     auto viewWithString = jsString->viewWithUnderlyingString(globalObject);
     RETURN_IF_EXCEPTION(scope, { });
-    auto string = cStringFromViewWithString(globalObject, scope, viewWithString);
+    auto string = toCString(globalObject, scope, viewWithString.view);
     RETURN_IF_EXCEPTION(scope, { });
     fputs("--> ", stderr);
@@ -3272 +3278 @@
             utf8 = evaluationException->value().toWTFString(globalObject).tryGetUtf8();
         } else
-            utf8 = returnValue.toWTFString(globalObject).tryGetUtf8();
+            utf8 = returnValue.toWTFStringForConsole(globalObject).tryGetUtf8();
 
         CString result;

trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp

@@ -472 +472 @@
 #endif
 
+WTF::String JSValue::toWTFStringForConsole(JSGlobalObject* globalObject) const
+{
+    VM& vm = globalObject->vm();
+    auto scope = DECLARE_THROW_SCOPE(vm);
+    JSString* string = toString(globalObject);
+    RETURN_IF_EXCEPTION(scope, { });
+    String result = string->value(globalObject);
+    RETURN_IF_EXCEPTION(scope, { });
+    if (isString())
+        return makeString("\"", result, "\"");
+    if (jsDynamicCast<JSArray*>(vm, *this))
+        return makeString("[", result, "]");
+    return result;
+}
+
 } // namespace JSC

trunk/Source/JavaScriptCore/runtime/JSCJSValue.h

@@ -290 +290 @@
     JSValue toPropertyKeyValue(JSGlobalObject*) const;
     WTF::String toWTFString(JSGlobalObject*) const;
+    JS_EXPORT_PRIVATE WTF::String toWTFStringForConsole(JSGlobalObject*) const;
     JSObject* toObject(JSGlobalObject*) const;