From 1858d901456b6ead40454d550d4e22e28c7441d8 Mon Sep 17 00:00:00 2001
From: Nicolas Pouillard <np@nicolaspouillard.fr>
Date: Fri, 30 Jun 2006 07:24:45 +0000
Subject: [PATCH] Finish the match_case renaming and bootstrap

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7460 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
 camlp4/Camlp4/Sig/Camlp4Ast.ml             |   2 +-
 camlp4/Camlp4/Struct/Camlp4Ast.genmap.ml   |   4 ++--
 camlp4/Camlp4/Struct/Camlp4Ast.ml          |   4 ++--
 camlp4/Camlp4Filters/ExceptionTracer.ml    |   6 +++---
 camlp4/Camlp4Filters/GenerateMap.ml        |   6 +++---
 camlp4/Camlp4Filters/Tracer.ml             |   6 +++---
 camlp4/Camlp4Parsers/OCaml.ml              |   2 +-
 camlp4/Camlp4Parsers/OCamlQuotationBase.ml |   2 +-
 camlp4/Camlp4Parsers/OCamlr.ml             |   2 +-
 camlp4/boot/camlp4boot                     | Bin 1034298 -> 1034298 bytes
 10 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/camlp4/Camlp4/Sig/Camlp4Ast.ml b/camlp4/Camlp4/Sig/Camlp4Ast.ml
index 2ed6d5b21..c41b241d0 100644
--- a/camlp4/Camlp4/Sig/Camlp4Ast.ml
+++ b/camlp4/Camlp4/Sig/Camlp4Ast.ml
@@ -446,7 +446,7 @@ module type S = sig
   value wcAnd_of_list : list with_constr -> with_constr;
   value meApp_of_list : list module_expr -> module_expr;
   value mbAnd_of_list : list module_binding -> module_binding;
-  value asOr_of_list : list match_case -> match_case;
+  value mcOr_of_list : list match_case -> match_case;
   value idAcc_of_list : list ident -> ident;
   value idApp_of_list : list ident -> ident;
   value exSem_of_list : list expr -> expr;
diff --git a/camlp4/Camlp4/Struct/Camlp4Ast.genmap.ml b/camlp4/Camlp4/Struct/Camlp4Ast.genmap.ml
index 6a3356b99..8ba064b68 100644
--- a/camlp4/Camlp4/Struct/Camlp4Ast.genmap.ml
+++ b/camlp4/Camlp4/Struct/Camlp4Ast.genmap.ml
@@ -179,13 +179,13 @@ module Make (Loc : Sig.Loc.S)
         let _loc = loc_of_ident i in
         <:ident< $i$ $idApp_of_list is$ >> ];
 
-  value rec asOr_of_list =
+  value rec mcOr_of_list =
     fun
     [ [] -> <:match_case@ghost<>>
     | [x] -> x
     | [x::xs] ->
         let _loc = loc_of_match_case x in
-        <:match_case< $x$ | $asOr_of_list xs$ >> ];
+        <:match_case< $x$ | $mcOr_of_list xs$ >> ];
 
   value rec mbAnd_of_list =
     fun
diff --git a/camlp4/Camlp4/Struct/Camlp4Ast.ml b/camlp4/Camlp4/Struct/Camlp4Ast.ml
index 0f03f09cd..996de4745 100644
--- a/camlp4/Camlp4/Struct/Camlp4Ast.ml
+++ b/camlp4/Camlp4/Struct/Camlp4Ast.ml
@@ -534,12 +534,12 @@ module Make (Loc : Sig.Loc.S) : Sig.Camlp4Ast.S with module Loc = Loc =
       | [ i ] -> i
       | [ i :: is ] ->
           let _loc = loc_of_ident i in Ast.IdApp _loc i (idApp_of_list is) ];
-    value rec asOr_of_list =
+    value rec mcOr_of_list =
       fun
       [ [] -> Ast.McNil ghost
       | [ x ] -> x
       | [ x :: xs ] ->
-          let _loc = loc_of_match_case x in Ast.McOr _loc x (asOr_of_list xs) ];
+          let _loc = loc_of_match_case x in Ast.McOr _loc x (mcOr_of_list xs) ];
     value rec mbAnd_of_list =
       fun
       [ [] -> Ast.MbNil ghost
diff --git a/camlp4/Camlp4Filters/ExceptionTracer.ml b/camlp4/Camlp4Filters/ExceptionTracer.ml
index ea91d0919..21c930162 100644
--- a/camlp4/Camlp4Filters/ExceptionTracer.ml
+++ b/camlp4/Camlp4Filters/ExceptionTracer.ml
@@ -43,17 +43,17 @@ module Make (AstFilters : Camlp4.Sig.AstFilters.S) = struct
             raise exc
           } ] >>;
 
-  value rec map_match_rule =
+  value rec map_match_case =
     fun
     [ <:match_case@_loc< $m1$ | $m2$ >> ->
-        <:match_case< $map_match_rule m1$ | $map_match_rule m2$ >>
+        <:match_case< $map_match_case m1$ | $map_match_case m2$ >>
     | <:match_case@_loc< $p$ when $w$ -> $e$ >> ->
         <:match_case@_loc< $p$ when $w$ -> $add_debug_expr e$ >>
     | m -> m ]
 
   and map_expr =
     fun
-    [ <:expr@_loc< fun [ $m$ ] >> -> <:expr< fun [ $map_match_rule m$ ] >>
+    [ <:expr@_loc< fun [ $m$ ] >> -> <:expr< fun [ $map_match_case m$ ] >>
     | x -> x ];
 
   register_str_item_filter (new Ast.c_expr map_expr)#str_item;
diff --git a/camlp4/Camlp4Filters/GenerateMap.ml b/camlp4/Camlp4Filters/GenerateMap.ml
index d2087ed26..3d298d3ca 100644
--- a/camlp4/Camlp4Filters/GenerateMap.ml
+++ b/camlp4/Camlp4Filters/GenerateMap.ml
@@ -187,10 +187,10 @@ module Make (AstFilters : Camlp4.Sig.AstFilters.S) = struct
         patt_of_constructor t2 (patt_of_constructor t1 (i, acc))
     | _ -> (succ i, <:patt< $acc$ $lid:xi i$ >>) ]
 
-  and match_rule_of_sum_type =
+  and match_case_of_sum_type =
     fun
     [ <:ctyp< $t1$ | $t2$ >> ->
-         <:match_case< $match_rule_of_sum_type t1$ | $match_rule_of_sum_type t2$ >>
+         <:match_case< $match_case_of_sum_type t1$ | $match_case_of_sum_type t2$ >>
     | <:ctyp< $uid:s$ of $t$ >> ->
          <:match_case< $pat:snd (patt_of_constructor t (0, <:patt< $uid:s$ >>))$
                -> $snd (expr_of_constructor t (0, <:expr< $uid:s$ >>))$ >>
@@ -217,7 +217,7 @@ module Make (AstFilters : Camlp4.Sig.AstFilters.S) = struct
   and fun_of_ctyp =
     fun
     [ <:ctyp< [ $t$ ] >> ->
-        <:expr< fun [ $match_rule_of_sum_type t$ ] >>
+        <:expr< fun [ $match_case_of_sum_type t$ ] >>
     | <:ctyp< { $t$ } >> ->
         <:expr< fun { $record_patt_of_type t$ } -> { $record_binding_of_type t$ } >>
     | <:ctyp< ( $tup:t$ ) >> -> mk_tuple expr_of_ty t
diff --git a/camlp4/Camlp4Filters/Tracer.ml b/camlp4/Camlp4Filters/Tracer.ml
index 1324a6890..a34461a90 100644
--- a/camlp4/Camlp4Filters/Tracer.ml
+++ b/camlp4/Camlp4Filters/Tracer.ml
@@ -38,17 +38,17 @@ module Make (AstFilters : Camlp4.Sig.AstFilters.S) = struct
                     else ();
                     $e$ } >>;
 
-  value rec map_match_rule =
+  value rec map_match_case =
     fun
     [ <:match_case@_loc< $m1$ | $m2$ >> ->
-        <:match_case< $map_match_rule m1$ | $map_match_rule m2$ >>
+        <:match_case< $map_match_case m1$ | $map_match_case m2$ >>
     | <:match_case@_loc< $p$ when $w$ -> $e$ >> ->
         <:match_case@_loc< $p$ when $w$ -> $add_debug_expr e$ >>
     | m -> m ]
 
   and map_expr =
     fun
-    [ <:expr@_loc< fun [ $m$ ] >> -> <:expr< fun [ $map_match_rule m$ ] >>
+    [ <:expr@_loc< fun [ $m$ ] >> -> <:expr< fun [ $map_match_case m$ ] >>
     | x -> x ];
 
   register_str_item_filter (new Ast.c_expr map_expr)#str_item;
diff --git a/camlp4/Camlp4Parsers/OCaml.ml b/camlp4/Camlp4Parsers/OCaml.ml
index f8ebaeffc..32c2eded5 100644
--- a/camlp4/Camlp4Parsers/OCaml.ml
+++ b/camlp4/Camlp4Parsers/OCaml.ml
@@ -594,7 +594,7 @@ module Make (Syntax : Sig.Camlp4Syntax.S) = struct
         | i = a_UIDENT; "."; j = SELF -> <:ident< $uid:i$.$j$ >> ] ]
     ;
     match_case:
-      [ [ l = LIST1 match_case0 SEP "|" -> Ast.asOr_of_list l ] ]
+      [ [ l = LIST1 match_case0 SEP "|" -> Ast.mcOr_of_list l ] ]
     ;
     (* Patterns *)
     patt:
diff --git a/camlp4/Camlp4Parsers/OCamlQuotationBase.ml b/camlp4/Camlp4Parsers/OCamlQuotationBase.ml
index 36beac0a0..08fe1d3f7 100644
--- a/camlp4/Camlp4Parsers/OCamlQuotationBase.ml
+++ b/camlp4/Camlp4Parsers/OCamlQuotationBase.ml
@@ -105,7 +105,7 @@ module Make (Syntax : Sig.Camlp4Syntax.S)
             | "listident" -> <:expr< Ast.idAcc_of_list $e$ >>
             | "listctypand" -> <:expr< Ast.tyAnd_of_list $e$ >>
             | "listwith_constr" -> <:expr< Ast.wcAnd_of_list $e$ >>
-            | "listmatch_case" -> <:expr< Ast.asOr_of_list $e$ >>
+            | "listmatch_case" -> <:expr< Ast.mcOr_of_list $e$ >>
             | "listpatt;" -> <:expr< Ast.paSem_of_list $e$ >>
             | "antisig_item" -> <:expr< Ast.SgAnt $mloc _loc$ $e$ >>
             | "antistr_item" -> <:expr< Ast.StAnt $mloc _loc$ $e$ >>
diff --git a/camlp4/Camlp4Parsers/OCamlr.ml b/camlp4/Camlp4Parsers/OCamlr.ml
index ae03ec7ec..2138405a0 100644
--- a/camlp4/Camlp4Parsers/OCamlr.ml
+++ b/camlp4/Camlp4Parsers/OCamlr.ml
@@ -654,7 +654,7 @@ Old (no more supported) syntax:
         | ":>"; t = ctyp; "="; e = expr -> <:expr< ($e$ :> $t$) >> ] ]
     ;
     match_case:
-      [ [ l = LIST0 match_case0 SEP "|" -> Ast.asOr_of_list l ] ]
+      [ [ l = LIST0 match_case0 SEP "|" -> Ast.mcOr_of_list l ] ]
     ;
     match_case0:
       [ [ `ANTIQUOT ("match_case"|"list" as n) s ->
diff --git a/camlp4/boot/camlp4boot b/camlp4/boot/camlp4boot
index e05679adf208cfe3d9c71fca0a328dcf2c63f534..0a5c173fbf4fd1e3d045589a559b6706e9e5f4da 100755
GIT binary patch
delta 1425
zcmZ`(drVtZ7~gmAIa_({Yqr6(QoOWd1IM70G03n3=k*W3g*}qRXJ~D^wkx`BmIXGn
z=&nY@NOjR;)F}y>3M$+sxVx}N3}CbplPSKlnEk<w(FikciDu$FrzO}pOwKvK$M@au
z-1Ep8jn|FF>$)`1Bu&<cMzy8dGR>rAXqj4;maXMz%STXi!Fu+T3(KI|7;)i20yW0^
zt!Q5cwMKIT4#?2M{=6F}<#(E@88qQa<NIxxZ_3@MI312n<-Aoo6o+H;M#tu=nwM+Q
zY83BAR|Y%RjhR_#A$F(*H<(IPok*~BEgNn@3uLiR1uS6|d$5R-)j+Q#>1tx*R8<t6
z6ak%1l44HS<uI<IWP_kSH*PUa^Kw-{kFr5GTJAZ@l?!NZGQVCBo!kMmC#h9IbaEF^
zO;zlzAzyOPNuw}y(gd`N`)$JKgHE;!Lnk|ccCvgAT1=f>-3zpxZ4s)SD-X~pb9>Nf
zigFbK8ey+`&}NEowI66Jn-Hp%s}7(+Hp9PL5mfu?>vi%Z(EGW61n6#Nc?ca@+f#lV
zXakFdu{1_r1A1r5JO<RI+V@4GqU)p&s54FW11(LHZvkDKCI^5jY4Saw7S$Hr$D2-u
zf#&kPN#Bi=K<4;=8PLcvJ#Z!!IGciV0@B0d|1~~IB_=p9j~7>x^FU?<%Y)BT#t%Re
ztk;VLaEc9i`86132`?6Mu==o!ECKSiU=`5EntfOWy#k!15J)#W?ZXneO;woHj}>GS
zkY<+e=Q%3d>Bka&p*#Ip2^Yj=T1VU<f0kllkS9{?AjoF~yA4jJjORdpKgn7cXMAnZ
zj!1HdukmuKQ+Na9Hy87dgZ!du3;B497lnNON1{A=5aedn9&L+=zEEPAyR1Bbx$JNN
zGsvlVc?&eKrU2i8bqm34&i@Wzf#qwEZ&hu@CI8lnc%ov43+!3|3$2$x&QRC1h8~S3
zhj@_)*Yfz!AYB(F6p5n}#G6|TmD_V58GIEB_n%6VaC9ok^GI&U$hg5-KA(&8Xy(XX
z3G%Zv#GF<t6$*zRYaW{oB835VHHf7!VAw+Vy0ZA=VN7+Si%1W9jTO)1mvXLiu@}a;
z_5ybOUo8F-`b*8fod31`$74hNlW_X+y>;Jx%;*?Sn!~?eDk!@C#Mara%!>yOKd_5k
z9K#RIXSY2))017<m~%v4b<?+3V@w~%R`YPl7qh>`5;c!Kvtvrxv;PDuoxnEp-dM#{
zPW9;J!Dk0YV&R?NuoDw_yE)PE?$Fqk19_2MfAvm}{E^4zCh!CEp|8g6WuxWC`#bM*
PKlqcg(HQ#(+ogX1J>S2t

delta 1371
zcmZvbeN0<b7{+~j&lzPf-Ueh-q_Zs$+u02Yf*T(jn!7B*CUay?)Pz=Ap+W?<(#W<9
zQ?H973pAVC>ktf)U;-g>m$6-)AK`1dub3qo7o8dtqf!50CPXtoK+kCjHqPXn^ZcIY
zy!YI5&%O72bj$hZmKQb9Oq!xGjcY5kB+aZPYb&)BEmd2krA?q#0d9J^0yn@$W1<4X
z3^p0}Ka4p^P;S&bf+GqXrQf&X6=kIQL4s<`FuvS@+2+h5TVX*#Nxo=>n{0)i(qd2P
z1D=y*Xf>RVV?{DKhjA74mEv90U5{3Ck*YHjtSF%Iddz}Mx-4ZSd7i~Q&ei~5jNuyQ
z5UAR0I?Dq-7XzmN`lT7~<ZQh}zZW-~=frZwzz1m5i&;+$2v-68RII*Ig3cZSej?^o
z2|C*fyhpX=v;_UJL1$Gm&{;L`ZjpD$TnswfDFdB72K+E(`!LIVShzai5!x(WL^vPt
zL*(^gq4|(-LE!tT&xa24e&O1IhiO*2uyCEg_tKoWE`6^$SXrsF2=IW&Ujpu>tY@$w
z<;i#+1zt;C&FJo8uLIu^4+ns6Q*&C|LbB^@5O{fl9RgmGVBZ2>kYGoEuS>9Fz;jhc
zs8uwbjRU_|oK50soCBUD_GLho(8P)N;}ajm<wGfn(=-1KF2)Nl2_attX0U6(Zb@1V
zH{!uJz&@qk23!l%^mc>z4Bn+n4QLl)_2UM12e8wUJTOW%ek_JlQVN+J*l~K#k1nN4
zwUIS|9##UZj<N%y=26-eKo=C#!2lM)5AtKWk9k449;aqdK8aHpl#e8>gUNVs6ci&y
z^(06<Td1=wHbiq91nL~#0A=L=@?lW=RY%Y-S~M@{4?G_d#iO9qsX3vJHrbb#7#At!
zH)19oXvAdp&XT<cYN@(WoPcL}GF9+mBd)c64vI^4I9>m))#eMyJA4I7Myw?3dqHY$
zOK@K(HbnDeMVTo1nI;?2&gMZ$CR-EUT|cFYbOB6L;yIT80B$nLMCT@DN!e``$+snG
zOSQP97NPW7lX#m`a#vPvvdcug*wu8i2|1jhUz^YkXADOW`)yD}u3^kIzB_{JnaQ`$
zNbkYV6xw<W^Nf^Z*tUd&Cvdmh(%<^G=8UvYmh^glo8S3$EAeT(VtM6{NaxuLLwebp
zd)l|}xp|PjoyJK^{;h2v_g!5a45#iMyLfHm)1=Q}i{(JgT+2}Ugw+TKy60={i{zfg
z4$ETiRr~QDy*IAUEc8A%_LN4aXR+K;b*}Z#zh14~)$-HjB$xZhFfGjDS<7^HPkw}T
Tocv<enG{Luu^H1B@CDO9P6n}H