diff options
| author |  Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2017-06-08 16:19:27 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2017-06-08 16:38:47 +0200 |
| commit | 3e1f527a50142a5c73ead24e3fcdb6e2ac9f50e5 (patch) | |
| tree | 64c82d234919fbf76134d2d7b4833047813711a9 /tactics | |
| parent | 102d7418e399de646b069924277e4baea1badaca (diff) | |
| parent | ce1e1dba837ad6e2c79ff7e531b5e3adea3cd327 (diff) | |
Merge branch 'v8.6'
Diffstat (limited to 'tactics')
| -rw-r--r-- | tactics/class_tactics.ml | 1 | ||||
| -rw-r--r-- | tactics/tacticals.ml | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tactics/class_tactics.ml b/tactics/class_tactics.ml index de49a521f..4bde427b1 100644 --- a/tactics/class_tactics.ml +++ b/tactics/class_tactics.ml @@ -603,6 +603,7 @@ let make_hints g st only_classes sign = List.fold_left (fun hints hyp -> let consider = + not only_classes || try let t = hyp |> NamedDecl.get_id |> Global.lookup_named |> NamedDecl.get_type in (* Section variable, reindex only if the type changed *) not (EConstr.eq_constr (project g) (EConstr.of_constr t) (NamedDecl.get_type hyp)) diff --git a/tactics/tacticals.ml b/tactics/tacticals.ml index aa574e41c..4101dc23e 100644 --- a/tactics/tacticals.ml +++ b/tactics/tacticals.ml @@ -468,6 +468,7 @@ module New = struct let check_evars env sigma extsigma origsigma = let rec is_undefined_up_to_restriction sigma evk = + if Evd.mem origsigma evk then None else let evi = Evd.find sigma evk in match Evd.evar_body evi with | Evd.Evar_empty -> Some (evk,evi) @@ -481,7 +482,7 @@ module New = struct let rest = Evd.fold_undefined (fun evk evi acc -> match is_undefined_up_to_restriction sigma evk with - | Some (evk',evi) when not (Evd.mem origsigma evk) -> (evk',evi)::acc + | Some (evk',evi) -> (evk',evi)::acc | _ -> acc) extsigma [] in |