diff options
| author | Maxime Dénès | 2015-01-16 22:17:03 +0100 |
|---|---|---|
| committer | Matthieu Sozeau | 2015-01-18 00:16:43 +0530 |
| commit | 6e0b660b1e58502b7da477b9725ae8ee4f5d00ed (patch) | |
| tree | 36114b255b884e90b021876bebd49ff978c24710 /pretyping | |
| parent | a83721ac508aa96496ef95c8433bc282bca0db14 (diff) | |
Make native compiler handle universe polymorphic definitions.
One remaining issue: aliased constants raise an anomaly when some unsubstituted
universe variables remain. VM may suffer from the same problem.
Diffstat (limited to 'pretyping')
| -rw-r--r-- | pretyping/nativenorm.ml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pretyping/nativenorm.ml b/pretyping/nativenorm.ml index ff48119ba2..bd427ecd08 100644 --- a/pretyping/nativenorm.ml +++ b/pretyping/nativenorm.ml @@ -257,8 +257,8 @@ and nf_bargs env b t = and nf_atom env atom = match atom with | Arel i -> mkRel (nb_rel env - i) - | Aconstant cst -> mkConst cst - | Aind ind -> mkInd ind + | Aconstant cst -> mkConstU cst + | Aind ind -> mkIndU ind | Asort s -> mkSort s | Avar id -> mkVar id | Aprod(n,dom,codom) -> @@ -280,9 +280,9 @@ and nf_atom_type env atom = let n = (nb_rel env - i) in mkRel n, type_of_rel env n | Aconstant cst -> - mkConst cst, fst (Typeops.type_of_constant env (cst,Univ.Instance.empty)) (* FIXME *) + mkConstU cst, Typeops.type_of_constant_in env cst | Aind ind -> - mkInd ind, Inductiveops.type_of_inductive env (ind,Univ.Instance.empty) + mkIndU ind, Inductiveops.type_of_inductive env ind | Asort s -> mkSort s, type_of_sort s | Avar id -> |