Fix a problem with for loop iterator names.

2011-09-18 22:30:27 -07:00
parent ed1fefc205
commit dfd8a620f2
1 changed files with 12 additions and 5 deletions
--- a/ASTree.cpp
+++ b/ASTree.cpp
@@ -1128,12 +1128,19 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
                    PycRef<ASTNode> value = stack.top();
                    stack.pop();

-                    if (value->type() == ASTNode::NODE_INVALID) {
-                        break;
-                    }
-
                    PycRef<ASTNode> name = new ASTName(code->getName(operand));
-                    curblock->append(new ASTStore(value, name));
+
+                    if (curblock->blktype() == ASTBlock::BLK_FOR
+                            && !curblock->inited())
+                    {
+                        curblock.cast<ASTIterBlock>()->setIndex(name);
+                    } else {
+                        curblock->append(new ASTStore(value, name));
+
+                        if (value->type() == ASTNode::NODE_INVALID) {
+                            break;
+                        }
+                    }
                }
            }
            break;