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

Bug 648949 - Remove HAS_JS_GENERATORS #define. r=Waldo, r=jorendorff

Browse Source
This commit is contained in:
Andy Wingo
2013-06-26 12:34:47 +02:00
parent 35ddf9286d
commit f0684ef598
11 changed files with 9 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
js/src/jsiter.cpp
View File

@@ -959,10 +959,8 @@ const JSFunctionSpec ElementIteratorObject::methods[] = {
JS_FS_END
};
#if JS_HAS_GENERATORS
static JSBool
CloseGenerator(JSContext *cx, HandleObject genobj);
#endif
bool
js::ValueToIterator(JSContext *cx, unsigned flags, MutableHandleValue vp)
@@ -1024,12 +1022,9 @@ js::CloseIterator(JSContext *cx, HandleObject obj)
*/
ni->props_cursor = ni->props_array;
}
}
#if JS_HAS_GENERATORS
else if (obj->is<GeneratorObject>()) {
} else if (obj->is<GeneratorObject>()) {
return CloseGenerator(cx, obj);
}
#endif
return true;
}
@@ -1320,8 +1315,6 @@ Class StopIterationObject::class_ = {
/*** Generators **********************************************************************************/
#if JS_HAS_GENERATORS
static void
generator_finalize(FreeOp *fop, JSObject *obj)
{
@@ -1775,8 +1768,6 @@ static const JSFunctionSpec generator_methods[] = {
JS_FS_END
};
#endif /* JS_HAS_GENERATORS */
/* static */ bool
GlobalObject::initIteratorClasses(JSContext *cx, Handle<GlobalObject *> global)
{
@@ -1818,14 +1809,12 @@ GlobalObject::initIteratorClasses(JSContext *cx, Handle<GlobalObject *> global)
global->setReservedSlot(ELEMENT_ITERATOR_PROTO, ObjectValue(*proto));
}
#if JS_HAS_GENERATORS
if (global->getSlot(GENERATOR_PROTO).isUndefined()) {
proto = global->createBlankPrototype(cx, &GeneratorObject::class_);
if (!proto || !DefinePropertiesAndBrand(cx, proto, NULL, generator_methods))
return false;
global->setReservedSlot(GENERATOR_PROTO, ObjectValue(*proto));
}
#endif
if (global->getPrototype(JSProto_StopIteration).isUndefined()) {
proto = global->createBlankPrototype(cx, &StopIterationObject::class_);