aboutsummaryrefslogtreecommitdiff
path: root/kernel/mod_subst.ml
diff options
context:
space:
mode:
authorEmilio Jesus Gallego Arias2019-11-21 15:38:39 +0100
committerEmilio Jesus Gallego Arias2019-11-21 15:38:39 +0100
commitd016f69818b30b75d186fb14f440b93b0518fc66 (patch)
tree32cd948273f79a2c01ad27b4ed0244ea60d7e2f9 /kernel/mod_subst.ml
parentb680b06b31c27751a7d551d95839aea38f7fbea1 (diff)
[coq] Untabify the whole ML codebase.
We also remove trailing whitespace. Script used: ```bash for i in `find . -name '*.ml' -or -name '*.mli' -or -name '*.mlg'`; do expand -i "$i" | sponge "$i"; sed -e's/[[:space:]]*$//' -i.bak "$i"; done ```
Diffstat (limited to 'kernel/mod_subst.ml')
-rw-r--r--kernel/mod_subst.ml144
1 files changed, 72 insertions, 72 deletions
diff --git a/kernel/mod_subst.ml b/kernel/mod_subst.ml
index c5ea32e157..1cf34977c5 100644
--- a/kernel/mod_subst.ml
+++ b/kernel/mod_subst.ml
@@ -114,7 +114,7 @@ let debug_pr_delta resolve =
let debug_pr_subst sub =
let l = list_contents sub in
let f (s1,(s2,s3)) = hov 2 (str s1 ++ spc () ++ str "|-> " ++ str s2 ++
- spc () ++ str "[" ++ str s3 ++ str "]")
+ spc () ++ str "[" ++ str s3 ++ str "]")
in
str "{" ++ hov 2 (prlist_with_sep pr_comma f l) ++ str "}"
@@ -156,8 +156,8 @@ let mp_of_delta resolve mp =
let find_prefix resolve mp =
let rec sub_mp = function
| MPdot(mp,l) as mp_sup ->
- (try Deltamap.find_mp mp_sup resolve
- with Not_found -> MPdot(sub_mp mp,l))
+ (try Deltamap.find_mp mp_sup resolve
+ with Not_found -> MPdot(sub_mp mp,l))
| p -> Deltamap.find_mp p resolve
in
try sub_mp mp with Not_found -> mp
@@ -207,9 +207,9 @@ let inline_of_delta inline resolver =
| None -> []
| Some inl_lev ->
let extract kn hint l =
- match hint with
- | Inline (lev,_) -> if lev <= inl_lev then (lev,kn)::l else l
- | _ -> l
+ match hint with
+ | Inline (lev,_) -> if lev <= inl_lev then (lev,kn)::l else l
+ | _ -> l
in
Deltamap.fold_kn extract resolver []
@@ -230,12 +230,12 @@ let subst_mp0 sub mp = (* 's like subst *)
match mp with
| MPfile _ | MPbound _ -> Umap.find mp sub
| MPdot (mp1,l) as mp2 ->
- begin
+ begin
try Umap.find mp2 sub
- with Not_found ->
- let mp1',resolve = aux mp1 in
- MPdot (mp1',l),resolve
- end
+ with Not_found ->
+ let mp1',resolve = aux mp1 in
+ MPdot (mp1',l),resolve
+ end
in
try Some (aux mp) with Not_found -> None
@@ -317,7 +317,7 @@ let subst_con sub cst =
let subst_pcon sub (con,u as pcon) =
try let con', _can = subst_con0 sub con in
- con',u
+ con',u
with No_subst -> pcon
let subst_constant sub con =
@@ -353,71 +353,71 @@ let rec map_kn f f' c =
let func = map_kn f f' in
match kind c with
| Const kn -> (try f' kn with No_subst -> c)
- | Proj (p,t) ->
+ | Proj (p,t) ->
let p' = Projection.map f p in
- let t' = func t in
- if p' == p && t' == t then c
- else mkProj (p', t')
+ let t' = func t in
+ if p' == p && t' == t then c
+ else mkProj (p', t')
| Ind ((kn,i),u) ->
- let kn' = f kn in
- if kn'==kn then c else mkIndU ((kn',i),u)
+ let kn' = f kn in
+ if kn'==kn then c else mkIndU ((kn',i),u)
| Construct (((kn,i),j),u) ->
- let kn' = f kn in
- if kn'==kn then c else mkConstructU (((kn',i),j),u)
+ let kn' = f kn in
+ if kn'==kn then c else mkConstructU (((kn',i),j),u)
| Case (ci,p,ct,l) ->
- let ci_ind =
+ let ci_ind =
let (kn,i) = ci.ci_ind in
- let kn' = f kn in
- if kn'==kn then ci.ci_ind else kn',i
- in
- let p' = func p in
- let ct' = func ct in
+ let kn' = f kn in
+ if kn'==kn then ci.ci_ind else kn',i
+ in
+ let p' = func p in
+ let ct' = func ct in
let l' = Array.Smart.map func l in
- if (ci.ci_ind==ci_ind && p'==p
- && l'==l && ct'==ct)then c
- else
- mkCase ({ci with ci_ind = ci_ind},
- p',ct', l')
+ if (ci.ci_ind==ci_ind && p'==p
+ && l'==l && ct'==ct)then c
+ else
+ mkCase ({ci with ci_ind = ci_ind},
+ p',ct', l')
| Cast (ct,k,t) ->
- let ct' = func ct in
- let t'= func t in
- if (t'==t && ct'==ct) then c
- else mkCast (ct', k, t')
+ let ct' = func ct in
+ let t'= func t in
+ if (t'==t && ct'==ct) then c
+ else mkCast (ct', k, t')
| Prod (na,t,ct) ->
- let ct' = func ct in
- let t'= func t in
- if (t'==t && ct'==ct) then c
- else mkProd (na, t', ct')
+ let ct' = func ct in
+ let t'= func t in
+ if (t'==t && ct'==ct) then c
+ else mkProd (na, t', ct')
| Lambda (na,t,ct) ->
- let ct' = func ct in
- let t'= func t in
- if (t'==t && ct'==ct) then c
- else mkLambda (na, t', ct')
+ let ct' = func ct in
+ let t'= func t in
+ if (t'==t && ct'==ct) then c
+ else mkLambda (na, t', ct')
| LetIn (na,b,t,ct) ->
- let ct' = func ct in
- let t'= func t in
- let b'= func b in
- if (t'==t && ct'==ct && b==b') then c
- else mkLetIn (na, b', t', ct')
+ let ct' = func ct in
+ let t'= func t in
+ let b'= func b in
+ if (t'==t && ct'==ct && b==b') then c
+ else mkLetIn (na, b', t', ct')
| App (ct,l) ->
- let ct' = func ct in
+ let ct' = func ct in
let l' = Array.Smart.map func l in
- if (ct'== ct && l'==l) then c
- else mkApp (ct',l')
+ if (ct'== ct && l'==l) then c
+ else mkApp (ct',l')
| Evar (e,l) ->
let l' = Array.Smart.map func l in
- if (l'==l) then c
- else mkEvar (e,l')
+ if (l'==l) then c
+ else mkEvar (e,l')
| Fix (ln,(lna,tl,bl)) ->
let tl' = Array.Smart.map func tl in
let bl' = Array.Smart.map func bl in
- if (bl == bl'&& tl == tl') then c
- else mkFix (ln,(lna,tl',bl'))
+ if (bl == bl'&& tl == tl') then c
+ else mkFix (ln,(lna,tl',bl'))
| CoFix(ln,(lna,tl,bl)) ->
let tl' = Array.Smart.map func tl in
let bl' = Array.Smart.map func bl in
- if (bl == bl'&& tl == tl') then c
- else mkCoFix (ln,(lna,tl',bl'))
+ if (bl == bl'&& tl == tl') then c
+ else mkCoFix (ln,(lna,tl',bl'))
| _ -> c
let subst_mps sub c =
@@ -434,9 +434,9 @@ let rec replace_mp_in_mp mpfrom mpto mp =
match mp with
| _ when ModPath.equal mp mpfrom -> mpto
| MPdot (mp1,l) ->
- let mp1' = replace_mp_in_mp mpfrom mpto mp1 in
- if mp1 == mp1' then mp
- else MPdot (mp1',l)
+ let mp1' = replace_mp_in_mp mpfrom mpto mp1 in
+ if mp1 == mp1' then mp
+ else MPdot (mp1',l)
| _ -> mp
let replace_mp_in_kn mpfrom mpto kn =
@@ -459,7 +459,7 @@ let subset_prefixed_by mp resolver =
match hint with
| Inline _ -> rslv
| Equiv _ ->
- if mp_in_mp mp (KerName.modpath kn) then Deltamap.add_kn kn hint rslv else rslv
+ if mp_in_mp mp (KerName.modpath kn) then Deltamap.add_kn kn hint rslv else rslv
in
Deltamap.fold mp_prefix kn_prefix resolver empty_delta_resolver
@@ -479,7 +479,7 @@ let subst_mp_delta sub mp mkey =
let mp1 = find_prefix resolve mp' in
let resolve1 = subset_prefixed_by mp1 resolve in
(subst_dom_delta_resolver
- (map_mp mp1 mkey empty_delta_resolver) resolve1),mp1
+ (map_mp mp1 mkey empty_delta_resolver) resolve1),mp1
let gen_subst_delta_resolver dom subst resolver =
let mp_apply_subst mkey mequ rslv =
@@ -491,8 +491,8 @@ let gen_subst_delta_resolver dom subst resolver =
let kkey' = if dom then subst_kn subst kkey else kkey in
let hint' = match hint with
| Equiv kequ ->
- (try Equiv (subst_kn_delta subst kequ)
- with Change_equiv_to_inline (lev,c) -> Inline (lev,Some c))
+ (try Equiv (subst_kn_delta subst kequ)
+ with Change_equiv_to_inline (lev,c) -> Inline (lev,Some c))
| Inline (lev,Some t) -> Inline (lev,Some (Univ.map_univ_abstracted (subst_mps subst) t))
| Inline (_,None) -> hint
in
@@ -510,8 +510,8 @@ let update_delta_resolver resolver1 resolver2 =
let kn_apply_rslv kkey hint1 rslv =
let hint = match hint1 with
| Equiv kequ ->
- (try Equiv (solve_delta_kn resolver2 kequ)
- with Change_equiv_to_inline (lev,c) -> Inline (lev, Some c))
+ (try Equiv (solve_delta_kn resolver2 kequ)
+ with Change_equiv_to_inline (lev,c) -> Inline (lev, Some c))
| Inline (_,Some _) -> hint1
| Inline (_,None) ->
(try Deltamap.find_kn kkey resolver2 with Not_found -> hint1)
@@ -539,15 +539,15 @@ let join subst1 subst2 =
let apply_subst mpk add (mp,resolve) res =
let mp',resolve' =
match subst_mp0 subst2 mp with
- | None -> mp, None
- | Some (mp',resolve') -> mp', Some resolve' in
+ | None -> mp, None
+ | Some (mp',resolve') -> mp', Some resolve' in
let resolve'' =
match resolve' with
| Some res ->
- add_delta_resolver
- (subst_dom_codom_delta_resolver subst2 resolve) res
- | None ->
- subst_codom_delta_resolver subst2 resolve
+ add_delta_resolver
+ (subst_dom_codom_delta_resolver subst2 resolve) res
+ | None ->
+ subst_codom_delta_resolver subst2 resolve
in
let prefixed_subst = substition_prefixed_by mpk mp' subst2 in
Umap.join prefixed_subst (add (mp',resolve'') res)