Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-23 02:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1403911 - Part 7: Fix style nits in jsstr.cpp. r=jandem

Browse Source 
--HG--
extra : rebase_source : 114df4c1e23849225e63e07be5c6867ce3d4bfa3
This commit is contained in:
André Bargull 2017-10-03 16:11:07 +02:00
parent 5e57d938d0
commit 52d8907ff1
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
js/src/jsstr.cpp
View File

@ -2505,7 +2505,8 @@ js::str_trimRight(JSContext* cx, unsigned argc, Value* vp)
}
// Utility for building a rope (lazy concatenation) of strings.
class RopeBuilder {
class RopeBuilder
{
JSContext* cx;
RootedString res;
@ -2736,14 +2737,14 @@ BuildDollarReplacement(JSContext* cx, JSString* textstrArg, JSLinearString* reps
template <typename StrChar, typename RepChar>
static bool
StrFlatReplaceGlobal(JSContext *cx, JSLinearString *str, JSLinearString *pat, JSLinearString *rep,
StringBuffer &sb)
StrFlatReplaceGlobal(JSContext* cx, JSLinearString* str, JSLinearString* pat, JSLinearString* rep,
StringBuffer& sb)
{
MOZ_ASSERT(str->length() > 0);
AutoCheckCannotGC nogc;
const StrChar *strChars = str->chars<StrChar>(nogc);
const RepChar *repChars = rep->chars<RepChar>(nogc);
const StrChar* strChars = str->chars<StrChar>(nogc);
const RepChar* repChars = rep->chars<RepChar>(nogc);
// The pattern is empty, so we interleave the replacement string in-between
// each character.
@ -2794,8 +2795,8 @@ StrFlatReplaceGlobal(JSContext *cx, JSLinearString *str, JSLinearString *pat, JS
// This is identical to "str.split(pattern).join(replacement)" except that we
// do some deforestation optimization in Ion.
JSString *
js::str_flat_replace_string(JSContext *cx, HandleString string, HandleString pattern,
JSString*
js::str_flat_replace_string(JSContext* cx, HandleString string, HandleString pattern,
HandleString replacement)
{
MOZ_ASSERT(string);
@ -2840,11 +2841,7 @@ js::str_flat_replace_string(JSContext *cx, HandleString string, HandleString pat
}
}
JSString *str = sb.finishString();
if (!str)
return nullptr;
return str;
return sb.finishString();
}
JSString*
@ -3056,8 +3053,8 @@ SplitSingleCharHelper(JSContext* cx, HandleLinearString str, const TextChar* tex
// ES 2016 draft Mar 25, 2016 21.1.3.17 steps 4, 8, 12-18.
static ArrayObject*
SplitSingleCharHelper(JSContext* cx, HandleLinearString str, char16_t ch, HandleObjectGroup group) {
SplitSingleCharHelper(JSContext* cx, HandleLinearString str, char16_t ch, HandleObjectGroup group)
{
// Step 12.
size_t strLength = str->length();
@ -3073,8 +3070,8 @@ SplitSingleCharHelper(JSContext* cx, HandleLinearString str, char16_t ch, Handle
// ES 2016 draft Mar 25, 2016 21.1.3.17 steps 4, 8, 12-18.
ArrayObject*
js::str_split_string(JSContext* cx, HandleObjectGroup group, HandleString str, HandleString sep, uint32_t limit)
js::str_split_string(JSContext* cx, HandleObjectGroup group, HandleString str, HandleString sep,
uint32_t limit)
{
RootedLinearString linearStr(cx, str->ensureLinear(cx));
if (!linearStr)
@ -4627,7 +4624,7 @@ js::FlatStringMatch(JSContext* cx, unsigned argc, Value* vp)
MOZ_ASSERT(isOptimizable);
#endif
RootedString str(cx,args[0].toString());
RootedString str(cx, args[0].toString());
RootedString pattern(cx, args[1].toString());
bool isFlat = false;
@ -4657,7 +4654,7 @@ js::FlatStringSearch(JSContext* cx, unsigned argc, Value* vp)
MOZ_ASSERT(isOptimizable);
#endif
RootedString str(cx,args[0].toString());
RootedString str(cx, args[0].toString());
RootedString pattern(cx, args[1].toString());
bool isFlat = false;