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

Bug 1066197 part 3 - Move some iterator functions into js namespace, remove js_ prefix. r=bhackett

Browse Source
This commit is contained in:
Jan de Mooij
2014-09-15 09:58:27 +02:00
parent d4b2e3e08d
commit 20a0e6367b
9 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
js/src/jsiter.cpp
View File

@@ -817,7 +817,7 @@ js::CreateItrResultObject(JSContext *cx, HandleValue value, bool done)
}
bool
js_ThrowStopIteration(JSContext *cx)
js::ThrowStopIteration(JSContext *cx)
{
JS_ASSERT(!JS_IsExceptionPending(cx));
@@ -865,15 +865,15 @@ iterator_next_impl(JSContext *cx, CallArgs args)
RootedObject thisObj(cx, &args.thisv().toObject());
bool more;
if (!js_IteratorMore(cx, thisObj, &more))
if (!IteratorMore(cx, thisObj, &more))
return false;
if (!more) {
js_ThrowStopIteration(cx);
ThrowStopIteration(cx);
return false;
}
return js_IteratorNext(cx, thisObj, args.rval());
return IteratorNext(cx, thisObj, args.rval());
}
static bool
@@ -1209,7 +1209,7 @@ public:
} /* anonymous namespace */
bool
js_SuppressDeletedProperty(JSContext *cx, HandleObject obj, jsid id)
js::SuppressDeletedProperty(JSContext *cx, HandleObject obj, jsid id)
{
if (JSID_IS_SYMBOL(id))
return true;
@@ -1221,12 +1221,12 @@ js_SuppressDeletedProperty(JSContext *cx, HandleObject obj, jsid id)
}
bool
js_SuppressDeletedElement(JSContext *cx, HandleObject obj, uint32_t index)
js::SuppressDeletedElement(JSContext *cx, HandleObject obj, uint32_t index)
{
RootedId id(cx);
if (!IndexToId(cx, index, &id))
return false;
return js_SuppressDeletedProperty(cx, obj, id);
return SuppressDeletedProperty(cx, obj, id);
}
namespace {
@@ -1248,13 +1248,13 @@ class IndexRangePredicate {
} /* anonymous namespace */
bool
js_SuppressDeletedElements(JSContext *cx, HandleObject obj, uint32_t begin, uint32_t end)
js::SuppressDeletedElements(JSContext *cx, HandleObject obj, uint32_t begin, uint32_t end)
{
return SuppressDeletedPropertyHelper(cx, obj, IndexRangePredicate(begin, end));
}
bool
js_IteratorMore(JSContext *cx, HandleObject iterobj, bool *res)
js::IteratorMore(JSContext *cx, HandleObject iterobj, bool *res)
{
/* Fast path for native iterators */
NativeIterator *ni = nullptr;
@@ -1320,7 +1320,7 @@ js_IteratorMore(JSContext *cx, HandleObject iterobj, bool *res)
}
bool
js_IteratorNext(JSContext *cx, HandleObject iterobj, MutableHandleValue rval)
js::IteratorNext(JSContext *cx, HandleObject iterobj, MutableHandleValue rval)
{
/* Fast path for native iterators */
if (iterobj->is<PropertyIteratorObject>()) {
@@ -1888,7 +1888,7 @@ SendToGenerator(JSContext *cx, JSGeneratorOp op, HandleObject obj,
// if needed.
rval.setUndefined();
if (op != JSGENOP_CLOSE)
ok = js_ThrowStopIteration(cx);
ok = ThrowStopIteration(cx);
}
}
@@ -1936,7 +1936,7 @@ legacy_generator_next(JSContext *cx, CallArgs args)
JSGenerator *gen = thisObj->as<LegacyGeneratorObject>().getGenerator();
if (gen->state == JSGEN_CLOSED)
return js_ThrowStopIteration(cx);
return ThrowStopIteration(cx);
return SendToGenerator(cx, JSGENOP_SEND, thisObj, gen, args.get(0), LegacyGenerator,
args.rval());