Desugar the head stmts all the way out of STMT_for, rather than stashing them in the node. That's only necessary for STMT_while.

6 files changed, 13 insertions, 15 deletions

diff --git a/src/boot/fe/ast.ml b/src/boot/fe/ast.ml
index 0b74da3caab..31138a51962 100644
--- a/src/boot/fe/ast.ml
+++ b/src/boot/fe/ast.ml
@@ -283,7 +283,7 @@ and stmt_for_each =
 and stmt_for =
     {
       for_slot: (slot identified * ident);
-      for_seq: ((stmt array) * lval);
+      for_seq: lval;
       for_body: block;
     }
 
@@ -1098,7 +1098,7 @@ and fmt_stmt_body (ff:Format.formatter) (s:stmt) : unit =
 
       | STMT_for sfor ->
           let (slot, ident) = sfor.for_slot in
-          let (stmts, lval) = sfor.for_seq in
+          let lval = sfor.for_seq in
             begin
               fmt_obox ff;
               fmt ff "for (";
@@ -1106,7 +1106,6 @@ and fmt_stmt_body (ff:Format.formatter) (s:stmt) : unit =
               fmt ff " ";
               fmt_ident ff ident;
               fmt ff " in ";
-              fmt_stmts ff stmts;
               fmt_lval ff lval;
               fmt ff ") ";
               fmt_obr ff;
diff --git a/src/boot/fe/item.ml b/src/boot/fe/item.ml
index 5270e863c0b..0b5efd6736b 100644
--- a/src/boot/fe/item.ml
+++ b/src/boot/fe/item.ml
@@ -369,17 +369,18 @@ and parse_stmts (ps:pstate) : Ast.stmt array =
                   let inner ps =
                     let slot = (parse_identified_slot_and_ident false ps) in
                     let _    = (expect ps IN) in
-                    let lval = (parse_lval ps) in
-                      (slot, lval) in
-                  let (slot, seq) =
+                      (slot, (parse_lval ps))
+                  in
+                  let (slot, (stmts, lval)) =
                     ctxt "stmts: for head" (bracketed LPAREN RPAREN inner) ps
                   in
                   let body_block = ctxt "stmts: for body" parse_block ps in
                   let bpos = lexpos ps in
-                    [| span ps apos bpos
-                         (Ast.STMT_for
+                    Array.append stmts
+                      [| span ps apos bpos
+                           (Ast.STMT_for
                             { Ast.for_slot = slot;
-                              Ast.for_seq = seq;
+                              Ast.for_seq = lval;
                               Ast.for_body = body_block; }) |]
           end
 
diff --git a/src/boot/me/trans.ml b/src/boot/me/trans.ml
index 85dd5265423..df0801b9347 100644
--- a/src/boot/me/trans.ml
+++ b/src/boot/me/trans.ml
@@ -4021,10 +4021,9 @@ let trans_visitor
     let dst_slot_id = (fst (fo.Ast.for_slot)).id in
     let dst_slot = get_slot cx dst_slot_id in
     let dst_cell = cell_of_block_slot dst_slot_id in
-    let (head_stmts, seq) = fo.Ast.for_seq in
+    let seq = fo.Ast.for_seq in
     let (seq_cell, seq_ty) = trans_lval seq in
     let unit_ty = seq_unit_ty seq_ty in
-      Array.iter trans_stmt head_stmts;
       iter_seq_parts ty_params seq_cell seq_cell unit_ty
         begin
           fun _ src_cell unit_ty _ ->
diff --git a/src/boot/me/type.ml b/src/boot/me/type.ml
index b27e68dc7dc..701bee1a384 100644
--- a/src/boot/me/type.ml
+++ b/src/boot/me/type.ml
@@ -1263,7 +1263,7 @@ let process_crate (cx:ctxt) (crate:Ast.crate) : unit =
             let mem_tv = ref TYSPEC_all in
             let seq_tv = ref (TYSPEC_collection mem_tv) in
             let (si, _) = fo.Ast.for_slot in
-            let (_, seq) = fo.Ast.for_seq in
+            let seq = fo.Ast.for_seq in
               unify_lval rval_ctx seq seq_tv;
               unify_slot lval_ctx si.node (Some si.id) mem_tv
 
diff --git a/src/boot/me/typestate.ml b/src/boot/me/typestate.ml
index 6e0b57e1a9c..b9a189c2bc6 100644
--- a/src/boot/me/typestate.ml
+++ b/src/boot/me/typestate.ml
@@ -533,7 +533,7 @@ let condition_assigning_visitor
 
         | Ast.STMT_for fo ->
             let (si, _) = fo.Ast.for_slot in
-            let (_, lval) = fo.Ast.for_seq in
+            let lval = fo.Ast.for_seq in
             let precond = slot_inits (lval_slots cx lval) in
             let block_entry_state = [| Constr_init si.id |] in
               raise_pre_post_cond s.id precond;
diff --git a/src/boot/me/walk.ml b/src/boot/me/walk.ml
index 0b60c8320e5..49db07e51da 100644
--- a/src/boot/me/walk.ml
+++ b/src/boot/me/walk.ml
@@ -419,9 +419,8 @@ and walk_stmt
       (s:Ast.stmt_for)
       : unit =
     let (si,_) = s.Ast.for_slot in
-    let (ss,lv) = s.Ast.for_seq in
+    let lv = s.Ast.for_seq in
       walk_slot_identified v si;
-      Array.iter (walk_stmt v) ss;
       walk_lval v lv;
       walk_block v s.Ast.for_body
   in