From 33d54f6692446e6006f9b89d0dfd64408a4051fe Mon Sep 17 00:00:00 2001
From: herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7>
Date: Thu, 17 Nov 2011 22:19:36 +0000
Subject: Fixing bug #2640 and variants of it (inconsistency between when and
 how the names of an ltac expression are globalized - allowing the expression
 to be a constr and in some initial context - and when and how this ltac
 expression is interpreted - now expecting a pure tactic in a different
 context).

This incidentally found a Ltac bug in Ncring_polynom!

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14676 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 plugins/xml/dumptree.ml4      | 2 +-
 plugins/xml/proofTree2Xml.ml4 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/xml')

diff --git a/plugins/xml/dumptree.ml4 b/plugins/xml/dumptree.ml4
index 44a481f44..3c3e54fa3 100644
--- a/plugins/xml/dumptree.ml4
+++ b/plugins/xml/dumptree.ml4
@@ -42,7 +42,7 @@ let thin_sign osign sign =
 ;;
 
 let pr_tactic_xml = function
-  | TacArg (Tacexp t) -> str "<tactic cmd=\"" ++ xmlstream (Pptactic.pr_glob_tactic (Global.env()) t) ++ str "\"/>"
+  | TacArg (_,Tacexp t) -> str "<tactic cmd=\"" ++ xmlstream (Pptactic.pr_glob_tactic (Global.env()) t) ++ str "\"/>"
   | t -> str "<tactic cmd=\"" ++ xmlstream (Pptactic.pr_tactic (Global.env()) t) ++ str "\"/>"
 ;;
 
diff --git a/plugins/xml/proofTree2Xml.ml4 b/plugins/xml/proofTree2Xml.ml4
index b0e4fcc69..2f5eb6ac2 100644
--- a/plugins/xml/proofTree2Xml.ml4
+++ b/plugins/xml/proofTree2Xml.ml4
@@ -144,7 +144,7 @@ Pp.ppnl (Pp.(++) (Pp.str
          Proof2aproof.ProofTreeHash.find proof_tree_to_flattened_proof_tree node
         in begin
         match tactic_expr with
-        | T.TacArg (T.Tacexp _) ->
+        | T.TacArg (_,T.Tacexp _) ->
             (* We don't need to keep the level of abstraction introduced at *)
             (* user-level invocation of tactic... (see Tacinterp.hide_interp)*)
             aux flat_proof old_hyps
-- 
cgit v1.2.3