Refactor transition_multiple to return samples and update usage in PatternMatch and Unboxing

Author: 7h3kk1d

src/language/dynamics/transition/Ascriptions.re

@@ -302,8 +302,4 @@ let rec transition_multiple =
   | Some(d'') => transition_multiple(~targets, d'')
   | None => SampleWriter.return(d)
   };
-};
-
-// TODO return samples
-let transition_multiple = (~targets: Sample.targets, d: DHExp.t): DHExp.t =>
-  snd(transition_multiple(~targets, d));
+};

src/language/dynamics/transition/PatternMatch.re

@@ -74,10 +74,9 @@ let match_pattern =
   | Parens(p)
   | Projector(_, p) => recur(p, d)
   | Asc(p, t1) =>
-    recur(
-      p,
-      Ascriptions.transition_multiple(~targets, Asc(d, t1) |> DHExp.fresh),
-    )
+    let (_samples, d') =
+      Ascriptions.transition_multiple(~targets, Asc(d, t1) |> DHExp.fresh);
+    recur(p, d');
   };
 
 /* Record a sample closure if this pattern is targeted and matched */
@@ -118,7 +117,7 @@ let rec matches_inner =
           d: DHExp.t,
         )
         : match_result => {
-  let d = Ascriptions.transition_multiple(~targets, d);
+  let (_samples, d) = Ascriptions.transition_multiple(~targets, d);
   let pat_id = Pat.rep_id(dp);
   let maybe_spec = Id.Map.find_opt(pat_id, targets);
   let recur = matches_inner(targets, sample_closures);

src/language/dynamics/transition/Unboxing.re

@@ -131,8 +131,10 @@ let rec unbox: type a. (unbox_request(a), DHExp.t) => unboxed(a) =
     | (LabeledTupleEntries, Tuple(ds)) =>
       let unbox_tup_label =
           (d: Exp.t): option((option(LabeledTuple.label), Exp.t)) => {
+        // TODO Samples
         switch (
-          Ascriptions.transition_multiple(~targets=Sample.no_targets, d).term
+          snd(Ascriptions.transition_multiple(~targets=Sample.no_targets, d)).
+            term
         ) {
         // TODO Think about whether we should transition here
         | TupLabel({term: Label(l), _}, e) => Some((Some(l), e))