diff options
Diffstat (limited to 'plugins/decl_mode/decl_expr.mli')
| -rw-r--r-- | plugins/decl_mode/decl_expr.mli | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/plugins/decl_mode/decl_expr.mli b/plugins/decl_mode/decl_expr.mli index 86b5e95b..7467604a 100644 --- a/plugins/decl_mode/decl_expr.mli +++ b/plugins/decl_mode/decl_expr.mli @@ -1,22 +1,21 @@ (************************************************************************) (* v * The Coq Proof Assistant / The Coq Development Team *) -(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2014 *) +(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2015 *) (* \VV/ **************************************************************) (* // * This file is distributed under the terms of the *) (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) open Names -open Util open Tacexpr type 'it statement = - {st_label:name; + {st_label:Name.t; st_it:'it} type thesis_kind = Plain - | For of identifier + | For of Id.t type 'this or_thesis = This of 'this @@ -60,8 +59,8 @@ type ('hyp,'constr,'pat,'tac) bare_proof_instr = | Pconsider of 'constr*('hyp,'constr) hyp list | Pclaim of 'constr statement | Pfocus of 'constr statement - | Pdefine of identifier * 'hyp list * 'constr - | Pcast of identifier or_thesis * 'constr + | Pdefine of Id.t * 'hyp list * 'constr + | Pcast of Id.t or_thesis * 'constr | Psuppose of ('hyp,'constr) hyp list | Pcase of 'hyp list*'pat*(('hyp,'constr or_thesis) hyp list) | Ptake of 'constr list @@ -77,15 +76,15 @@ type ('hyp,'constr,'pat,'tac) gen_proof_instr= type raw_proof_instr = - ((identifier*(Topconstr.constr_expr option)) located, - Topconstr.constr_expr, - Topconstr.cases_pattern_expr, + ((Id.t*(Constrexpr.constr_expr option)) Loc.located, + Constrexpr.constr_expr, + Constrexpr.cases_pattern_expr, raw_tactic_expr) gen_proof_instr type glob_proof_instr = - ((identifier*(Genarg.glob_constr_and_expr option)) located, - Genarg.glob_constr_and_expr, - Topconstr.cases_pattern_expr, + ((Id.t*(Tacexpr.glob_constr_and_expr option)) Loc.located, + Tacexpr.glob_constr_and_expr, + Constrexpr.cases_pattern_expr, Tacexpr.glob_tactic_expr) gen_proof_instr type proof_pattern = @@ -94,7 +93,7 @@ type proof_pattern = pat_constr: Term.constr; pat_typ: Term.types; pat_pat: Glob_term.cases_pattern; - pat_expr: Topconstr.cases_pattern_expr} + pat_expr: Constrexpr.cases_pattern_expr} type proof_instr = (Term.constr statement, |