diff options
| author |  herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2001-03-01 14:02:59 +0000 |
|---|---|---|
| committer | herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2001-03-01 14:02:59 +0000 |
| commit | 7b6ed1e95bef26f4ae85d7471985128c0dfdbc15 (patch) | |
| tree | a2beab552c8e57d5db2833494e5cc79e6374cc84 /proofs | |
| parent | 2a9a43be51ac61e04ebf3fce902899155b48057f (diff) | |
Déplacement de qualid dans Nametab, hors du noyau
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@1419 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'proofs')
| -rw-r--r-- | proofs/proof_trees.ml | 2 | ||||
| -rw-r--r-- | proofs/proof_type.ml | 2 | ||||
| -rw-r--r-- | proofs/proof_type.mli | 2 | ||||
| -rw-r--r-- | proofs/tacinterp.ml | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/proofs/proof_trees.ml b/proofs/proof_trees.ml index 8a655b3da..4a8f8dfc6 100644 --- a/proofs/proof_trees.ml +++ b/proofs/proof_trees.ml @@ -389,7 +389,7 @@ let ast_of_cvt_redexp = function (* Gives the ast corresponding to a tactic argument *) let ast_of_cvt_arg = function | Identifier id -> nvar (string_of_id id) - | Qualid qid -> nvar (string_of_qualid qid) + | Qualid qid -> nvar (Nametab.string_of_qualid qid) | Quoted_string s -> str s | Integer n -> num n | Command c -> ope ("COMMAND",[c]) diff --git a/proofs/proof_type.ml b/proofs/proof_type.ml index 319b7ff4f..3f5dbaeea 100644 --- a/proofs/proof_type.ml +++ b/proofs/proof_type.ml @@ -88,7 +88,7 @@ and tactic_arg = | OpenConstr of ((int * constr) list * constr) (* constr with holes *) | Constr_context of constr | Identifier of identifier - | Qualid of qualid + | Qualid of Nametab.qualid | Integer of int | Clause of identifier list | Bindings of Coqast.t substitution diff --git a/proofs/proof_type.mli b/proofs/proof_type.mli index e49faeb58..3a9f32b63 100644 --- a/proofs/proof_type.mli +++ b/proofs/proof_type.mli @@ -120,7 +120,7 @@ and tactic_arg = | OpenConstr of ((int * constr) list * constr) (* constr with holes *) | Constr_context of constr | Identifier of identifier - | Qualid of qualid + | Qualid of Nametab.qualid | Integer of int | Clause of identifier list | Bindings of Coqast.t substitution diff --git a/proofs/tacinterp.ml b/proofs/tacinterp.ml index 9f68b896f..cd7252c44 100644 --- a/proofs/tacinterp.ml +++ b/proofs/tacinterp.ml @@ -185,7 +185,7 @@ let look_for_interp = Hashtbl.find interp_tab let glob_const_nvar loc env qid = try (* We first look for a variable of the current proof *) - match repr_qualid qid with + match Nametab.repr_qualid qid with | [],id -> (* lookup_value may raise Not_found *) (match Environ.lookup_named_value id env with @@ -201,10 +201,10 @@ let glob_const_nvar loc env qid = | VarRef sp when Environ.evaluable_named_decl (Global.env ()) (basename sp) -> EvalVarRef (basename sp) - | _ -> error ((string_of_qualid qid) ^ + | _ -> error ((Nametab.string_of_qualid qid) ^ " does not denote an evaluable constant") with Not_found -> - Pretype_errors.error_global_not_found_loc loc qid + Nametab.error_global_not_found_loc loc qid let qid_interp = function | Node (loc, "QUALIDARG", p) -> interp_qualid p |