Implement the core of the generator functions. (#3368)

Some things are missing: - yield* support - generator definition in object literal - the hidden GeneratorFunction JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com
2019-11-28 11:54:27 +01:00
parent 14e95a4775
commit 110f75c99d
35 changed files with 1535 additions and 85 deletions
@@ -0,0 +1,74 @@
+/* Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+function check_result(result, value, done)
+{
+  assert(result.value === value)
+  assert(result.done === done)
+}
+
+function * gen1(a) {
+  return "a: " + (yield a.p)
+}
+
+var f = gen1({})
+check_result(f.return(4), 4, true)
+check_result(f.next(), undefined, true)
+
+f = gen1({ p:"x" })
+check_result(f.next(), "x", false)
+check_result(f.return(10), 10, true)
+check_result(f.next(), undefined, true)
+
+f = gen1({ p:"b" })
+check_result(f.next(), "b", false)
+check_result(f.next(), "a: undefined", true)
+check_result(f.next(), undefined, true)
+
+function*gen2() {
+  try {
+    for (let i in { x:1, y:2 })
+    {
+      assert((yield i) === "33")
+    }
+    assert(false)
+  } catch (e) {
+    assert(false)
+  } finally {
+    yield "z"
+  }
+}
+
+f = gen2()
+check_result(f.return("ret"), "ret", true)
+check_result(f.next(), undefined, true)
+
+f = gen2()
+check_result(f.next(), "x", false)
+check_result(f.return("ret"), "z", false)
+check_result(f.next(), "ret", true)
+check_result(f.next(), undefined, true)
+
+function* gen3() {
+  try {
+    return 8
+  } finally {
+    yield 1
+  }
+}
+
+f = gen3()
+check_result(f.next(), 1, false)
+check_result(f.return(2), 2, true)
@@ -0,0 +1,82 @@
+/* Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+function check_result(result, value, done)
+{
+  assert(result.value === value)
+  assert(result.done === done)
+}
+
+function check_throw(str, expected)
+{
+  try {
+    eval(str)
+    assert(false);
+  } catch (e) {
+    assert(e === expected);
+  }
+}
+
+function * gen1(a) {
+  return "a: " + (yield a.p)
+}
+
+var f = gen1({})
+check_throw("f.throw(4)", 4)
+check_result(f.next(), undefined, true)
+
+f = gen1({ p:"x" })
+check_result(f.next(), "x", false)
+check_throw("f.throw(10)", 10)
+check_result(f.next(), undefined, true)
+
+f = gen1({ p:"b" })
+check_result(f.next(), "b", false)
+check_result(f.next(), "a: undefined", true)
+check_result(f.next(), undefined, true)
+
+function*gen2() {
+  try {
+    for (let i in { x:1, y:2 })
+    {
+      assert((yield i) === "33")
+    }
+    assert(false)
+  } finally {
+    yield "z"
+  }
+}
+
+f = gen2()
+check_throw("f.throw('throw')", "throw")
+check_result(f.next(), undefined, true)
+
+f = gen2()
+check_result(f.next(), "x", false)
+check_result(f.throw("throw"), "z", false)
+check_throw("f.next()", "throw")
+check_result(f.next(), undefined, true)
+
+function* gen3() {
+  try {
+    return 8
+  } finally {
+    yield 1
+  }
+}
+
+f = gen3()
+check_result(f.next(), 1, false)
+check_throw("f.throw(2)", 2)
@@ -0,0 +1,73 @@
+/* Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* This file checks yield syntax errors. */
+
+function check_syntax_error(str)
+{
+  try {
+    eval(str);
+    assert(false);
+  } catch (e) {
+    assert(e instanceof SyntaxError);
+  }
+}
+
+function  *  gen()
+{
+  yield , yield
+
+  yield
+     , yield
+
+  (yield
+  )
+
+  yield[
+  1]
+}
+
+function*gen2()
+{
+  1 ?
+    yield
+  :
+    yield
+}
+
+var gen3 = function*(){
+  (yield)/[yield]
+}
+
+check_syntax_error("function *gen(){ yield % yield }");
+check_syntax_error("function *gen(){ (yield) % yield }");
+check_syntax_error("function *gen(){ yield % (yield) }");
+check_syntax_error("function *gen(){ (yield\n1) }");
+check_syntax_error("function *gen(){ function yield() {} }");
+check_syntax_error("function *gen(){ (yield)=>1 }");
+check_syntax_error("function *gen(){ yield => 1 }");
+
+function *gen4() {
+  var f = function yield(i) {
+    if (i = 0)
+      return yield(i + 1)
+
+    return 39
+  }
+
+  return f(0)
+}
+
+assert(gen4().next().value === 39);
@@ -0,0 +1,199 @@
+/* Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* This file checks core generator operations. */
+
+function check_result(result, value, done)
+{
+  assert(result.value === value)
+  assert(result.done === done)
+}
+
+function * gen1(a = (t = 8)) {
+  var o = { p: 2 }
+  var x = 3.25
+
+  assert((o.p + (yield 10)) === 23)
+  assert((o.p + (yield 11)) === 24)
+  return x
+}
+
+/* Cannot be invoked with new. */
+try {
+  new gen1
+  assert(false)
+} catch (e) {
+  assert(e instanceof TypeError)
+}
+
+/* Fully read values. */
+var t = 0
+var g = gen1()
+assert(t === 8)
+
+check_result(g.next(20), 10, false)
+check_result(g.next(21), 11, false)
+check_result(g.next(22), 3.25, true)
+check_result(g.next(23), undefined, true)
+
+/* Partly read values (gc needs to free a suspended generator). */
+t = 0
+g = gen1()
+assert(t === 8)
+
+check_result(g.next(20), 10, false)
+
+function * gen2() {
+  for (i in { x:0, y:1, z:2 })
+  {
+    let a = eval("'s'")
+
+    var b = yield a + i
+    assert (b === ++t)
+  }
+}
+
+/* Fully read values. */
+t = 0
+f = gen2()
+
+check_result(f.next(0), "sx", false)
+check_result(f.next(1), "sy", false)
+check_result(f.next(2), "sz", false)
+check_result(f.next(3), undefined, true)
+check_result(f.next(4), undefined, true)
+
+/* Partly read values (gc needs to free a suspended generator). */
+f = gen2()
+
+t = 0
+check_result(f.next(0), "sx", false)
+
+function *gen3() {
+  function f(yield) {
+    return -yield * 2
+  }
+
+  var g = (v) => {
+    assert(v === 6)
+  }
+
+  g(yield yield f(++t))
+
+  return 77
+}
+
+/* Fully read values. */
+t = 0
+f = gen3()
+
+check_result(f.next(0), -2, false)
+check_result(f.next(88), 88, false)
+check_result(f.next(6), 77, true)
+
+/* Partly read values (gc needs to free a suspended generator). */
+t = 0
+f = gen3()
+
+check_result(f.next(0), -2, false)
+
+function
+      /* generator: */ *
+      /* name: */ gen4() {
+
+  let a = eval("5")
+  with ({a})
+  {
+    let a = eval("6")
+
+    for (let a = 10; a < 11; a++)
+    {
+      let a = eval("7")
+      yield (a)
+    }
+
+    yield a, !assert(a === 6)
+  }
+  assert((yield a) === undefined)
+}
+
+/* Fully read values. */
+f = gen4()
+
+check_result(f.next(), 7, false)
+check_result(f.next(), 6, false)
+check_result(f.next(), 5, false)
+check_result(f.next(), undefined, true)
+
+/* Partly read values (gc needs to free a suspended generator). */
+f = gen4()
+
+check_result(f.next(), 7, false)
+
+function*gen5(a,b,c,d) {
+  yield a
+  yield b
+  yield c
+  yield d
+}
+
+/* Fully read values. */
+t = []
+for(let i of gen5(1,3,5,7)) {
+  t.push(i)
+}
+
+assert(t.length === 4)
+assert(t[0] === 1)
+assert(t[1] === 3)
+assert(t[2] === 5)
+assert(t[3] === 7)
+
+/* Partly read values (gc needs to free a suspended generator). */
+t = []
+for(let i of gen5(1,3,5,7)) {
+  t.push(i)
+  if (i === 3) {
+    break
+  }
+}
+
+assert(t.length === 2)
+assert(t[0] === 1)
+assert(t[1] === 3)
+
+/* Recursive generator call. */
+function* gen6(a,b,c,d) {
+  yield f.next()
+}
+
+f = gen6()
+
+try {
+  f.next()
+  assert(false)
+} catch (e) {
+  assert(e instanceof TypeError)
+}
+
+/* Parameterless yield. */
+function* gen7() {
+  yield
+}
+
+f = gen7()
+check_result(f.next(), undefined, false)
+check_result(f.next(), undefined, true)
+
@@ -223,7 +223,7 @@ main (void)
    /* Check the snapshot data. Unused bytes should be filled with zeroes */
    const uint8_t expected_data[] =
    {
-      0x4A, 0x52, 0x52, 0x59, 0x1F, 0x00, 0x00, 0x00,
+      0x4A, 0x52, 0x52, 0x59, 0x20, 0x00, 0x00, 0x00,
      0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00,
      0x01, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
      0x03, 0x00, 0x01, 0x00, 0x41, 0x00, 0x01, 0x00,