diff options
| author |  glondu <glondu@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2010-12-24 23:49:21 +0000 |
|---|---|---|
| committer | glondu <glondu@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2010-12-24 23:49:21 +0000 |
| commit | d33ced344ba377f0a4003102d77f880fda108fd7 (patch) | |
| tree | a8f7642bb599a08ada8b6392d0fa14f823e57e3c /pretyping/pattern.ml | |
| parent | 6ebd4c4ad28d46965623e72d8654c36fcc6fe9b0 (diff) | |
More {raw => glob} changes for consistency
perl -pi -e 's/(\W|_)raw((?:sort|_prop|terms?|_branch|_red_flag|pat
tern|_constr_of|_of_pat)(?:\W|_))/\1glob_\2/g;s/glob__/glob_/g;s/(\
W)R((?:Prop|Type|Fix|CoFix|StructRec|WfRec|MeasureRec)\W)/\1G\2/g;s
/glob_terms?/glob_constr/g' **/*.ml*
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@13756 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'pretyping/pattern.ml')
| -rw-r--r-- | pretyping/pattern.ml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pretyping/pattern.ml b/pretyping/pattern.ml index 19c5d156a..50dd413c6 100644 --- a/pretyping/pattern.ml +++ b/pretyping/pattern.ml @@ -36,7 +36,7 @@ type constr_pattern = | PLambda of name * constr_pattern * constr_pattern | PProd of name * constr_pattern * constr_pattern | PLetIn of name * constr_pattern * constr_pattern - | PSort of rawsort + | PSort of glob_sort | PMeta of patvar option | PIf of constr_pattern * constr_pattern * constr_pattern | PCase of (case_style * int array * inductive option * (int * int) option) @@ -92,8 +92,8 @@ let pattern_of_constr sigma t = | Rel n -> PRel n | Meta n -> PMeta (Some (id_of_string ("META" ^ string_of_int n))) | Var id -> PVar id - | Sort (Prop c) -> PSort (RProp c) - | Sort (Type _) -> PSort (RType None) + | Sort (Prop c) -> PSort (GProp c) + | Sort (Type _) -> PSort (GType None) | Cast (c,_,_) -> pattern_of_constr c | LetIn (na,c,_,b) -> PLetIn (na,pattern_of_constr c,pattern_of_constr b) | Prod (na,c,b) -> PProd (na,pattern_of_constr c,pattern_of_constr b) @@ -300,7 +300,7 @@ let rec pat_of_raw metas vars = function | (_,_,[PatCstr(_,(ind,_),_,_)],_)::_ -> Some ind | _ -> None in let cbrs = - Array.init (List.length brs) (pat_of_raw_branch loc metas vars ind brs) + Array.init (List.length brs) (pat_of_glob_branch loc metas vars ind brs) in let cstr_nargs,brs = (Array.map fst cbrs, Array.map snd cbrs) in PCase ((sty,cstr_nargs,ind,ind_nargs), pred, @@ -310,7 +310,7 @@ let rec pat_of_raw metas vars = function let loc = loc_of_glob_constr r in user_err_loc (loc,"pattern_of_glob_constr", Pp.str"Non supported pattern.") -and pat_of_raw_branch loc metas vars ind brs i = +and pat_of_glob_branch loc metas vars ind brs i = let bri = List.filter (function (_,_,[PatCstr(_,c,lv,Anonymous)],_) -> snd c = i+1 |