Stop depending on block indices in capture.rs

1 files changed, 9 insertions, 5 deletions

diff --git a/src/comp/middle/capture.rs b/src/comp/middle/capture.rs
index d61edaca..89948b4d 100644
--- a/src/comp/middle/capture.rs
+++ b/src/comp/middle/capture.rs
@@ -79,11 +79,15 @@ fn walk_expr(@env e, &@ast.expr x) {
 }
 
 fn walk_block(@env e, &ast.block b) {
-    for each (@tup(ast.ident, ast.block_index_entry) it in
-              b.node.index.items()) {
-        alt (it._1) {
-            case (ast.bie_local(?local)) {
-                e.idmap.insert(local.id, current_context(*e));
+    for (@ast.stmt st in b.node.stmts) {
+        alt (st.node) {
+            case (ast.stmt_decl(?d,_)) {
+                alt (d.node) {
+                    case (ast.decl_local(?loc)) {
+                        e.idmap.insert(loc.id, current_context(*e));
+                    }
+                    case (_) { }
+                }
             }
             case (_) { }
         }