Fix for some deeply nested except blocks.

2011-10-22 22:47:09 -07:00
parent 5134341972
commit 15d4d0fe6f
1 changed files with 14 additions and 0 deletions
--- a/ASTree.cpp
+++ b/ASTree.cpp
@@ -951,6 +951,20 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)

                        blocks.pop();
                        curblock = blocks.top();
+                    } if (curblock->blktype() == ASTBlock::BLK_ELSE) {
+                        stack = stack_hist.top();
+                        stack_hist.pop();
+
+                        blocks.pop();
+                        blocks.top()->append(curblock.cast<ASTNode>());
+                        curblock = blocks.top();
+
+                        if (curblock->blktype() == ASTBlock::BLK_CONTAINER
+                                && !curblock.cast<ASTContainerBlock>()->hasFinally()) {
+                            blocks.pop();
+                            blocks.top()->append(curblock.cast<ASTNode>());
+                            curblock = blocks.top();
+                        }
                    } else {
                        curblock->append(new ASTKeyword(ASTKeyword::KW_CONTINUE));
                    }