Attachment 8478870 Details for Bug 1058396

[patch] bug1058396 v2.diff

bug1058396 v2.diff (text/plain), 1.79 KB, created by ziyunfei

(hide)

Description:

Filename:

MIME Type:

Creator: ziyunfei

Size: 1.79 KB

patch

obsolete

>diff -r daa84204a11a js/src/jsstr.cpp
>--- a/js/src/jsstr.cpp	Sat Aug 23 03:29:05 2014 -0700
>+++ b/js/src/jsstr.cpp	Tue Aug 26 15:37:34 2014 +0800
>@@ -4211,7 +4211,21 @@
> 
>     RootedString str(cx);
>     if (args.length() > 0) {
>-        str = ToString<CanGC>(cx, args[0]);
>+        if(!args.isConstructing() && args[0].isSymbol()){
>+            StringBuffer sb(cx);
>+            if (!sb.append("Symbol("))
>+                return false;
>+            RootedString desc(cx, args[0].toSymbol()->description());
>+            if (desc) {
>+                if (!sb.append(desc))
>+                    return false;
>+            }
>+            if (!sb.append(')'))
>+                return false;
>+            str = sb.finishString();
>+        }else{
>+            str = ToString<CanGC>(cx, args[0]);
>+        }
>         if (!str)
>             return false;
>     } else {
>diff -r daa84204a11a js/src/tests/ecma_6/Symbol/conversions.js
>--- a/js/src/tests/ecma_6/Symbol/conversions.js	Sat Aug 23 03:29:05 2014 -0700
>+++ b/js/src/tests/ecma_6/Symbol/conversions.js	Tue Aug 26 15:37:34 2014 +0800
>@@ -39,12 +39,18 @@
>     assertThrowsInstanceOf(() => sym | 0, TypeError);
> 
>     // 7.1.12 ToString
>-    assertThrowsInstanceOf(() => String(sym), TypeError);
>     assertThrowsInstanceOf(() => "" + sym, TypeError);
>     assertThrowsInstanceOf(() => sym + "", TypeError);
>     assertThrowsInstanceOf(() => "" + [1, 2, Symbol()], TypeError);
>     assertThrowsInstanceOf(() => ["simple", "thimble", Symbol()].join(), TypeError);
> 
>+    // 21.1.1.1 String()
>+    assertEq(String(sym), sym.toString());
>+    assertThrowsInstanceOf(() => String(Object(sym)), TypeError);
>+
>+    // 21.1.1.2 new String()
>+    assertThrowsInstanceOf(() => new String(sym), TypeError);
>+
>     // 7.1.13 ToObject
>     var obj = Object(sym);
>     assertEq(typeof obj, "object");

Actions: View | Diff | Review

Attachments on bug 1058396: 8478820 | 8478870 | 8481754 | 8481755 | 8481758