diff options
| author | Brian Campbell | 2018-01-09 14:50:32 +0000 |
|---|---|---|
| committer | Brian Campbell | 2018-01-09 14:50:32 +0000 |
| commit | 8193c028274dccde0d4c972290cf2ca68d74a6eb (patch) | |
| tree | a3e197a85f9d33d50e96a0c80a00835fc8bf57d4 /src | |
| parent | 35bfe5b1c08fb045283785c819bf0ec4fe24f1c0 (diff) | |
Proper location for no set constraint errors
Diffstat (limited to 'src')
| -rw-r--r-- | src/monomorphise.ml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/monomorphise.ml b/src/monomorphise.ml index eef94982..9ed5d799 100644 --- a/src/monomorphise.ml +++ b/src/monomorphise.ml @@ -221,7 +221,7 @@ let kidset_bigunion = function | h::t -> List.fold_left KidSet.union h t (* TODO: deal with non-set constraints, intersections, etc somehow *) -let extract_set_nc var (NC_aux (_,l) as nc) = +let extract_set_nc l var nc = let rec aux (NC_aux (nc,l)) = let re nc = NC_aux (nc,l) in match nc with @@ -351,7 +351,7 @@ let split_src_type id ty (TypQ_aux (q,ql)) = let find_insts k (insts,nc) = let inst,nc' = if KidSet.mem k vars then - let is,nc' = extract_set_nc k nc in + let is,nc' = extract_set_nc l k nc in Some is,nc' else None,nc in (k,inst)::insts,nc' @@ -1257,7 +1257,7 @@ let split_defs splits defs = | Nexp_var kvar -> let ncs = Env.get_constraints env in let nc = List.fold_left nc_and nc_true ncs in - List.map mk_lit (fst (extract_set_nc kvar nc)) + List.map mk_lit (fst (extract_set_nc l kvar nc)) | _ -> cannot () end | _ -> cannot () |