Fix probes breaking pattern matching statics and dynamics (#2044)

Author: cyrus-

src/language/dynamics/transition/PatternMatch.re

@@ -44,10 +44,13 @@ let rec matches = (capture, dp: Pat.t, d: DHExp.t): match_result => {
   | Constructor(ctr, _) =>
     let* () = Unboxing.unbox(SumNoArg(ctr), d);
     Matches([]);
-  | Ap({term: Constructor(ctr, _), _}, p2) =>
-    let* d2 = Unboxing.unbox(SumWithArg(ctr), d);
-    matches(p2, d2);
-  | Ap(_, _) => IndetMatch // TODO: should this fail?
+  | Ap(c, p2) =>
+    switch (Pat.ctr_name(c)) {
+    | Some(ctr) =>
+      let* d2 = Unboxing.unbox(SumWithArg(ctr), d);
+      matches(p2, d2);
+    | None => IndetMatch
+    }
   | Var(x) => Matches([(x, d)])
   /* Labels are a special case */
   | Label(name) =>

src/language/statics/Statics.re

@@ -1909,8 +1909,8 @@ and upat_to_info_map =
       let fn_ana = Arrow(syn, ana) |> Typ.temp;
       let (fn', m) = go(~ctx, ~ana=fn_ana, fn, m);
       let m = {
-        switch (fn |> Pat.term_of) {
-        | Constructor(_) => m
+        switch (ctr) {
+        | Some(_) => m
         | _ =>
           let info =
             Info.derived_pat(

src/language/term/Pat.re

@@ -238,7 +238,9 @@ let rec get_num_of_vars = (pat: t) =>
 
 let ctr_name = (p: t): option(Constructor.t) =>
   switch (p.term) {
-  | Constructor(name, _) => Some(name)
+  | Constructor(name, _)
+  | Parens({term: Constructor(name, _), _})
+  | Probe({term: Constructor(name, _), _}, _) => Some(name)
   | _ => None
   };