Implement String.raw

tonygermano · gbrail · commit a8bd87b41e15 · 2021-05-07T16:05:06.000-07:00
diff --git a/src/org/mozilla/javascript/NativeString.java b/src/org/mozilla/javascript/NativeString.java
@@ -81,6 +81,7 @@ protected Object getInstanceIdValue(int id) {
     protected void fillConstructorProperties(IdFunctionObject ctor) {
         addIdFunctionProperty(ctor, STRING_TAG, ConstructorId_fromCharCode, "fromCharCode", 1);
         addIdFunctionProperty(ctor, STRING_TAG, ConstructorId_fromCodePoint, "fromCodePoint", 1);
+        addIdFunctionProperty(ctor, STRING_TAG, ConstructorId_raw, "raw", 1);
         addIdFunctionProperty(ctor, STRING_TAG, ConstructorId_charAt, "charAt", 2);
         addIdFunctionProperty(ctor, STRING_TAG, ConstructorId_charCodeAt, "charCodeAt", 2);
         addIdFunctionProperty(ctor, STRING_TAG, ConstructorId_indexOf, "indexOf", 2);
@@ -393,6 +394,9 @@ public Object execIdCall(
                         return new String(chars);
                     }
 
+                case ConstructorId_raw:
+                    return js_raw(cx, scope, args);
+
                 case Id_constructor:
                     {
                         CharSequence s;
@@ -1106,6 +1110,47 @@ protected int findPrototypeId(Symbol k) {
         return 0;
     }
 
+    /**
+     *
+     *
+     * <h1>String.raw (template, ...substitutions)</h1>
+     *
+     * <p>22.1.2.4 String.raw [Draft ECMA-262 / April 28, 2021]
+     */
+    private static CharSequence js_raw(Context cx, Scriptable scope, Object[] args) {
+        /* step 1-2 */
+        Object arg0 = args.length > 0 ? args[0] : Undefined.instance;
+        Scriptable cooked = ScriptRuntime.toObject(cx, scope, arg0);
+        /* step 3 */
+        Object rawValue = ScriptRuntime.getObjectProp(cooked, "raw", cx);
+        Scriptable raw = ScriptRuntime.toObject(cx, scope, rawValue);
+        /* step 4-5 */
+        long rawLength = NativeArray.getLengthProperty(cx, raw);
+        if (rawLength > Integer.MAX_VALUE) {
+            throw ScriptRuntime.rangeError("raw.length > " + Integer.toString(Integer.MAX_VALUE));
+        }
+        int literalSegments = (int) rawLength;
+        if (literalSegments <= 0) return "";
+        /* step 6-7 */
+        StringBuilder elements = new StringBuilder();
+        int nextIndex = 0;
+        for (; ; ) {
+            /* step 8 a-i */
+            Object next;
+            next = ScriptRuntime.getObjectIndex(raw, nextIndex, cx);
+            String nextSeg = ScriptRuntime.toString(next);
+            elements.append(nextSeg);
+            nextIndex += 1;
+            if (nextIndex == literalSegments) {
+                break;
+            }
+            next = args.length > nextIndex ? args[nextIndex] : "";
+            String nextSub = ScriptRuntime.toString(next);
+            elements.append(nextSub);
+        }
+        return elements;
+    }
+
     // #string_id_map#
 
     @Override
@@ -1270,6 +1315,7 @@ protected int findPrototypeId(String s) {
 
     private static final int ConstructorId_fromCharCode = -1,
             ConstructorId_fromCodePoint = -2,
+            ConstructorId_raw = -3,
             Id_constructor = 1,
             Id_toString = 2,
             Id_toSource = 3,
diff --git a/testsrc/jstests/es6/string.js b/testsrc/jstests/es6/string.js
@@ -37,4 +37,16 @@ load("testsrc/assert.js");
     assertEquals(" abc", " abc ".trimRight())
 })();
 
-"success";
+(function TestRawTooLarge() {
+  assertThrows(()=>String.raw({raw: {length: Math.pow(2, 31) + 1}}), RangeError);
+})();
+
+(function TestRawPrototypeGet() {
+  var _raw = ["1",,"3"];
+  var raw = Object.create(_raw);
+  raw[2] = "2*";
+  raw.length = 4;
+  assertEquals("1.undefined^2*undefined", String.raw(Object.create({raw}), ".", "^"));
+})();
+
+"success";
diff --git a/testsrc/test262.properties b/testsrc/test262.properties
@@ -1101,28 +1101,8 @@ built-ins/String
     ! prototype/trimStart/this-value-object-valueof-meth-err.js
     ! prototype/trimStart/this-value-object-valueof-meth-priority.js
     ! prototype/trimStart/this-value-object-valueof-returns-object-err.js
-    ! raw/length.js
-    ! raw/name.js
-    ! raw/raw.js
-    ! raw/return-empty-string-from-empty-array-length.js
-    ! raw/return-empty-string-if-length-is-negative-infinity.js
-    ! raw/return-empty-string-if-length-is-not-defined.js
-    ! raw/return-empty-string-if-length-is-undefined.js
-    ! raw/return-empty-string-if-length-is-zero-boolean.js
-    ! raw/return-empty-string-if-length-is-zero-NaN.js
-    ! raw/return-empty-string-if-length-is-zero-null.js
-    ! raw/return-empty-string-if-length-is-zero-or-less-number.js
-    ! raw/return-empty-string-if-length-is-zero-or-less-string.js
     ! raw/return-the-string-value-from-template.js
-    ! raw/return-the-string-value.js
-    ! raw/returns-abrupt-from-next-key-toString.js
-    ! raw/returns-abrupt-from-next-key.js
-    ! raw/returns-abrupt-from-substitution.js
     ! raw/special-characters.js
-    ! raw/substitutions-are-appended-on-same-index.js
-    ! raw/substitutions-are-limited-to-template-raw-length.js
-    ! raw/template-length-throws.js
-    ! raw/template-raw-throws.js
     ! raw/template-substitutions-are-appended-on-same-index.js
     ! raw/zero-literal-segments.js
 
