diff options
| author | herbelin | 2009-05-10 18:11:16 +0000 |
|---|---|---|
| committer | herbelin | 2009-05-10 18:11:16 +0000 |
| commit | e66ba651bdd283dd490453f9d48b226730444726 (patch) | |
| tree | e18f9e72bf757b72d02c1cc37613933e1eca609c /tactics | |
| parent | 8654111ba8e98680aa7965468a82746352b362a7 (diff) | |
- Addition of "Hint Resolve ->" and "Hint Resolve <-" continued: it
revealed a too strict test for detection of inferable metas in
Clenv. Restored tolerance for unbound names in interactive tactic use.
- Moral removals of some captures of Not_found in Environ.evaluable_* since
kernel is assumed to deal with existing names.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12122 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'tactics')
| -rw-r--r-- | tactics/tacinterp.ml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tactics/tacinterp.ml b/tactics/tacinterp.ml index 8236f3e9e5..cbc1c6ce24 100644 --- a/tactics/tacinterp.ml +++ b/tactics/tacinterp.ml @@ -548,16 +548,16 @@ let short_name = function | AN (Ident (loc,id)) when not !strict_check -> Some (loc,id) | _ -> None -let interp_global_reference r = +let intern_evaluable_global_reference ist r = let lqid = qualid_of_reference r in - try locate_global_with_alias lqid + try evaluable_of_global_reference ist.genv (locate_global_with_alias lqid) with Not_found -> match r with - | Ident (loc,id) when not !strict_check -> VarRef id + | Ident (loc,id) when not !strict_check -> EvalVarRef id | _ -> error_global_not_found_loc lqid let intern_evaluable_reference_or_by_notation ist = function - | AN r -> evaluable_of_global_reference ist.genv (interp_global_reference r) + | AN r -> intern_evaluable_global_reference ist r | ByNotation (loc,ntn,sc) -> evaluable_of_global_reference ist.genv (Notation.interp_notation_as_global_reference loc |