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

merging from cvs-trunk-mirror

Browse Source
This commit is contained in:
2007-08-16 12:06:15 -07:00
parent 6d5ff21522 f76db042ed
commit 6602a49741
368 changed files with 13411 additions and 6931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
js/src/jsopcode.cpp
View File

@@ -467,8 +467,7 @@ SprintString(Sprinter *sp, JSString *str)
size_t length, size;
ptrdiff_t offset;
chars = JSSTRING_CHARS(str);
length = JSSTRING_LENGTH(str);
JSSTRING_CHARS_AND_LENGTH(str, chars, length);
if (length == 0)
return sp->offset;
@@ -537,8 +536,7 @@ QuoteString(Sprinter *sp, JSString *str, uint32 quote)
return NULL;
/* Loop control variables: z points at end of string sentinel. */
s = JSSTRING_CHARS(str);
z = s + JSSTRING_LENGTH(str);
JSSTRING_CHARS_AND_END(str, s, z);
for (t = s; t < z; s = ++t) {
/* Move t forward from s past un-quote-worthy characters. */
c = *t;
@@ -1218,9 +1216,9 @@ GetSlotAtom(JSPrinter *jp, JSPropertyOp getter, uintN slot)
if (sprop->getter != getter)
continue;
JS_ASSERT(sprop->flags & SPROP_HAS_SHORTID);
JS_ASSERT(JSID_IS_ATOM(sprop->id));
JS_ASSERT(JSID_IS_HIDDEN(sprop->id));
if ((uintN) sprop->shortid == slot)
return JSID_TO_ATOM(sprop->id);
return JSID_TO_ATOM(JSID_UNHIDE_NAME(sprop->id));
}
obj = OBJ_GET_PROTO(jp->sprinter.context, obj);
}
@@ -4776,8 +4774,9 @@ js_DecompileFunction(JSPrinter *jp, JSFunction *fun)
continue;
JS_ASSERT(sprop->flags & SPROP_HAS_SHORTID);
JS_ASSERT((uint16) sprop->shortid < nargs);
JS_ASSERT(JSID_IS_ATOM(sprop->id));
params[(uint16) sprop->shortid] = JSID_TO_ATOM(sprop->id);
JS_ASSERT(JSID_IS_HIDDEN(sprop->id));
params[(uint16) sprop->shortid] =
JSID_TO_ATOM(JSID_UNHIDE_NAME(sprop->id));
}
pc = fun->u.i.script->main;