diff options
| author | Maxime Dénès | 2017-05-03 13:37:41 +0200 |
|---|---|---|
| committer | Maxime Dénès | 2017-05-03 13:37:41 +0200 |
| commit | 3c795ba6b5728e8a0a699ab15c773c52c48f33e4 (patch) | |
| tree | 7a95c75037ddc1c729bc496c13084d350f9f29a1 /checker | |
| parent | 4bff930da2c029a66eaf5378e5abd2cc35554f8f (diff) | |
| parent | 15d415729962eddde2cd1d58e03449c8526ba626 (diff) | |
Merge PR#411: Mention template polymorphism in the documentation.
Diffstat (limited to 'checker')
| -rw-r--r-- | checker/subtyping.ml | 2 | ||||
| -rw-r--r-- | checker/typeops.ml | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/checker/subtyping.ml b/checker/subtyping.ml index 7eae9b8310..a290b240d8 100644 --- a/checker/subtyping.ml +++ b/checker/subtyping.ml @@ -113,7 +113,7 @@ let check_inductive env mp1 l info1 mib2 spec2 subst1 subst2= in let check_inductive_type env t1 t2 = - (* Due to sort-polymorphism in inductive types, the conclusions of + (* Due to template polymorphism, the conclusions of t1 and t2, if in Type, are generated as the least upper bounds of the types of the constructors. diff --git a/checker/typeops.ml b/checker/typeops.ml index 02d801741c..1396d56df3 100644 --- a/checker/typeops.ml +++ b/checker/typeops.ml @@ -275,13 +275,11 @@ let rec execute env cstr = let j = match f with | Ind ind -> - (* Sort-polymorphism of inductive types *) judge_of_inductive_knowing_parameters env ind jl | Const cst -> - (* Sort-polymorphism of constant *) judge_of_constant_knowing_parameters env cst jl | _ -> - (* No sort-polymorphism *) + (* No template polymorphism *) execute env f in let jl = Array.map2 (fun c ty -> c,ty) args jl in |