diff options
| author | herbelin | 2006-01-09 22:00:34 +0000 |
|---|---|---|
| committer | herbelin | 2006-01-09 22:00:34 +0000 |
| commit | 4d37bb49bbeb640661748edc90904d2f9b299a74 (patch) | |
| tree | 1455338e56818d030325b6d2571b8ec2bd115fe1 /parsing | |
| parent | 865c375dc799b284e99f0408da80aed27553a55b (diff) | |
Suppression redondance coerce_to_id dans Pcoq et constrintern et déplacement dans Topconstr
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@7826 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'parsing')
| -rw-r--r-- | parsing/g_tactic.ml4 | 7 | ||||
| -rw-r--r-- | parsing/pcoq.ml4 | 7 | ||||
| -rw-r--r-- | parsing/pcoq.mli | 2 |
3 files changed, 4 insertions, 12 deletions
diff --git a/parsing/g_tactic.ml4 b/parsing/g_tactic.ml4 index 1807546688..d396854ba7 100644 --- a/parsing/g_tactic.ml4 +++ b/parsing/g_tactic.ml4 @@ -14,6 +14,7 @@ open Util open Tacexpr open Rawterm open Genarg +open Topconstr let compute = Cbv all_flags @@ -80,18 +81,18 @@ let mk_fix_tac (loc,id,bl,ann,ty) = (try list_index (snd x) ids with Not_found -> error "no such fix variable") | _ -> error "cannot guess decreasing argument of fix" in - (id,n,Topconstr.CProdN(loc,bl,ty)) + (id,n,CProdN(loc,bl,ty)) let mk_cofix_tac (loc,id,bl,ann,ty) = let _ = option_app (fun (aloc,_) -> Util.user_err_loc (aloc,"Constr:mk_cofix_tac", Pp.str"Annotation forbidden in cofix expression")) ann in - (id,Topconstr.CProdN(loc,bl,ty)) + (id,CProdN(loc,bl,ty)) (* Functions overloaded by quotifier *) let induction_arg_of_constr c = - try ElimOnIdent (Topconstr.constr_loc c,snd(coerce_to_id c)) + try ElimOnIdent (constr_loc c,snd(coerce_to_id c)) with _ -> ElimOnConstr c (* Auxiliary grammar rules *) diff --git a/parsing/pcoq.ml4 b/parsing/pcoq.ml4 index 9fc833b4d6..cb45a9f453 100644 --- a/parsing/pcoq.ml4 +++ b/parsing/pcoq.ml4 @@ -620,10 +620,3 @@ let coerce_reference_to_id = function str "This expression should be a simple identifier") let coerce_global_to_id = coerce_reference_to_id - -let coerce_to_id = function - | CRef (Ident (loc,id)) -> (loc,id) - | a -> user_err_loc - (constr_loc a,"coerce_to_id", - str "This expression should be a simple identifier") - diff --git a/parsing/pcoq.mli b/parsing/pcoq.mli index 87e0c24baa..46ecd11d24 100644 --- a/parsing/pcoq.mli +++ b/parsing/pcoq.mli @@ -178,5 +178,3 @@ val find_position : val remove_levels : int -> unit val coerce_global_to_id : reference -> identifier - -val coerce_to_id : constr_expr -> identifier located |