Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merging changes on MOZILLA_1_7_BRANCH between AVIARY_1_0_20040515_BASE and MOZILLA_1_7_RELEASE: land the same thing that landed on the 1.7 branch for bug 245795.

Browse Source 
git-svn-id: svn://10.0.0.236/branches/AVIARY_1_0_20040515_BRANCH@158088 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org
2004-06-18 02:33:16 +00:00
parent 9b26007ef4
commit 62986507f0
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/js/src/jsopcode.c
View File

@@ -479,7 +479,7 @@ struct JSPrinter {
* opposed to JS_DONT_PRETTY_PRINT back in the dark ages, we can assume that a
* uintN is at least 32 bits.
*/
#define JS_GROUP_CONTEXT 0x10000
#define JS_IN_GROUP_CONTEXT 0x10000
JSPrinter *
js_NewPrinter(JSContext *cx, const char *name, uintN indent, JSBool pretty)
@@ -493,9 +493,9 @@ js_NewPrinter(JSContext *cx, const char *name, uintN indent, JSBool pretty)
return NULL;
INIT_SPRINTER(cx, &jp->sprinter, &jp->pool, 0);
JS_InitArenaPool(&jp->pool, name, 256, 1);
jp->indent = indent & ~JS_GROUP_CONTEXT;
jp->grouped = (indent & JS_GROUP_CONTEXT) != 0;
jp->indent = indent & ~JS_IN_GROUP_CONTEXT;
jp->pretty = pretty;
jp->grouped = (indent & JS_IN_GROUP_CONTEXT) != 0;
jp->script = NULL;
jp->scope = NULL;
fp = cx->fp;
@@ -1924,11 +1924,11 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb)
if (!js_fun_toString(cx, ATOM_TO_OBJECT(atom),
(pc + len < endpc &&
pc[len] == JSOP_GROUP)
? JS_GROUP_CONTEXT |
? JS_IN_GROUP_CONTEXT |
JS_DONT_PRETTY_PRINT
: JS_DONT_PRETTY_PRINT,
0, NULL, &val)) {
return JS_FALSE;
return JS_FALSE;
}
str = JSVAL_TO_STRING(val);
}