summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAlain Frisch <alain@frisch.fr>2013-04-17 09:46:52 +0000
committerAlain Frisch <alain@frisch.fr>2013-04-17 09:46:52 +0000
commitb36ec9f7644410df981d954aae686eaf3f59a590 (patch)
treeede621009ff1bd6fb99b93b658e49705a0310229 /tools
parent501dfd2b5e2425b2b40afe5ce9782503e68f8e22 (diff)
Get rid of the 'explicit arity' flag on Pexp_construct/Ppat_construct. If really requires (for camlp5?), the feature should be reimplemented with attributes.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/extension_points@13549 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'tools')
-rw-r--r--tools/addlabels.ml4
-rw-r--r--tools/depend.ml4
-rw-r--r--tools/eqparsetree.ml6
-rw-r--r--tools/ocamlprof.ml4
-rw-r--r--tools/tast_iter.ml4
-rw-r--r--tools/untypeast.ml8
6 files changed, 14 insertions, 16 deletions
diff --git a/tools/addlabels.ml b/tools/addlabels.ml
index c5ef65d6f..37e5625fe 100644
--- a/tools/addlabels.ml
+++ b/tools/addlabels.ml
@@ -65,7 +65,7 @@ let rec pattern_vars pat =
| Ppat_tuple l
| Ppat_array l ->
List.concat (List.map pattern_vars l)
- | Ppat_construct (_, Some pat, _)
+ | Ppat_construct (_, Some pat)
| Ppat_variant (_, Some pat)
| Ppat_constraint (pat, _) ->
pattern_vars pat
@@ -260,7 +260,7 @@ let rec add_labels_expr ~text ~values ~classes expr =
List.iter add_labels_rec (e :: List.map snd args)
| Pexp_tuple l | Pexp_array l ->
List.iter add_labels_rec l
- | Pexp_construct (_, Some e, _)
+ | Pexp_construct (_, Some e)
| Pexp_variant (_, Some e)
| Pexp_field (e, _)
| Pexp_constraint (e, _, _)
diff --git a/tools/depend.ml b/tools/depend.ml
index de42f5702..522ca5953 100644
--- a/tools/depend.ml
+++ b/tools/depend.ml
@@ -113,7 +113,7 @@ let rec add_pattern bv pat =
| Ppat_interval _
| Ppat_constant _ -> ()
| Ppat_tuple pl -> List.iter (add_pattern bv) pl
- | Ppat_construct(c, op, _) -> add bv c; add_opt add_pattern bv op
+ | Ppat_construct(c, op) -> add bv c; add_opt add_pattern bv op
| Ppat_record(pl, _) ->
List.iter (fun (lbl, p) -> add bv lbl; add_pattern bv p) pl
| Ppat_array pl -> List.iter (add_pattern bv) pl
@@ -143,7 +143,7 @@ let rec add_expr bv exp =
| Pexp_match(e, pel) -> add_expr bv e; add_cases bv pel
| Pexp_try(e, pel) -> add_expr bv e; add_cases bv pel
| Pexp_tuple el -> List.iter (add_expr bv) el
- | Pexp_construct(c, opte, _) -> add bv c; add_opt add_expr bv opte
+ | Pexp_construct(c, opte) -> add bv c; add_opt add_expr bv opte
| Pexp_variant(_, opte) -> add_opt add_expr bv opte
| Pexp_record(lblel, opte) ->
List.iter (fun (lbl, e) -> add bv lbl; add_expr bv e) lblel;
diff --git a/tools/eqparsetree.ml b/tools/eqparsetree.ml
index a684cfe40..1049d2cc4 100644
--- a/tools/eqparsetree.ml
+++ b/tools/eqparsetree.ml
@@ -231,10 +231,9 @@ let rec eq_pattern_desc : (pattern_desc * pattern_desc) -> 'result =
| (Ppat_constant a0, Ppat_constant b0) ->
Asttypes.eq_constant (a0, b0)
| (Ppat_tuple a0, Ppat_tuple b0) -> eq_list eq_pattern (a0, b0)
- | (Ppat_construct (a0, a1, a2), Ppat_construct (b0, b1, b2)) ->
+ | (Ppat_construct (a0, a1), Ppat_construct (b0, b1)) ->
((Asttypes.eq_loc Longident.eq_t (a0, b0)) &&
(eq_option eq_pattern (a1, b1)))
- && (eq_bool (a2, b2))
| (Ppat_variant (a0, a1), Ppat_variant (b0, b1)) ->
(Asttypes.eq_label (a0, b0)) && (eq_option eq_pattern (a1, b1))
| (Ppat_record (a0, a1), Ppat_record (b0, b1)) ->
@@ -685,10 +684,9 @@ and eq_expression_desc :
(eq_pattern (a0, b0)) && (eq_expression (a1, b1)))
(a1, b1))
| (Pexp_tuple a0, Pexp_tuple b0) -> eq_list eq_expression (a0, b0)
- | (Pexp_construct (a0, a1, a2), Pexp_construct (b0, b1, b2)) ->
+ | (Pexp_construct (a0, a1), Pexp_construct (b0, b1)) ->
((Asttypes.eq_loc Longident.eq_t (a0, b0)) &&
(eq_option eq_expression (a1, b1)))
- && (eq_bool (a2, b2))
| (Pexp_variant (a0, a1), Pexp_variant (b0, b1)) ->
(Asttypes.eq_label (a0, b0)) &&
(eq_option eq_expression (a1, b1))
diff --git a/tools/ocamlprof.ml b/tools/ocamlprof.ml
index cb17c06b4..2d348a93e 100644
--- a/tools/ocamlprof.ml
+++ b/tools/ocamlprof.ml
@@ -207,8 +207,8 @@ and rw_exp iflag sexp =
| Pexp_tuple sexpl ->
rewrite_exp_list iflag sexpl
- | Pexp_construct(_, None, _) -> ()
- | Pexp_construct(_, Some sarg, _) ->
+ | Pexp_construct(_, None) -> ()
+ | Pexp_construct(_, Some sarg) ->
rewrite_exp iflag sarg
| Pexp_variant(_, None) -> ()
diff --git a/tools/tast_iter.ml b/tools/tast_iter.ml
index 29ef9f72a..e352692f1 100644
--- a/tools/tast_iter.ml
+++ b/tools/tast_iter.ml
@@ -68,7 +68,7 @@ let pattern sub pat =
| Tpat_var _
| Tpat_constant _ -> ()
| Tpat_tuple l
- | Tpat_construct (_, _, l, _) -> List.iter (sub # pattern) l
+ | Tpat_construct (_, _, l) -> List.iter (sub # pattern) l
| Tpat_variant (_, po, _) -> opt (sub # pattern) po
| Tpat_record (l, _) -> List.iter (fun (_, _, pat) -> sub # pattern pat) l
| Tpat_array l -> List.iter (sub # pattern) l
@@ -104,7 +104,7 @@ let expression sub exp =
sub # cases cases
| Texp_tuple list ->
List.iter (sub # expression) list
- | Texp_construct (_, _, args, _) ->
+ | Texp_construct (_, _, args) ->
List.iter (sub # expression) args
| Texp_variant (_, expo) ->
opt (sub # expression) expo
diff --git a/tools/untypeast.ml b/tools/untypeast.ml
index 00fe20a11..ff74b88ef 100644
--- a/tools/untypeast.ml
+++ b/tools/untypeast.ml
@@ -176,7 +176,7 @@ and untype_pattern pat =
| Tpat_constant cst -> Ppat_constant cst
| Tpat_tuple list ->
Ppat_tuple (List.map untype_pattern list)
- | Tpat_construct (lid, _, args, explicit_arity) ->
+ | Tpat_construct (lid, _, args) ->
Ppat_construct (lid,
(match args with
[] -> None
@@ -185,7 +185,7 @@ and untype_pattern pat =
(Pat.tuple ~loc:pat.pat_loc
(List.map untype_pattern args)
)
- ), explicit_arity)
+ ))
| Tpat_variant (label, pato, _) ->
Ppat_variant (label, option untype_pattern pato)
| Tpat_record (list, closed) ->
@@ -244,7 +244,7 @@ and untype_expression exp =
Pexp_try (untype_expression exp, untype_cases cases)
| Texp_tuple list ->
Pexp_tuple (List.map untype_expression list)
- | Texp_construct (lid, _, args, explicit_arity) ->
+ | Texp_construct (lid, _, args) ->
Pexp_construct (lid,
(match args with
[] -> None
@@ -252,7 +252,7 @@ and untype_expression exp =
| args ->
Some
(Exp.tuple ~loc:exp.exp_loc (List.map untype_expression args))
- ), explicit_arity)
+ ))
| Texp_variant (label, expo) ->
Pexp_variant (label, option untype_expression expo)
| Texp_record (list, expo) ->
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-03-19 18:01:24 +0000