Revision: 14684
Author: [email protected]
Date: Wed May 15 06:22:05 2013
Log: GeneratorFunction() makes generator instances
The current specification has GeneratorFunction() be like Function(),
except that it makes generator instances. This commit implements that
behavior. It also fills in a piece of the implementation where
otherwise calling GeneratorFunction or GeneratorFunctionPrototype would
cause an abort because they have no code.
[email protected], [email protected]
TEST=mjsunit/harmony/generators-iteration
TEST=mjsunit/harmony/generators-runtime
BUG=v8:2355
BUG=v8:2680
Review URL: https://codereview.chromium.org/14857009
http://code.google.com/p/v8/source/detail?r=14684
Modified:
/branches/bleeding_edge/src/generator.js
/branches/bleeding_edge/src/v8natives.js
/branches/bleeding_edge/test/mjsunit/harmony/generators-iteration.js
/branches/bleeding_edge/test/mjsunit/harmony/generators-runtime.js
=======================================
--- /branches/bleeding_edge/src/generator.js Wed Apr 24 06:00:16 2013
+++ /branches/bleeding_edge/src/generator.js Wed May 15 06:22:05 2013
@@ -65,6 +65,17 @@
return %_GeneratorThrow(this, exn);
}
+function GeneratorFunctionPrototypeConstructor(x) {
+ if (%_IsConstructCall()) {
+ throw MakeTypeError('not_constructor', ['GeneratorFunctionPrototype']);
+ }
+}
+
+function GeneratorFunctionConstructor(arg1) { // length == 1
+ return NewFunction(arguments, 'function*');
+}
+
+
function SetUpGenerators() {
%CheckIsBootstrapping();
var GeneratorObjectPrototype = GeneratorFunctionPrototype.prototype;
@@ -76,9 +87,11 @@
%SetProperty(GeneratorObjectPrototype, "constructor",
GeneratorFunctionPrototype, DONT_ENUM | DONT_DELETE |
READ_ONLY);
%SetPrototype(GeneratorFunctionPrototype, $Function.prototype);
+ %SetCode(GeneratorFunctionPrototype,
GeneratorFunctionPrototypeConstructor);
%SetProperty(GeneratorFunctionPrototype, "constructor",
GeneratorFunction, DONT_ENUM | DONT_DELETE | READ_ONLY);
%SetPrototype(GeneratorFunction, $Function);
+ %SetCode(GeneratorFunction, GeneratorFunctionConstructor);
}
SetUpGenerators();
=======================================
--- /branches/bleeding_edge/src/v8natives.js Wed May 15 03:52:06 2013
+++ /branches/bleeding_edge/src/v8natives.js Wed May 15 06:22:05 2013
@@ -1757,26 +1757,27 @@
}
-function NewFunction(arg1) { // length == 1
- var n = %_ArgumentsLength();
+function NewFunction(arguments, function_token) {
+ var n = arguments.length;
var p = '';
if (n > 1) {
- p = new InternalArray(n - 1);
- for (var i = 0; i < n - 1; i++) p[i] = %_Arguments(i);
- p = Join(p, n - 1, ',', NonStringToString);
+ p = ToString(arguments[0]);
+ for (var i = 1; i < n - 1; i++) {
+ p += ',' + ToString(arguments[i]);
+ }
// If the formal parameters string include ) - an illegal
// character - it may make the combined function expression
// compile. We avoid this problem by checking for this early on.
if (%_CallFunction(p, ')', StringIndexOf) != -1) {
- throw MakeSyntaxError('paren_in_arg_string',[]);
+ throw MakeSyntaxError('paren_in_arg_string', []);
}
// If the formal parameters include an unbalanced block comment, the
// function must be rejected. Since JavaScript does not allow nested
// comments we can include a trailing block comment to catch this.
p += '\n/' + '**/';
}
- var body = (n > 0) ? ToString(%_Arguments(n - 1)) : '';
- var source = '(function(' + p + ') {\n' + body + '\n})';
+ var body = (n > 0) ? ToString(arguments[n - 1]) : '';
+ var source = '(' + function_token + '(' + p + ') {\n' + body + '\n})';
var global_receiver = %GlobalReceiver(global);
var f = %_CallFunction(global_receiver, %CompileString(source, true));
@@ -1784,6 +1785,11 @@
%FunctionMarkNameShouldPrintAsAnonymous(f);
return f;
}
+
+
+function FunctionConstructor(arg1) { // length == 1
+ return NewFunction(arguments, 'function');
+}
//
----------------------------------------------------------------------------
@@ -1791,7 +1797,7 @@
function SetUpFunction() {
%CheckIsBootstrapping();
- %SetCode($Function, NewFunction);
+ %SetCode($Function, FunctionConstructor);
%SetProperty($Function.prototype, "constructor", $Function, DONT_ENUM);
InstallFunctions($Function.prototype, DONT_ENUM, $Array(
=======================================
--- /branches/bleeding_edge/test/mjsunit/harmony/generators-iteration.js
Tue May 14 09:26:56 2013
+++ /branches/bleeding_edge/test/mjsunit/harmony/generators-iteration.js
Wed May 15 06:22:05 2013
@@ -324,6 +324,28 @@
"foo",
[2, "1foo3", 5, "4foo6", "foofoo"]);
+// Generator function instances.
+TestGenerator(GeneratorFunction(),
+ [undefined],
+ "foo",
+ [undefined]);
+
+TestGenerator(new GeneratorFunction(),
+ [undefined],
+ "foo",
+ [undefined]);
+
+TestGenerator(GeneratorFunction('yield 1;'),
+ [1, undefined],
+ "foo",
+ [1, undefined]);
+
+TestGenerator(
+ function() { return GeneratorFunction('x', 'y', 'yield x + y;')(1, 2)
},
+ [3, undefined],
+ "foo",
+ [3, undefined]);
+
function TestTryCatch(instantiate) {
function* g() { yield 1; try { yield 2; } catch (e) { yield e; } yield
3; }
function Sentinel() {}
=======================================
--- /branches/bleeding_edge/test/mjsunit/harmony/generators-runtime.js Fri
May 3 06:01:28 2013
+++ /branches/bleeding_edge/test/mjsunit/harmony/generators-runtime.js Wed
May 15 06:22:05 2013
@@ -110,6 +110,9 @@
// Not all functions are generators.
assertTrue(f instanceof Function); // Sanity check.
assertTrue(!(f instanceof GeneratorFunction));
+
+ assertTrue((new GeneratorFunction()) instanceof GeneratorFunction);
+ assertTrue(GeneratorFunction() instanceof GeneratorFunction);
}
TestGeneratorFunction();
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
