corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 958951 - Return IteratorResult object for completed generators instead of throwing. r=jorendorff

Browse Source
This commit is contained in:
Till Schneidereit
2014-02-01 23:20:14 +01:00
parent dd25456b1e
commit e483c3448f
7 changed files with 48 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
js/src/jsiter.cpp
View File

@@ -1710,8 +1710,11 @@ star_generator_next(JSContext *cx, CallArgs args)
JSGenerator *gen = thisObj->as<StarGeneratorObject>().getGenerator();
if (gen->state == JSGEN_CLOSED) {
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_GENERATOR_FINISHED);
return false;
RootedObject obj(cx, CreateItrResultObject(cx, JS::UndefinedHandleValue, true));
if (!obj)
return false;
args.rval().setObject(*obj);
return true;
}
if (gen->state == JSGEN_NEWBORN && args.hasDefined(0)) {
@@ -1732,7 +1735,7 @@ star_generator_throw(JSContext *cx, CallArgs args)
JSGenerator *gen = thisObj->as<StarGeneratorObject>().getGenerator();
if (gen->state == JSGEN_CLOSED) {
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_GENERATOR_FINISHED);
cx->setPendingException(args.get(0));
return false;
}