1 files changed, 65 insertions, 0 deletions
diff --git a/js/src/tests/js1_8_5/reflect-parse/comprehensions.js b/js/src/tests/js1_8_5/reflect-parse/comprehensions.js
new file mode 100644
index 000000000..9ea73f497
--- /dev/null
+++ b/js/src/tests/js1_8_5/reflect-parse/comprehensions.js
@@ -0,0 +1,65 @@
+// |reftest| skip-if(!xulRuntime.shell)
+function test() {
+
+// Transform the legacy comprehensions to less legacy comprehensions and test
+// them.
+function assertFormerlyES6ArrayComp(expr, body, blocks, filter) {
+    let match = expr.match(/^\[(.*?) for (.*)\]$/);
+    assertEq(match !== null, true);
+    let expr2 = "[for " + match[2] + " " + match[1] + "]";
+    assertExpr(expr2, compExpr(body, blocks, filter, "modern"));
+}
+
+assertFormerlyES6ArrayComp("[ x         for (x of foo)]",
+                           ident("x"), [compOfBlock(ident("x"), ident("foo"))], null);
+assertFormerlyES6ArrayComp("[ [x,y]     for (x of foo) for (y of bar)]",
+                           arrExpr([ident("x"), ident("y")]), [compOfBlock(ident("x"), ident("foo")), compOfBlock(ident("y"), ident("bar"))], null);
+assertFormerlyES6ArrayComp("[ [x,y,z] for (x of foo) for (y of bar) for (z of baz)]",
+                           arrExpr([ident("x"), ident("y"), ident("z")]),
+                           [compOfBlock(ident("x"), ident("foo")), compOfBlock(ident("y"), ident("bar")), compOfBlock(ident("z"), ident("baz"))],
+                           null);
+
+assertFormerlyES6ArrayComp("[ x         for (x of foo) if (p)]",
+                           ident("x"), [compOfBlock(ident("x"), ident("foo"))], ident("p"));
+assertFormerlyES6ArrayComp("[ [x,y]     for (x of foo) for (y of bar) if (p)]",
+                           arrExpr([ident("x"), ident("y")]), [compOfBlock(ident("x"), ident("foo")), compOfBlock(ident("y"), ident("bar"))], ident("p"));
+assertFormerlyES6ArrayComp("[ [x,y,z] for (x of foo) for (y of bar) for (z of baz) if (p) ]",
+                          arrExpr([ident("x"), ident("y"), ident("z")]),
+                          [compOfBlock(ident("x"), ident("foo")), compOfBlock(ident("y"), ident("bar")), compOfBlock(ident("z"), ident("baz"))],
+                          ident("p"));
+
+// FormerlyES6 comprehensions with multiple ComprehensionIf.
+
+assertExpr("[for (x of foo) x]",
+           compExpr(ident("x"), [compOfBlock(ident("x"), ident("foo"))], null, "modern"));
+assertExpr("[for (x of foo) if (c1) x]",
+           compExpr(ident("x"), [compOfBlock(ident("x"), ident("foo")),
+                                 compIf(ident("c1"))], null, "modern"));
+assertExpr("[for (x of foo) if (c1) if (c2) x]",
+           compExpr(ident("x"), [compOfBlock(ident("x"), ident("foo")),
+                                 compIf(ident("c1")), compIf(ident("c2"))], null, "modern"));
+
+assertExpr("[for (x of foo) if (c1) for (y of bar) x]",
+           compExpr(ident("x"), [compOfBlock(ident("x"), ident("foo")),
+                                 compIf(ident("c1")),
+                                 compOfBlock(ident("y"), ident("bar"))], null, "modern"));
+assertExpr("[for (x of foo) if (c1) for (y of bar) if (c2) x]",
+           compExpr(ident("x"), [compOfBlock(ident("x"), ident("foo")),
+                                 compIf(ident("c1")),
+                                 compOfBlock(ident("y"), ident("bar")),
+                                 compIf(ident("c2"))], null, "modern"));
+assertExpr("[for (x of foo) if (c1) if (c2) for (y of bar) if (c3) if (c4) x]",
+           compExpr(ident("x"), [compOfBlock(ident("x"), ident("foo")),
+                                 compIf(ident("c1")), compIf(ident("c2")),
+                                 compOfBlock(ident("y"), ident("bar")),
+                                 compIf(ident("c3")), compIf(ident("c4"))], null, "modern"));
+
+assertExpr("[for (x of y) if (false) for (z of w) if (0) x]",
+           compExpr(ident("x"), [compOfBlock(ident("x"), ident("y")),
+                                 compIf(lit(false)),
+                                 compOfBlock(ident("z"), ident("w")),
+                                 compIf(lit(0))], null, "modern"));
+
+}
+
+runtest(test);