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

Fixes to Frame & Package Slot references.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@141233 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rogerl%netscape.com
2003-04-16 06:21:02 +00:00
parent 7c1ad59261
commit 3abc2cd4c0
7 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/js2/src/js2metadata.cpp
View File

@@ -691,10 +691,10 @@ namespace MetaData {
case StmtNode::group:
{
BlockStmtNode *b = checked_cast<BlockStmtNode *>(p);
BlockFrame *runtimeFrame = new BlockFrame(b->compileFrame);
env->addFrame(runtimeFrame); // XXX is this right? shouldn't this be the compile frame until execution occurs?
// BlockFrame *runtimeFrame = new BlockFrame(b->compileFrame);
env->addFrame(b->compileFrame); // XXX is this right? shouldn't this be the compile frame until execution occurs?
bCon->emitOp(ePushFrame, p->pos);
bCon->addFrame(runtimeFrame);
bCon->addFrame(b->compileFrame);
StmtNode *bp = b->statements;
while (bp) {
SetupStmt(env, phase, bp);
@@ -2089,7 +2089,6 @@ doUnary:
returnRef = new (*referenceArena) FrameSlotReference(checked_cast<FrameVariable *>(m)->frameSlot);
break;
}
break;
keepLooking = false;
}
}
@@ -3107,6 +3106,7 @@ rescan:
// need to reset the environment to the one in operation when eval was called so
// that eval code can affect the apppropriate scopes.
meta->engine->jsr(meta->engine->phase, NULL, meta->engine->sp - meta->engine->execStack, JS2VAL_VOID, meta->engine->activationStackTop[-1].env);
// meta->engine->localFrame = meta->engine->activationStackTop[-1].localFrame;
js2val result = meta->readEvalString(*meta->toString(argv[0]), widenCString("Eval Source"));
meta->engine->rts();
return result;