Lil-Ran/Pyarmor-Static-Unpack-1shot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a block bug with deeply nested continues.

Browse Source
This commit is contained in:
Darryl Pogue
2011-10-10 01:06:18 -07:00
parent c6d98d6e40
commit 4c4a24173f
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ASTree.cpp
View File

@@ -74,7 +74,9 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
while (prev->end() < pos while (prev->end() < pos
&& prev->blktype() != ASTBlock::BLK_MAIN) { && prev->blktype() != ASTBlock::BLK_MAIN) {
if (prev->blktype() != ASTBlock::BLK_CONTAINER) { if (prev->blktype() != ASTBlock::BLK_CONTAINER) {
stack = stack_hist.top(); /* We want to keep the stack the same, but we need to pop
* a level off the history. */
//stack = stack_hist.top();
stack_hist.pop(); stack_hist.pop();
} }
blocks.pop(); blocks.pop();
@@ -439,6 +441,18 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
break; break;
case Pyc::CONTINUE_LOOP_A: case Pyc::CONTINUE_LOOP_A:
curblock->append(new ASTKeyword(ASTKeyword::KW_CONTINUE)); curblock->append(new ASTKeyword(ASTKeyword::KW_CONTINUE));
if (curblock->blktype() != ASTBlock::BLK_FOR
&& curblock->blktype() != ASTBlock::BLK_WHILE) {
stack = stack_hist.top();
stack_hist.pop();
}
blocks.pop();
blocks.top()->append(curblock.cast<ASTNode>());
curblock = blocks.top();
break; break;
case Pyc::COMPARE_OP_A: case Pyc::COMPARE_OP_A:
{ {