100% pass rate.

felix-lang · May 26, 2022 · bd5fc03 · bd5fc03
1 parent cc70fda
commit bd5fc03
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 46 deletions.
diff --git a/src/compiler/flx_bind/flx_overload.ml b/src/compiler/flx_bind/flx_overload.ml
@@ -639,27 +639,19 @@ if name = debugid then
 *)
     let vs = List.map (fun (s,i,mt)-> s,i,Flx_btype.bmt "Flx_overload2" mt) base_vs in
     let type_constraint = tsubst sr vs base_ts type_constraint in
-(*
 if name = debugid then
     print_endline ("Substituted type constraint " ^ sbt bsym_table type_constraint);
-*)
     let reduced_constraint = beta_reduce "flx_overload: constraint" counter bsym_table sr type_constraint in
-(*
 if name = debugid then
     print_endline ("Reduced type constraint " ^ sbt bsym_table reduced_constraint);
-*)
     begin match reduced_constraint with
     | BBOOL false ->
-(*
 if name = debugid then
         print_endline "Constraint failure, rejecting candidate";
-*)
         None
     | BBOOL true ->
-(*
 if name = debugid then
         print_endline "Constraint success, accepting candidate";
-*)
         let parent_ts = List.map
           (fun (n,i,mt) -> btyp_type_var (i, bmt "Flx_overload.2" mt))
           parent_vs

diff --git a/src/compiler/flx_core/flx_beta.ml b/src/compiler/flx_core/flx_beta.ml
@@ -409,7 +409,9 @@ print_endline ("Beta-reducing typeop " ^ op ^ ", type=" ^ sbt bsym_table t);
   | BTYP_type_set ls -> btyp_type_set (List.map br ls)
 
   | BTYP_in (elt, tset) ->
-    reduce_typeset_membership bsym_table counter sr elt tset
+    let t = reduce_typeset_membership bsym_table counter sr elt tset in
+    beta_reduce' calltag counter bsym_table sr depth termlist t
+
 
   | BTYP_type_set_union ls ->
     let ls = List.rev_map br ls in

diff --git a/src/web/tutopt/mmap_01.fdoc b/src/web/tutopt/mmap_01.fdoc
diff --git a/src/web/tutopt/mmap_index.fdoc b/src/web/tutopt/mmap_index.fdoc