diff options
| -rw-r--r-- | lib/ur/incl.ur | 2 | ||||
| -rw-r--r-- | lib/ur/incl.urs | 2 | ||||
| -rw-r--r-- | lib/ur/mem.ur | 2 | ||||
| -rw-r--r-- | src/elaborate.sml | 6 |
4 files changed, 4 insertions, 8 deletions
diff --git a/lib/ur/incl.ur b/lib/ur/incl.ur index ebf7acef..4ed27391 100644 --- a/lib/ur/incl.ur +++ b/lib/ur/incl.ur @@ -14,7 +14,7 @@ fun proj [r1 ::: {Type}] [r2 ::: {Type}] (i : incl r1 r2) (r : $r2) = i [$r1] (fn [r' :: {Type}] [r1 ~ r'] (i' : incl' r1 r2 r') => i'.Expose [fn r => $r] r --- r') -fun inv1 [K] [nm :: Name] [t ::: K] [r :: {K}] [r' :: {K}] [[nm] ~ r] +fun inv1 [K] [nm :: Name] [t :: K] [r :: {K}] [r' :: {K}] [[nm] ~ r] [f :: Name -> K -> {K} -> Type] (i : incl ([nm = t] ++ r) r') (f : nm :: Name -> t :: K -> r :: {K} -> [[nm] ~ r] => f nm t ([nm = t] ++ r)) = diff --git a/lib/ur/incl.urs b/lib/ur/incl.urs index 2c77369f..24db0a8a 100644 --- a/lib/ur/incl.urs +++ b/lib/ur/incl.urs @@ -3,7 +3,7 @@ con incl :: K --> {K} -> {K} -> Type val incl : K --> r1 :: {K} -> r2 :: {K} -> [r1 ~ r2] => incl r1 (r1 ++ r2) val proj : r1 ::: {Type} -> r2 ::: {Type} -> incl r1 r2 -> $r2 -> $r1 -val inv1 : K --> nm :: Name -> t ::: K -> r :: {K} -> r' :: {K} +val inv1 : K --> nm :: Name -> t :: K -> r :: {K} -> r' :: {K} -> [[nm] ~ r] => f :: (Name -> K -> {K} -> Type) -> incl ([nm = t] ++ r) r' diff --git a/lib/ur/mem.ur b/lib/ur/mem.ur index 7f66b3c2..85ccf988 100644 --- a/lib/ur/mem.ur +++ b/lib/ur/mem.ur @@ -34,5 +34,5 @@ fun fold [K] [tf :: ({K} -> Type)] [r ::: {K}] (i : tf []) (fl : folder r) = @@Incl.fold [tf] [r] (fn [nm :: Name] [v :: K] [r' :: {K}] [[nm] ~ r'] (i : Incl.incl ([nm = v] ++ r') r) acc => - f [nm] [v] [r'] ! (Incl.inv1 [nm] [r'] [r] [mem] i mem) acc) + f [nm] [v] [r'] ! (Incl.inv1 [nm] [v] [r'] [r] [mem] i mem) acc) i fl diff --git a/src/elaborate.sml b/src/elaborate.sml index f1ddd83e..78583bc8 100644 --- a/src/elaborate.sml +++ b/src/elaborate.sml @@ -2066,11 +2066,7 @@ fun dopenConstraints (loc, env, denv) {str, strs} = fun collect first (st, sgn) = case E.projectConstraints env {sgn = sgn, str = st} of - NONE => (if first then - strError env (UnboundStr (loc, str)) - else - (); - []) + NONE => [] | SOME cs => case #1 (hnormSgn env sgn) of L'.SgnConst sgis => |