aboutsummaryrefslogtreecommitdiff
path: root/tactics
diff options
context:
space:
mode:
authorherbelin2003-04-14 12:23:39 +0000
committerherbelin2003-04-14 12:23:39 +0000
commit1de052a2415a70bf4e06be02bff60bee19c013cb (patch)
treec5afa755dfaae324547f5b95face4047e4991501 /tactics
parent00f11e6869b8f3964e6c3ecad5b67800b6853ed7 (diff)
Localisation des appels de tactiques définies sans arguments
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@3922 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'tactics')
-rw-r--r--tactics/tacinterp.ml14
1 files changed, 7 insertions, 7 deletions
diff --git a/tactics/tacinterp.ml b/tactics/tacinterp.ml
index 514557d349..a582202387 100644
--- a/tactics/tacinterp.ml
+++ b/tactics/tacinterp.ml
@@ -369,12 +369,12 @@ let intern_global_reference ist = function
let intern_tac_ref ist = function
| Ident (loc,id) when find_ltacvar id ist -> ArgVar (loc,id)
| Ident (loc,id) ->
- ArgArg
- (try find_recvar id ist
+ ArgArg (loc,
+ try find_recvar id ist
with Not_found -> locate_tactic (make_short_qualid id))
| r ->
let (loc,qid) = qualid_of_reference r in
- ArgArg (locate_tactic qid)
+ ArgArg (loc,locate_tactic qid)
let intern_tactic_reference ist r =
try intern_tac_ref ist r
@@ -726,8 +726,8 @@ and intern_tacarg strict ist = function
let id = id_of_string s in
if find_ltacvar id ist then Reference (ArgVar (dummy_loc,strip_meta id))
else error_syntactic_metavariables_not_allowed loc
- | TacCall (_loc,f,l) ->
- TacCall (_loc,
+ | TacCall (loc,f,l) ->
+ TacCall (loc,
intern_tactic_reference ist f,
List.map (intern_tacarg !strict_check ist) l)
| Tacexp t -> Tacexp (intern_tactic ist t)
@@ -1280,8 +1280,8 @@ and eval_tactic ist = function
and interp_ltac_reference isapplied ist gl = function
| ArgVar (loc,id) -> unrec (List.assoc id ist.lfun)
- | ArgArg qid ->
- let v = val_interp {lfun=[];lmatch=[];debug=ist.debug} gl (lookup qid) in
+ | ArgArg (loc,r) ->
+ let v = val_interp {lfun=[];lmatch=[];debug=ist.debug} gl (lookup r) in
if isapplied then v else locate_tactic_call loc v
and interp_tacarg ist gl = function