diff options
| author | Maxime Dénès | 2016-11-07 15:46:24 +0100 |
|---|---|---|
| committer | Maxime Dénès | 2016-11-07 15:46:24 +0100 |
| commit | b58f5b2b499b687288587837cbf0cfc04a269c75 (patch) | |
| tree | c4186f582884cc7b295eccc163ca893c53009fb6 /intf | |
| parent | 6f30019bfd99a0125fdc12baf8b6c04169701fb7 (diff) | |
| parent | d7cb0e2115ec37eddeeecbb1f2dbdeb7e49aeb7a (diff) | |
Merge remote-tracking branch 'github/pr/339' into v8.6
Was PR#339: Documenting type class options, typeclasses eauto
Diffstat (limited to 'intf')
| -rw-r--r-- | intf/vernacexpr.mli | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/intf/vernacexpr.mli b/intf/vernacexpr.mli index 1336c92b6f..92e4dd618e 100644 --- a/intf/vernacexpr.mli +++ b/intf/vernacexpr.mli @@ -123,8 +123,14 @@ type hint_mode = | ModeNoHeadEvar (* No evar at the head *) | ModeOutput (* Anything *) +type 'a hint_info_gen = + { hint_priority : int option; + hint_pattern : 'a option } + +type hint_info_expr = constr_pattern_expr hint_info_gen + type hints_expr = - | HintsResolve of (int option * bool * reference_or_constr) list + | HintsResolve of (hint_info_expr * bool * reference_or_constr) list | HintsImmediate of reference_or_constr list | HintsUnfold of reference list | HintsTransparency of reference list * bool @@ -368,12 +374,12 @@ type vernac_expr = local_binder list * (* super *) typeclass_constraint * (* instance name, class name, params *) (bool * constr_expr) option * (* props *) - int option (* Priority *) + hint_info_expr | VernacContext of local_binder list | VernacDeclareInstances of - reference list * int option (* instance names, priority *) + (reference * hint_info_expr) list (* instances names, priorities and patterns *) | VernacDeclareClass of reference (* inductive or definition name *) |