diff options
| -rw-r--r-- | camlp4/etc/pr_o.ml | 3 | ||||
| -rw-r--r-- | camlp4/etc/pr_r.ml | 2 | ||||
| -rw-r--r-- | camlp4/meta/q_MLast.ml | 2 | ||||
| -rw-r--r-- | camlp4/ocaml_src/meta/q_MLast.ml | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/camlp4/etc/pr_o.ml b/camlp4/etc/pr_o.ml index 4d0fa0c1d..74eaba37b 100644 --- a/camlp4/etc/pr_o.ml +++ b/camlp4/etc/pr_o.ml @@ -1302,7 +1302,8 @@ pr_expr.pr_levels := [ <:expr< $lid:op$ $x$ $y$ >> as e -> fun curr next dg k -> match op with - [ "=" | "<>" | "<" | "<." | "<=" | ">" | ">=" | "==" | "!=" -> + [ "=" | "<>" | "<" | "<." | "<=" | ">" | ">=" | ">=." | "==" + | "!=" -> [: curr x "" [: `S LR op :]; `next y "" k :] | _ -> [: `next e "" k :] ] | e -> fun curr next dg k -> [: `next e dg k :] ]}; diff --git a/camlp4/etc/pr_r.ml b/camlp4/etc/pr_r.ml index 4becd8084..c187c7ac7 100644 --- a/camlp4/etc/pr_r.ml +++ b/camlp4/etc/pr_r.ml @@ -1209,7 +1209,7 @@ pr_expr.pr_levels := [ <:expr< $lid:op$ $x$ $y$ >> as e -> fun curr next _ k -> match op with - [ "<" | ">" | "<=" | ">=" | "=" | "<>" | "==" | "!=" -> + [ "<" | ">" | "<=" | ">=" | ">=." | "=" | "<>" | "==" | "!=" -> [: curr x "" [: `S LR op :]; `next y "" k :] | _ -> [: `next e "" k :] ] | e -> fun curr next _ k -> [: `next e "" k :] ]}; diff --git a/camlp4/meta/q_MLast.ml b/camlp4/meta/q_MLast.ml index b1a8a4e6b..75af1d72a 100644 --- a/camlp4/meta/q_MLast.ml +++ b/camlp4/meta/q_MLast.ml @@ -474,7 +474,7 @@ EXTEND type_declaration: [ [ n = lident; tpl = SLIST0 type_parameter; "="; tk = ctyp; cl = SLIST0 constrain -> - Tuple [n; tpl; tk; cl] ] ] + Tuple [Tuple [Loc; n]; tpl; tk; cl] ] ] ; constrain: [ [ "constraint"; t1 = ctyp; "="; t2 = ctyp -> Tuple [t1; t2] ] ] diff --git a/camlp4/ocaml_src/meta/q_MLast.ml b/camlp4/ocaml_src/meta/q_MLast.ml index 467a24849..009ec0d65 100644 --- a/camlp4/ocaml_src/meta/q_MLast.ml +++ b/camlp4/ocaml_src/meta/q_MLast.ml @@ -1881,7 +1881,7 @@ Grammar.extend Gramext.action (fun (cl : ast) (tk : 'ctyp) _ (tpl : ast) (n : 'lident) (loc : int * int) -> - (Tuple [n; tpl; tk; cl] : 'type_declaration))]]; + (Tuple [Tuple [Loc; n]; tpl; tk; cl] : 'type_declaration))]]; Grammar.Entry.obj (constrain : 'constrain Grammar.Entry.e), None, [None, None, [[Gramext.Stoken ("", "constraint"); |