Skip to content

Commit

Permalink
Bug 799252 - Remove SkipRoots in jsstr.cpp; r=Waldo
Browse files Browse the repository at this point in the history
  • Loading branch information
Terrence Cole committed Oct 16, 2012
1 parent 7c7af16 commit daffbf3
Show file tree
Hide file tree
Showing 2 changed files with 147 additions and 113 deletions.
254 changes: 143 additions & 111 deletions js/src/jsstr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1132,107 +1132,110 @@ RopeMatch(JSContext *cx, JSString *textstr, const jschar *pat, uint32_t patlen,
return true;
}

/* ES6 20120708 draft 15.5.4.24. */
/* ES6 20121026 draft 15.5.4.24. */
static JSBool
str_contains(JSContext *cx, unsigned argc, Value *vp)
{
AssertCanGC();
CallArgs args = CallArgsFromVp(argc, vp);

// Steps 1 and 2
// Steps 1, 2, and 3
RootedString str(cx, ThisToStringForStringProto(cx, args));
if (!str)
return false;

// Step 3
Rooted<JSLinearString *> patstr(cx, ArgToRootedString(cx, args, 0));
if (!patstr)
return false;

// Step 5
uint32_t textlen = str->length();
const jschar *text = str->getChars(cx);
if (!text)
// Steps 4 and 5
Rooted<JSLinearString*> searchStr(cx, ArgToRootedString(cx, args, 0));
if (!searchStr)
return false;

// XXX fix for moving GC.
SkipRoot skip(cx, &text);

// Steps 6 and 7
uint32_t pos = 0;
if (args.hasDefined(1)) {
// Step 4
double posDouble;
if (!ToInteger(cx, args[1], &posDouble))
return false;

// Step 6
uint32_t delta = uint32_t(Min(double(textlen), Max(0.0, posDouble)));
text += delta;
textlen -= delta;
if (args[1].isInt32()) {
int i = args[1].toInt32();
pos = (i < 0) ? 0U : uint32_t(i);
} else {
double d;
if (!ToInteger(cx, args[1], &d))
return false;
pos = uint32_t(Min(Max(d, 0.0), double(UINT32_MAX)));
}
}

// Step 7
uint32_t patlen = patstr->length();
const jschar *pat = patstr->chars();
AutoAssertNoGC nogc;

// Step 8
args.rval().setBoolean(StringMatch(text, textlen, pat, patlen) >= 0);
uint32_t textLen = str->length();
const jschar *textChars = str->getChars(cx);
if (!textChars)
return false;

// Step 9
uint32_t start = Min(Max(pos, 0U), textLen);

// Step 10
uint32_t searchLen = searchStr->length();
const jschar *searchChars = searchStr->chars();

// Step 11
textChars += start;
textLen -= start;
int match = StringMatch(textChars, textLen, searchChars, searchLen);
args.rval().setBoolean(match != -1);
return true;
}

/* ES6 20120927 draft 15.5.4.7. */
static JSBool
str_indexOf(JSContext *cx, unsigned argc, Value *vp)
{
AssertCanGC();
CallArgs args = CallArgsFromVp(argc, vp);

// Steps 1, 2, and 3
RootedString str(cx, ThisToStringForStringProto(cx, args));
if (!str)
return false;

JSLinearString *patstr = ArgToRootedString(cx, args, 0);
if (!patstr)
return false;

uint32_t textlen = str->length();
const jschar *text = str->getChars(cx);
if (!text)
// Steps 4 and 5
Rooted<JSLinearString*> searchStr(cx, ArgToRootedString(cx, args, 0));
if (!searchStr)
return false;

uint32_t patlen = patstr->length();
const jschar *pat = patstr->chars();
SkipRoot skipPat(cx, &pat);

uint32_t start;
if (args.length() > 1) {
// Steps 6 and 7
uint32_t pos = 0;
if (args.hasDefined(1)) {
if (args[1].isInt32()) {
int i = args[1].toInt32();
if (i <= 0) {
start = 0;
} else if (uint32_t(i) > textlen) {
start = textlen;
textlen = 0;
} else {
start = i;
text += start;
textlen -= start;
}
pos = (i < 0) ? 0U : uint32_t(i);
} else {
double d;
if (!ToInteger(cx, args[1], &d))
return false;
if (d <= 0) {
start = 0;
} else if (d > textlen) {
start = textlen;
textlen = 0;
} else {
start = (int)d;
text += start;
textlen -= start;
}
pos = uint32_t(Min(Max(d, 0.0), double(UINT32_MAX)));
}
} else {
start = 0;
}

int match = StringMatch(text, textlen, pat, patlen);
AutoAssertNoGC nogc;

// Step 8
uint32_t textLen = str->length();
const jschar *textChars = str->getChars(cx);
if (!textChars)
return false;

// Step 9
uint32_t start = Min(Max(pos, 0U), textLen);

// Step 10
uint32_t searchLen = searchStr->length();
const jschar *searchChars = searchStr->chars();

// Step 11
textChars += start;
textLen -= start;
int match = StringMatch(textChars, textLen, searchChars, searchLen);
args.rval().setInt32((match == -1) ? -1 : start + match);
return true;
}
Expand Down Expand Up @@ -1314,93 +1317,122 @@ str_lastIndexOf(JSContext *cx, unsigned argc, Value *vp)
return true;
}

/* ES6 20120708 draft 15.5.4.22. */
/* ES6 20120927 draft 15.5.4.22. */
static JSBool
str_startsWith(JSContext *cx, unsigned argc, Value *vp)
{
AssertCanGC();
CallArgs args = CallArgsFromVp(argc, vp);

// Steps 1 and 2
// Steps 1, 2, and 3
RootedString str(cx, ThisToStringForStringProto(cx, args));
if (!str)
return false;

// Step 3
Rooted<JSLinearString *> patstr(cx, ArgToRootedString(cx, args, 0));
if (!patstr)
// Steps 4 and 5
Rooted<JSLinearString*> searchStr(cx, ArgToRootedString(cx, args, 0));
if (!searchStr)
return false;

// Step 5
uint32_t textlen = str->length();
const jschar *text = str->getChars(cx);
if (!text)
// Steps 6 and 7
uint32_t pos = 0;
if (args.hasDefined(1)) {
if (args[1].isInt32()) {
int i = args[1].toInt32();
pos = (i < 0) ? 0U : uint32_t(i);
} else {
double d;
if (!ToInteger(cx, args[1], &d))
return false;
pos = uint32_t(Min(Max(d, 0.0), double(UINT32_MAX)));
}
}

AutoAssertNoGC nogc;

// Step 8
uint32_t textLen = str->length();
const jschar *textChars = str->getChars(cx);
if (!textChars)
return false;

// XXX fix for moving GC.
SkipRoot skip(cx, &text);
// Step 9
uint32_t start = Min(Max(pos, 0U), textLen);

if (args.hasDefined(1)) {
// Step 4
double posDouble;
if (!ToInteger(cx, args[1], &posDouble))
return false;
// Step 10
uint32_t searchLen = searchStr->length();
const jschar *searchChars = searchStr->chars();

// Step 6
uint32_t position = Min(double(textlen), Max(0.0, posDouble));
text += position;
textlen -= position;
// Step 11
if (searchLen + start < searchLen || searchLen + start > textLen) {
args.rval().setBoolean(false);
return true;
}

// Step 7
uint32_t patlen = patstr->length();
const jschar *pat = patstr->chars();

// Steps 8, 9, and 10.
args.rval().setBoolean(textlen >= patlen && PodEqual(text, pat, patlen));
// Steps 12 and 13
args.rval().setBoolean(PodEqual(textChars + start, searchChars, searchLen));
return true;
}

/* ES6 20120708 draft 15.5.4.23. */
static JSBool
str_endsWith(JSContext *cx, unsigned argc, Value *vp)
{
AssertCanGC();
CallArgs args = CallArgsFromVp(argc, vp);

// Steps 1 and 2
// Steps 1, 2, and 3
RootedString str(cx, ThisToStringForStringProto(cx, args));
if (!str)
return false;

// Step 3
Rooted<JSLinearString *> patstr(cx, ArgToRootedString(cx, args, 0));
if (!patstr)
// Steps 4 and 5
Rooted<JSLinearString *> searchStr(cx, ArgToRootedString(cx, args, 0));
if (!searchStr)
return false;

// Step 4
uint32_t textlen = str->length();
const jschar *text = str->getChars(cx);
if (!text)
// Step 6
uint32_t textLen = str->length();

// Steps 7 and 8
uint32_t pos = textLen;
if (args.hasDefined(1)) {
if (args[1].isInt32()) {
int i = args[1].toInt32();
pos = (i < 0) ? 0U : uint32_t(i);
} else {
double d;
if (!ToInteger(cx, args[1], &d))
return false;
pos = uint32_t(Min(Max(d, 0.0), double(UINT32_MAX)));
}
}

AutoAssertNoGC nogc;

// Step 6
const jschar *textChars = str->getChars(cx);
if (!textChars)
return false;

// XXX fix for moving GC.
SkipRoot skip(cx, &text);
// Step 9
uint32_t end = Min(Max(pos, 0U), textLen);

if (args.hasDefined(1)) {
// Step 5
double endPosDouble;
if (!ToInteger(cx, args[1], &endPosDouble))
return false;
// Step 10
uint32_t searchLen = searchStr->length();
const jschar *searchChars = searchStr->chars();

// Step 6
textlen = Min(double(textlen), Max(0.0, endPosDouble));
// Step 12
if (searchLen > end) {
args.rval().setBoolean(false);
return true;
}

// Step 7
uint32_t patlen = patstr->length();
const jschar *pat = patstr->chars();
// Step 11
uint32_t start = end - searchLen;

// Steps 8-11
args.rval().setBoolean(textlen >= patlen && PodEqual(text + textlen - patlen, pat, patlen));
// Steps 13 and 14
args.rval().setBoolean(PodEqual(textChars + start, searchChars, searchLen));
return true;
}

Expand Down
6 changes: 4 additions & 2 deletions mfbt/RangedPtr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ class RangedPtr
#endif
}

uintptr_t asUintptr() const { return uintptr_t(ptr); }

public:
RangedPtr(T* p, T* start, T* end)
: ptr(p)
Expand Down Expand Up @@ -128,13 +130,13 @@ class RangedPtr

RangedPtr<T> operator+(size_t inc) {
MOZ_ASSERT(inc <= size_t(-1) / sizeof(T));
MOZ_ASSERT(ptr + inc >= ptr);
MOZ_ASSERT(asUintptr() + inc * sizeof(T) >= asUintptr());
return create(ptr + inc);
}

RangedPtr<T> operator-(size_t dec) {
MOZ_ASSERT(dec <= size_t(-1) / sizeof(T));
MOZ_ASSERT(ptr - dec <= ptr);
MOZ_ASSERT(asUintptr() - dec * sizeof(T) <= asUintptr());
return create(ptr - dec);
}

Expand Down

0 comments on commit daffbf3

Please sign in to comment.