Rename monadic -> bind

git-svn-id: http://caml.inria.fr/svn/ocaml/branches/monadic_let@13390 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

16 files changed, 26 insertions, 26 deletions

diff --git a/bytecomp/translcore.ml b/bytecomp/translcore.ml
index a80e71075f..5b1a1493bf 100644
--- a/bytecomp/translcore.ml
+++ b/bytecomp/translcore.ml
@@ -629,8 +629,8 @@ and transl_exp0 e =
       Lconst(Const_base cst)
   | Texp_let(rec_flag, pat_expr_list, body) ->
       transl_let rec_flag pat_expr_list (event_before body (transl_exp body))
-  | Texp_monadic(pat_expr_list, body) ->
-    transl_monadic pat_expr_list (event_before body (transl_exp body))
+  | Texp_bind(pat_expr_list, body) ->
+    transl_bind pat_expr_list (event_before body (transl_exp body))
   | Texp_function (_, pat_expr_list, partial) ->
       let ((kind, params), body) =
         event_function e
@@ -989,7 +989,7 @@ and transl_let rec_flag pat_expr_list body =
         (id, lam) in
       Lletrec(List.map2 transl_case pat_expr_list idlist, body)
 
-and transl_monadic pat_expr_list body =
+and transl_bind pat_expr_list body =
   let rec transl = function
         [] ->
           body
diff --git a/otherlibs/labltk/browser/searchpos.ml b/otherlibs/labltk/browser/searchpos.ml
index 9cbe068926..c2d334b019 100644
--- a/otherlibs/labltk/browser/searchpos.ml
+++ b/otherlibs/labltk/browser/searchpos.ml
@@ -745,7 +745,7 @@ and search_pos_expr ~pos exp =
         search_pos_expr exp' ~pos
       end;
       search_pos_expr exp ~pos
-  | Texp_monadic (expl, exp) ->
+  | Texp_bind (expl, exp) ->
       List.iter expl ~f:
       begin fun (pat, exp') ->
         search_pos_pat pat ~pos ~env:exp.exp_env;
diff --git a/parsing/ast_mapper.ml b/parsing/ast_mapper.ml
index 8eb499375c..8c40717544 100644
--- a/parsing/ast_mapper.ml
+++ b/parsing/ast_mapper.ml
@@ -258,7 +258,7 @@ module E = struct
   let ident ?loc a = mk ?loc (Pexp_ident a)
   let constant ?loc a = mk ?loc (Pexp_constant a)
   let let_ ?loc a b c = mk ?loc (Pexp_let (a, b, c))
-  let monadic ?loc a b = mk ?loc (Pexp_monadic (a, b))
+  let bind ?loc a b = mk ?loc (Pexp_bind (a, b))
   let function_ ?loc a b c = mk ?loc (Pexp_function (a, b, c))
   let apply ?loc a b = mk ?loc (Pexp_apply (a, b))
   let match_ ?loc a b = mk ?loc (Pexp_match (a, b))
@@ -300,7 +300,7 @@ module E = struct
     | Pexp_ident x -> ident ~loc (map_loc sub x)
     | Pexp_constant x -> constant ~loc x
     | Pexp_let (r, pel, e) -> let_ ~loc r (List.map (map_tuple (sub # pat) (sub # expr)) pel) (sub # expr e)
-    | Pexp_monadic (pel, e) -> monadic ~loc (List.map (map_tuple (sub # pat) (sub # expr)) pel) (sub # expr e)
+    | Pexp_bind (pel, e) -> bind ~loc (List.map (map_tuple (sub # pat) (sub # expr)) pel) (sub # expr e)
     | Pexp_function (lab, def, pel) -> function_ ~loc lab (map_opt (sub # expr) def) (List.map (map_tuple (sub # pat) (sub # expr)) pel)
     | Pexp_apply (e, l) -> apply ~loc (sub # expr e) (List.map (map_snd (sub # expr)) l)
     | Pexp_match (e, l) -> match_ ~loc (sub # expr e) (List.map (map_tuple (sub # pat) (sub # expr)) l)
diff --git a/parsing/parser.mly b/parsing/parser.mly
index 38c7a926c4..0f99c373c7 100644
--- a/parsing/parser.mly
+++ b/parsing/parser.mly
@@ -968,7 +968,7 @@ expr:
   | LET rec_flag let_bindings IN seq_expr
       { mkexp(Pexp_let($2, List.rev $3, $5)) }
   | LET STAR let_bindings IN seq_expr
-      { mkexp(Pexp_monadic ($3, $5)) }
+      { mkexp(Pexp_bind ($3, $5)) }
   | LET MODULE UIDENT module_binding IN seq_expr
       { mkexp(Pexp_letmodule(mkrhs $3 3, $4, $6)) }
   | LET OPEN mod_longident IN seq_expr
diff --git a/parsing/parsetree.mli b/parsing/parsetree.mli
index 7aaaa1679d..c0d29a2818 100644
--- a/parsing/parsetree.mli
+++ b/parsing/parsetree.mli
@@ -88,7 +88,7 @@ and expression_desc =
     Pexp_ident of Longident.t loc
   | Pexp_constant of constant
   | Pexp_let of rec_flag * (pattern * expression) list * expression
-  | Pexp_monadic of (pattern * expression) list * expression
+  | Pexp_bind of (pattern * expression) list * expression
   | Pexp_function of label * expression option * (pattern * expression) list
   | Pexp_apply of expression * (label * expression) list
   | Pexp_match of expression * (pattern * expression) list
diff --git a/parsing/printast.ml b/parsing/printast.ml
index 5361cd9ff3..389b0baa15 100644
--- a/parsing/printast.ml
+++ b/parsing/printast.ml
@@ -230,8 +230,8 @@ and expression i ppf x =
       line i ppf "Pexp_let %a\n" fmt_rec_flag rf;
       list i pattern_x_expression_def ppf l;
       expression i ppf e;
-  | Pexp_monadic (l, e) ->
-      line i ppf "Pexp_monadic\n" ;
+  | Pexp_bind (l, e) ->
+      line i ppf "Pexp_bind\n" ;
       list i pattern_x_expression_def ppf l;
       expression i ppf e;
   | Pexp_function (p, eo, l) ->
diff --git a/tools/depend.ml b/tools/depend.ml
index 56240928e1..96325fc60c 100644
--- a/tools/depend.ml
+++ b/tools/depend.ml
@@ -134,7 +134,7 @@ let rec add_expr bv exp =
   | Pexp_constant _ -> ()
   | Pexp_let(rf, pel, e) ->
       let bv = add_bindings rf bv pel in add_expr bv e
-  | Pexp_monadic(pel, e) ->
+  | Pexp_bind(pel, e) ->
       let bv = add_bindings Default bv pel in add_expr bv e
   | Pexp_function (_, opte, pel) ->
       add_opt add_expr bv opte; add_pat_expr_list bv pel
diff --git a/tools/ocamlprof.ml b/tools/ocamlprof.ml
index da9bcee941..2ca893228c 100644
--- a/tools/ocamlprof.ml
+++ b/tools/ocamlprof.ml
@@ -172,7 +172,7 @@ and rw_exp iflag sexp =
     rewrite_patexp_list iflag spat_sexp_list;
     rewrite_exp iflag sbody
 
-  | Pexp_monadic(spat_sexp_list, sbody) ->
+  | Pexp_bind(spat_sexp_list, sbody) ->
     rewrite_patexp_list iflag spat_sexp_list;
     rewrite_exp iflag sbody
 
diff --git a/tools/tast_iter.ml b/tools/tast_iter.ml
index 7fe2d8a750..099238cee0 100644
--- a/tools/tast_iter.ml
+++ b/tools/tast_iter.ml
@@ -97,7 +97,7 @@ let expression sub exp =
   | Texp_let (rec_flag, list, exp) ->
       sub # bindings (rec_flag, list);
       sub # expression exp
-  | Texp_monadic (list, exp) ->
+  | Texp_bind (list, exp) ->
       sub # bindings (Default, list);
       sub # expression exp
   | Texp_function (_, cases, _) ->
diff --git a/tools/untypeast.ml b/tools/untypeast.ml
index 07a169bcf7..217dcc4dc9 100644
--- a/tools/untypeast.ml
+++ b/tools/untypeast.ml
@@ -199,8 +199,8 @@ and untype_expression exp =
           List.map (fun (pat, exp) ->
               untype_pattern pat, untype_expression exp) list,
           untype_expression exp)
-    | Texp_monadic (list, exp) ->
-        Pexp_monadic (List.map (fun (pat, exp) ->
+    | Texp_bind (list, exp) ->
+        Pexp_bind (List.map (fun (pat, exp) ->
               untype_pattern pat, untype_expression exp) list,
           untype_expression exp)
     | Texp_function (label, cases, _) ->
diff --git a/typing/printtyped.ml b/typing/printtyped.ml
index ef15234bdc..e3abda2428 100644
--- a/typing/printtyped.ml
+++ b/typing/printtyped.ml
@@ -256,8 +256,8 @@ and expression i ppf x =
       line i ppf "Pexp_let %a\n" fmt_rec_flag rf;
       list i pattern_x_expression_def ppf l;
       expression i ppf e;
-  | Texp_monadic (l, e) ->
-      line i ppf "Pexp_monadic\n";
+  | Texp_bind (l, e) ->
+      line i ppf "Pexp_bind\n";
       list i pattern_x_expression_def ppf l;
       expression i ppf e;
   | Texp_function (p, l, _partial) ->
diff --git a/typing/typecore.ml b/typing/typecore.ml
index fb9cb2c6ae..2f2febc58b 100644
--- a/typing/typecore.ml
+++ b/typing/typecore.ml
@@ -123,7 +123,7 @@ let iter_expression f e =
         may expr eo; List.iter (fun (_, e) -> expr e) pel
     | Pexp_apply (e, lel) -> expr e; List.iter (fun (_, e) -> expr e) lel
     | Pexp_let (_, pel, e)
-    | Pexp_monadic (pel, e)
+    | Pexp_bind (pel, e)
     | Pexp_match (e, pel)
     | Pexp_try (e, pel) -> expr e; List.iter (fun (_, e) -> expr e) pel
     | Pexp_array el
@@ -1872,13 +1872,13 @@ and type_expect_ ?in_function env sexp ty_expected =
         exp_loc = loc; exp_extra = [];
         exp_type = body.exp_type;
         exp_env = env }
-  | Pexp_monadic(spat_sexp_list, sbody) ->
+  | Pexp_bind(spat_sexp_list, sbody) ->
       let (pat_exp_list, new_env, unpacks) =
         type_let env Default spat_sexp_list None true in
       let body =
         type_expect new_env (wrap_unpacks sbody unpacks) ty_expected in
       re {
-        exp_desc = Texp_monadic(pat_exp_list, body);
+        exp_desc = Texp_bind(pat_exp_list, body);
         exp_loc = loc; exp_extra = [];
         exp_type = body.exp_type;
         exp_env = env }
@@ -3394,7 +3394,7 @@ and type_function loc env ty_expected in_function lab caselist =
         exp_type = instance env (newgenty (Tarrow(lab, ty_arg, ty_res, Cok)));
         exp_env = env }
 
-and type_monadic ?(check = fun s -> Warnings.Unused_var s)
+and type_bind ?(check = fun s -> Warnings.Unused_var s)
              ?(check_strict = fun s -> Warnings.Unused_var_strict s)
     env spat_sexp_list scope allow =
   begin_def();
diff --git a/typing/typedtree.ml b/typing/typedtree.ml
index 327213ea46..b66c9d5c21 100644
--- a/typing/typedtree.ml
+++ b/typing/typedtree.ml
@@ -66,7 +66,7 @@ and expression_desc =
     Texp_ident of Path.t * Longident.t loc * Types.value_description
   | Texp_constant of constant
   | Texp_let of rec_flag * (pattern * expression) list * expression
-  | Texp_monadic of (pattern * expression) list * expression
+  | Texp_bind of (pattern * expression) list * expression
   | Texp_function of label * (pattern * expression) list * partial
   | Texp_apply of expression * (label * expression option * optional) list
   | Texp_match of expression * (pattern * expression) list * partial
diff --git a/typing/typedtree.mli b/typing/typedtree.mli
index e070bb3d03..43a6bfcb20 100644
--- a/typing/typedtree.mli
+++ b/typing/typedtree.mli
@@ -65,7 +65,7 @@ and expression_desc =
     Texp_ident of Path.t * Longident.t loc * Types.value_description
   | Texp_constant of constant
   | Texp_let of rec_flag * (pattern * expression) list * expression
-  | Texp_monadic of (pattern * expression) list * expression
+  | Texp_bind of (pattern * expression) list * expression
   | Texp_function of label * (pattern * expression) list * partial
   | Texp_apply of expression * (label * expression option * optional) list
   | Texp_match of expression * (pattern * expression) list * partial
diff --git a/typing/typedtreeIter.ml b/typing/typedtreeIter.ml
index bb6d64d3f1..fd2e82b7e6 100644
--- a/typing/typedtreeIter.ml
+++ b/typing/typedtreeIter.ml
@@ -243,7 +243,7 @@ module MakeIterator(Iter : IteratorArgument) : sig
         | Texp_let (rec_flag, list, exp) ->
             iter_bindings rec_flag list;
             iter_expression exp
-        | Texp_monadic (list, exp) ->
+        | Texp_bind (list, exp) ->
             iter_bindings_norec list;
             iter_expression exp
         | Texp_function (label, cases, _) ->
diff --git a/typing/typedtreeMap.ml b/typing/typedtreeMap.ml
index 13624de201..cf80516c43 100644
--- a/typing/typedtreeMap.ml
+++ b/typing/typedtreeMap.ml
@@ -236,8 +236,8 @@ module MakeMap(Map : MapArgument) = struct
           Texp_let (rec_flag,
                     map_bindings rec_flag list,
                     map_expression exp)
-        | Texp_monadic (list, exp) ->
-          Texp_monadic (map_bindings_norec list,
+        | Texp_bind (list, exp) ->
+          Texp_bind (map_bindings_norec list,
                         map_expression exp)
         | Texp_function (label, cases, partial) ->
           Texp_function (label, map_bindings Nonrecursive cases, partial)