Back out 91b95649a71e for GCC bustage. r=red on a CLOSED TREE.

This commit is contained in:
Jason Orendorff 2013-05-21 14:29:16 -05:00
parent e86b84cf6f
commit 83482e8008

View File

@ -59,7 +59,9 @@
using namespace js;
using namespace js::gc;
using namespace js::frontend;
namespace js {
namespace frontend {
typedef Rooted<StaticBlockObject*> RootedStaticBlockObject;
typedef Handle<StaticBlockObject*> HandleStaticBlockObject;
@ -81,7 +83,7 @@ typedef MutableHandle<PropertyName*> MutableHandlePropertyName;
template <typename ParseHandler>
bool
frontend::GenerateBlockId(ParseContext<ParseHandler> *pc, uint32_t &blockid)
GenerateBlockId(ParseContext<ParseHandler> *pc, uint32_t &blockid)
{
if (pc->blockidGen == JS_BIT(20)) {
JS_ReportErrorNumber(pc->sc->context, js_GetErrorMessage, NULL, JSMSG_NEED_DIET, "program");
@ -93,10 +95,10 @@ frontend::GenerateBlockId(ParseContext<ParseHandler> *pc, uint32_t &blockid)
}
template bool
frontend::GenerateBlockId(ParseContext<SyntaxParseHandler> *pc, uint32_t &blockid);
GenerateBlockId(ParseContext<SyntaxParseHandler> *pc, uint32_t &blockid);
template bool
frontend::GenerateBlockId(ParseContext<FullParseHandler> *pc, uint32_t &blockid);
GenerateBlockId(ParseContext<FullParseHandler> *pc, uint32_t &blockid);
template <typename ParseHandler>
static void
@ -1131,7 +1133,7 @@ Parser<FullParseHandler>::makeDefIntoUse(Definition *dn, ParseNode *pn, JSAtom *
*/
template <typename ParseHandler>
struct frontend::BindData
struct BindData
{
BindData(JSContext *cx) : let(cx) {}
@ -5157,7 +5159,7 @@ Parser<ParseHandler>::unaryExpr()
* NB: This is not a general tree transplanter -- it knows in particular that
* the one or more bindings induced by V have not yet been created.
*/
class frontend::CompExprTransplanter
class CompExprTransplanter
{
ParseNode *root;
Parser<FullParseHandler> *parser;
@ -5199,7 +5201,7 @@ class frontend::CompExprTransplanter
* - maybeNoteGenerator() if this *did not* turn out to be a generator expression
*/
template <typename ParseHandler>
class frontend::GenexpGuard
class GenexpGuard
{
Parser<ParseHandler> *parser;
uint32_t startYieldCount;
@ -6683,5 +6685,8 @@ Parser<ParseHandler>::parenExpr(bool *genexp)
return pn;
}
template class js::frontend::Parser<FullParseHandler>;
template class js::frontend::Parser<SyntaxParseHandler>;
template class Parser<FullParseHandler>;
template class Parser<SyntaxParseHandler>;
} /* namespace frontend */
} /* namespace js */