diff options
| author |  Amin Timany <amintimany@gmail.com> | 2017-06-14 16:32:47 +0200 |
|---|---|---|
| committer |  Emilio Jesus Gallego Arias <e+git@x80.org> | 2017-06-16 04:51:20 +0200 |
| commit | a4969591f391d857a9efd038338e1a80fc68950b (patch) | |
| tree | 3cefd837747d96401f9800d63ff8f2c27a07ed57 | |
| parent | 5fb30d6c06d47a8e6c4200cdd0ba9067be7cfe2f (diff) | |
A short cleanup
| -rw-r--r-- | API/API.mli | 5 | ||||
| -rw-r--r-- | checker/cic.mli | 4 | ||||
| -rw-r--r-- | checker/values.ml | 2 | ||||
| -rw-r--r-- | dev/base_include | 2 | ||||
| -rw-r--r-- | kernel/declarations.ml | 4 |
5 files changed, 8 insertions, 9 deletions
diff --git a/API/API.mli b/API/API.mli index ecce22c1d..899bafa1f 100644 --- a/API/API.mli +++ b/API/API.mli @@ -1088,12 +1088,11 @@ sig | MEapply of module_alg_expr * Names.ModPath.t | MEwith of module_alg_expr * with_declaration - type abstrac_inductive_universes = Declarations.abstrac_inductive_universes = + type abstract_inductive_universes = Declarations.abstract_inductive_universes = | Monomorphic_ind of Univ.UContext.t | Polymorphic_ind of Univ.abstract_universe_context | Cumulative_ind of Univ.abstract_cumulativity_info - type mutual_inductive_body = Declarations.mutual_inductive_body = { mind_packets : one_inductive_body array; mind_record : Declarations.record_body option; @@ -1103,7 +1102,7 @@ sig mind_nparams : int; mind_nparams_rec : int; mind_params_ctxt : Context.Rel.t; - mind_universes : abstrac_inductive_universes; + mind_universes : Declarations.abstract_inductive_universes; mind_private : bool option; mind_typing_flags : Declarations.typing_flags; } diff --git a/checker/cic.mli b/checker/cic.mli index bbddb678b..e298c41cf 100644 --- a/checker/cic.mli +++ b/checker/cic.mli @@ -304,7 +304,7 @@ type one_inductive_body = { mind_reloc_tbl : reloc_table; } -type abstrac_inductive_universes = +type abstract_inductive_universes = | Monomorphic_ind of Univ.universe_context | Polymorphic_ind of Univ.abstract_universe_context | Cumulative_ind of Univ.abstract_cumulativity_info @@ -327,7 +327,7 @@ type mutual_inductive_body = { mind_params_ctxt : rel_context; (** The context of parameters (includes let-in declaration) *) - mind_universes : abstrac_inductive_universes; (** Local universe variables and constraints together with subtyping constraints *) + mind_universes : abstract_inductive_universes; (** Local universe variables and constraints together with subtyping constraints *) mind_private : bool option; (** allow pattern-matching: Some true ok, Some false blocked *) diff --git a/checker/values.ml b/checker/values.ml index 422729ed5..b8b395aaf 100644 --- a/checker/values.ml +++ b/checker/values.ml @@ -13,7 +13,7 @@ To ensure this file is up-to-date, 'make' now compares the md5 of cic.mli with a copy we maintain here: -MD5 6950230ca9e99e9cc3a70488d8ab824c checker/cic.mli +MD5 b132075590daf5e202de0d9cc34e6003 checker/cic.mli *) diff --git a/dev/base_include b/dev/base_include index 98cf67256..f9af0696b 100644 --- a/dev/base_include +++ b/dev/base_include @@ -196,7 +196,7 @@ let qid = Libnames.qualid_of_string;; (* parsing of terms *) let parse_constr = Pcoq.parse_string Pcoq.Constr.constr;; -(*let parse_tac = Pcoq.parse_string Ltac_plugin.Pltac.tactic;;*) +let parse_tac = Pcoq.parse_string Ltac_plugin.Pltac.tactic;; let parse_vernac = Pcoq.parse_string Pcoq.Vernac_.vernac;; (* build a term of type glob_constr without type-checking or resolution of diff --git a/kernel/declarations.ml b/kernel/declarations.ml index f3b7ae2b2..21651b3e2 100644 --- a/kernel/declarations.ml +++ b/kernel/declarations.ml @@ -169,7 +169,7 @@ type one_inductive_body = { mind_reloc_tbl : Cbytecodes.reloc_table; } -type abstrac_inductive_universes = +type abstract_inductive_universes = | Monomorphic_ind of Univ.universe_context | Polymorphic_ind of Univ.abstract_universe_context | Cumulative_ind of Univ.abstract_cumulativity_info @@ -192,7 +192,7 @@ type mutual_inductive_body = { mind_params_ctxt : Context.Rel.t; (** The context of parameters (includes let-in declaration) *) - mind_universes : abstrac_inductive_universes; (** Information about monomorphic/polymorphic/cumulative inductives and their universes *) + mind_universes : abstract_inductive_universes; (** Information about monomorphic/polymorphic/cumulative inductives and their universes *) mind_private : bool option; (** allow pattern-matching: Some true ok, Some false blocked *) |