mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Nuke GCC -pedantic warnings by using the GCC __extension__ keyword (along with a hack to allow us to use it on 'goto' expressions). bug 343680, r=brendan

This commit is contained in:
mrbkap%gmail.com 2006-07-06 20:14:23 +00:00
Родитель a75f7d6b96
Коммит aa27b0cde4
1 изменённых файлов: 20 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

32
js/src/jsinterp.c
Просмотреть файл

@ -2009,24 +2009,32 @@ js_Interpret(JSContext *cx, jsbytecode *pc, jsval *result)
#endif #endif
int stackDummy; int stackDummy;
#ifdef __GNUC__
# define JS_EXTENSION __extension__
# define JS_EXTENSION_(s) __extension__ ({ s; })
#else
# define JS_EXTENSION
# define JS_EXTENSION_(s) s
#endif
#ifdef JS_THREADED_INTERP #ifdef JS_THREADED_INTERP
static void *normalJumpTable[] = { static void *normalJumpTable[] = {
# define OPDEF(op,val,name,token,length,nuses,ndefs,prec,format) \ # define OPDEF(op,val,name,token,length,nuses,ndefs,prec,format) \
&&L_##op, JS_EXTENSION &&L_##op,
# include "jsopcode.tbl" # include "jsopcode.tbl"
# undef OPDEF # undef OPDEF
}; };
static void *interruptJumpTable[] = { static void *interruptJumpTable[] = {
# define OPDEF(op,val,name,token,length,nuses,ndefs,prec,format) \ # define OPDEF(op,val,name,token,length,nuses,ndefs,prec,format) \
&&interrupt, JS_EXTENSION &&interrupt,
# include "jsopcode.tbl" # include "jsopcode.tbl"
# undef OPDEF # undef OPDEF
}; };
register void **jumpTable = normalJumpTable; register void **jumpTable = normalJumpTable;
# define DO_OP() goto *jumpTable[op] # define DO_OP() JS_EXTENSION_(goto *jumpTable[op])
# define DO_NEXT_OP(n) do { op = *(pc += (n)); DO_OP(); } while (0) # define DO_NEXT_OP(n) do { op = *(pc += (n)); DO_OP(); } while (0)
# define BEGIN_CASE(OP) L_##OP: # define BEGIN_CASE(OP) L_##OP:
# define END_CASE(OP) DO_NEXT_OP(OP##_LENGTH); # define END_CASE(OP) DO_NEXT_OP(OP##_LENGTH);
@ -2184,7 +2192,7 @@ interrupt:
} }
op = (JSOp) *pc; op = (JSOp) *pc;
goto *normalJumpTable[op]; JS_EXTENSION_(goto *normalJumpTable[op]);
#else /* !JS_THREADED_INTERP */ #else /* !JS_THREADED_INTERP */
@ -4957,10 +4965,10 @@ interrupt:
if (ok) { if (ok) {
ok = OBJ_DEFINE_PROPERTY(cx, parent, id, rval, ok = OBJ_DEFINE_PROPERTY(cx, parent, id, rval,
(flags & JSPROP_GETTER) (flags & JSPROP_GETTER)
? (JSPropertyOp) obj ? JS_EXTENSION (JSPropertyOp) obj
: NULL, : NULL,
(flags & JSPROP_SETTER) (flags & JSPROP_SETTER)
? (JSPropertyOp) obj ? JS_EXTENSION (JSPropertyOp) obj
: NULL, : NULL,
attrs, attrs,
&prop); &prop);
@ -5101,10 +5109,10 @@ interrupt:
} }
ok = OBJ_DEFINE_PROPERTY(cx, parent, ATOM_TO_JSID(fun->atom), rval, ok = OBJ_DEFINE_PROPERTY(cx, parent, ATOM_TO_JSID(fun->atom), rval,
(attrs & JSPROP_GETTER) (attrs & JSPROP_GETTER)
? (JSPropertyOp) obj ? JS_EXTENSION (JSPropertyOp) obj
: NULL, : NULL,
(attrs & JSPROP_SETTER) (attrs & JSPROP_SETTER)
? (JSPropertyOp) obj ? JS_EXTENSION (JSPropertyOp) obj
: NULL, : NULL,
attrs | attrs |
JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_PERMANENT |
@ -5181,10 +5189,10 @@ interrupt:
parent = fp->varobj; parent = fp->varobj;
ok = OBJ_DEFINE_PROPERTY(cx, parent, ATOM_TO_JSID(fun->atom), rval, ok = OBJ_DEFINE_PROPERTY(cx, parent, ATOM_TO_JSID(fun->atom), rval,
(attrs & JSPROP_GETTER) (attrs & JSPROP_GETTER)
? (JSPropertyOp) obj ? JS_EXTENSION (JSPropertyOp) obj
: NULL, : NULL,
(attrs & JSPROP_SETTER) (attrs & JSPROP_SETTER)
? (JSPropertyOp) obj ? JS_EXTENSION (JSPropertyOp) obj
: NULL, : NULL,
attrs | JSPROP_ENUMERATE attrs | JSPROP_ENUMERATE
| JSPROP_PERMANENT, | JSPROP_PERMANENT,
@ -5278,12 +5286,12 @@ interrupt:
goto out; goto out;
if (op == JSOP_GETTER) { if (op == JSOP_GETTER) {
getter = (JSPropertyOp) JSVAL_TO_OBJECT(rval); getter = JS_EXTENSION (JSPropertyOp) JSVAL_TO_OBJECT(rval);
setter = NULL; setter = NULL;
attrs = JSPROP_GETTER; attrs = JSPROP_GETTER;
} else { } else {
getter = NULL; getter = NULL;
setter = (JSPropertyOp) JSVAL_TO_OBJECT(rval); setter = JS_EXTENSION (JSPropertyOp) JSVAL_TO_OBJECT(rval);
attrs = JSPROP_SETTER; attrs = JSPROP_SETTER;
} }
attrs |= JSPROP_ENUMERATE | JSPROP_SHARED; attrs |= JSPROP_ENUMERATE | JSPROP_SHARED;