From 6413ff1c4dd4b67d53fb15f82ca3dc0e129b7e38 Mon Sep 17 00:00:00 2001
From: letouzey
Date: Mon, 7 Nov 2011 18:59:02 +0000
Subject: Allow "|_=>_" in "match" in patterns, no more forced enumeration of
 constructors

 For instance, consider this inductive type:

    Inductive Ind := A | B | C | D.

 For detecting "match" on this type, one was forced earlier to write code
 in Ltac using "match goal" and/or "context [...]" and long patterns such as:

    match _ with A => _ | B => _ | C => _ | D => _ end

 After this patch, this pattern can be shortened in many alternative ways:

    match _ with A => _ | _ => _ end
    match _ with B => _ | _ => _ end
    match _ in Ind with _ => _ end

 Indeed, if we want to detect a "match" of a given type, we can either
 leave at least one branch where a constructor is explicit, or use a "in"
 annotation.

 Now, we can also detect any "match" regardless of its type:

   match _ with _ => _ end

 Note : this will even detect "match" over empty inductive types.
 Compatibility should be preserved, since "match _ with end" will
 continue to correspond only to empty inductive types.

 Internally, the constr_pattern PCase has changed quite a lot, a few elements
 are now grouped into a case_info_pattern record, while branches are now
 lists of given sub-patterns.

 NB: writing "match" with missing last branches in a constr pattern was actually
 tolerated by Pattern.pattern_of_glob_constr earlier, since the number of
 constructor per inductive is unknown there. And this was triggering an uncaught
 exception in a array_fold_left_2 in Matching later. Oups. At least this patch
 fixes this issue...

 Btw: the code in Pattern.pattern_of_glob_constr was quadratic in the number
 of branch in a match pattern. I doubt this was really a problem, but having now
 linear code instead cannot harm ;-)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14644 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 parsing/g_xml.ml4 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'parsing')

diff --git a/parsing/g_xml.ml4 b/parsing/g_xml.ml4
index 72634b08e7..c9e135edcf 100644
--- a/parsing/g_xml.ml4
+++ b/parsing/g_xml.ml4
@@ -170,9 +170,10 @@ let rec interp_xml_constr = function
       let ind = get_xml_inductive al in
       let p = interp_xml_patternsType x in
       let tm = interp_xml_inductiveTerm y in
-      let brs = List.map interp_xml_pattern yl in
-      let brns = Array.to_list (compute_branches_lengths ind) in
-      let mat = simple_cases_matrix_of_branches ind brns brs in
+      let vars = compute_branches_lengths ind in
+      let brs = list_map_i (fun i c -> (i,vars.(i),interp_xml_pattern c)) 0 yl
+      in
+      let mat = simple_cases_matrix_of_branches ind brs in
       let nparams,n = compute_inductive_nargs ind in
       let nal,rtn = return_type_of_predicate ind nparams n p in
       GCases (loc,RegularStyle,rtn,[tm,nal],mat)
-- 
cgit v1.2.3