0005114: wrong location inside alias patterns

diff -ur ocaml-3.12.1/camlp4/boot/camlp4boot.ml ocaml-3.12.1-changed//camlp4/boot/camlp4boot.ml --- ocaml-3.12.1/camlp4/boot/camlp4boot.ml 2012-01-30 16:54:17.000000000 +0100 +++ ocaml-3.12.1-changed//camlp4/boot/camlp4boot.ml 2012-01-30 17:23:26.000000000 +0100 @@ -939,6 +939,8 @@ and module_longident_dot_lparen : 'module_longident_dot_lparen Gram.Entry.t = grammar_entry_create "module_longident_dot_lparen" + and single_uident : 'single_uident Gram.Entry.t = + grammar_entry_create "single_uident" and fun_def_cont_no_when : 'fun_def_cont_no_when Gram.Entry.t = grammar_entry_create "fun_def_cont_no_when" and fun_def_cont : 'fun_def_cont Gram.Entry.t = @@ -4982,14 +4984,17 @@ [ (None, None, [ ([ Gram.Snterm (Gram.Entry.obj - (a_UIDENT : 'a_UIDENT Gram.Entry.t)) ], + (single_uident : + 'single_uident Gram.Entry.t)) ], (Gram.Action.mk - (fun (s : 'a_UIDENT) (_loc : Gram.Loc.t) -> - (Ast.TyId (_loc, (Ast.IdUid (_loc, s))) : + (fun (id : 'single_uident) (_loc : Gram.Loc.t) + -> + (Ast.TyId (_loc, id) : 'constructor_declaration)))); ([ Gram.Snterm (Gram.Entry.obj - (a_UIDENT : 'a_UIDENT Gram.Entry.t)); + (single_uident : + 'single_uident Gram.Entry.t)); Gram.Skeyword "of"; Gram.Snterm (Gram.Entry.obj @@ -4997,10 +5002,8 @@ 'constructor_arg_list Gram.Entry.t)) ], (Gram.Action.mk (fun (t : 'constructor_arg_list) _ - (s : 'a_UIDENT) (_loc : Gram.Loc.t) -> - (Ast.TyOf (_loc, - (Ast.TyId (_loc, (Ast.IdUid (_loc, s)))), - t) : + (id : 'single_uident) (_loc : Gram.Loc.t) -> + (Ast.TyOf (_loc, (Ast.TyId (_loc, id)), t) : 'constructor_declaration)))); ([ Gram.Stoken (((function | QUOTATION _ -> true | _ -> false), @@ -5187,6 +5190,31 @@ (fun (i : 'a_LIDENT) (_loc : Gram.Loc.t) -> (i : 'a_ident)))) ]) ])) ()); + Gram.extend (single_uident : 'single_uident Gram.Entry.t) + ((fun () -> + (None, + [ (None, None, + [ ([ Gram.Snterm + (Gram.Entry.obj + (a_UIDENT : 'a_UIDENT Gram.Entry.t)) ], + (Gram.Action.mk + (fun (i : 'a_UIDENT) (_loc : Gram.Loc.t) -> + (Ast.IdUid (_loc, i) : 'single_uident)))); + ([ Gram.Stoken + (((function + | ANTIQUOT (("" | "id"), _) -> true + | _ -> false), + "ANTIQUOT ((\"\" | \"id\"), _)")) ], + (Gram.Action.mk + (fun (__camlp4_0 : Gram.Token.t) + (_loc : Gram.Loc.t) -> + match __camlp4_0 with + | ANTIQUOT ((("" | "id" as n)), s) -> + (Ast.IdAnt (_loc, + (mk_anti ~c: "ident" n s)) : + 'single_uident) + | _ -> assert false))) ]) ])) + ()); Gram.extend (ident : 'ident Gram.Entry.t) ((fun () -> (None, diff -ur ocaml-3.12.1/camlp4/boot/camlp4boot.ml.old ocaml-3.12.1-changed//camlp4/boot/camlp4boot.ml.old --- ocaml-3.12.1/camlp4/boot/camlp4boot.ml.old 2012-01-30 16:19:32.000000000 +0100 +++ ocaml-3.12.1-changed//camlp4/boot/camlp4boot.ml.old 2012-01-30 00:08:58.000000000 +0100 @@ -939,6 +939,8 @@ and module_longident_dot_lparen : 'module_longident_dot_lparen Gram.Entry.t = grammar_entry_create "module_longident_dot_lparen" + and single_uident : 'single_uident Gram.Entry.t = + grammar_entry_create "single_uident" and fun_def_cont_no_when : 'fun_def_cont_no_when Gram.Entry.t = grammar_entry_create "fun_def_cont_no_when" and fun_def_cont : 'fun_def_cont Gram.Entry.t = @@ -4982,14 +4984,17 @@ [ (None, None, [ ([ Gram.Snterm (Gram.Entry.obj - (a_UIDENT : 'a_UIDENT Gram.Entry.t)) ], + (single_uident : + 'single_uident Gram.Entry.t)) ], (Gram.Action.mk - (fun (s : 'a_UIDENT) (_loc : Gram.Loc.t) -> - (Ast.TyId (_loc, (Ast.IdUid (_loc, s))) : + (fun (id : 'single_uident) (_loc : Gram.Loc.t) + -> + (Ast.TyId (_loc, id) : 'constructor_declaration)))); ([ Gram.Snterm (Gram.Entry.obj - (a_UIDENT : 'a_UIDENT Gram.Entry.t)); + (single_uident : + 'single_uident Gram.Entry.t)); Gram.Skeyword "of"; Gram.Snterm (Gram.Entry.obj @@ -4997,10 +5002,8 @@ 'constructor_arg_list Gram.Entry.t)) ], (Gram.Action.mk (fun (t : 'constructor_arg_list) _ - (s : 'a_UIDENT) (_loc : Gram.Loc.t) -> - (Ast.TyOf (_loc, - (Ast.TyId (_loc, (Ast.IdUid (_loc, s)))), - t) : + (id : 'single_uident) (_loc : Gram.Loc.t) -> + (Ast.TyOf (_loc, (Ast.TyId (_loc, id)), t) : 'constructor_declaration)))); ([ Gram.Stoken (((function | QUOTATION _ -> true | _ -> false), @@ -5187,6 +5190,31 @@ (fun (i : 'a_LIDENT) (_loc : Gram.Loc.t) -> (i : 'a_ident)))) ]) ])) ()); + Gram.extend (single_uident : 'single_uident Gram.Entry.t) + ((fun () -> + (None, + [ (None, None, + [ ([ Gram.Snterm + (Gram.Entry.obj + (a_UIDENT : 'a_UIDENT Gram.Entry.t)) ], + (Gram.Action.mk + (fun (i : 'a_UIDENT) (_loc : Gram.Loc.t) -> + (Ast.IdUid (_loc, i) : 'single_uident)))); + ([ Gram.Stoken + (((function + | ANTIQUOT (("" | "id"), _) -> true + | _ -> false), + "ANTIQUOT ((\"\" | \"id\"), _)")) ], + (Gram.Action.mk + (fun (__camlp4_0 : Gram.Token.t) + (_loc : Gram.Loc.t) -> + match __camlp4_0 with + | ANTIQUOT ((("" | "id" as n)), s) -> + (Ast.IdAnt (_loc, + (mk_anti ~c: "ident" n s)) : + 'single_uident) + | _ -> assert false))) ]) ])) + ()); Gram.extend (ident : 'ident Gram.Entry.t) ((fun () -> (None, diff -ur ocaml-3.12.1/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml ocaml-3.12.1-changed//camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml --- ocaml-3.12.1/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml 2011-05-12 10:14:30.000000000 +0200 +++ ocaml-3.12.1-changed//camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml 2012-01-30 00:06:45.000000000 +0100 @@ -1119,10 +1119,10 @@ [ [ `ANTIQUOT (""|"typ" as n) s -> <:ctyp< $anti:mk_anti ~c:"ctyp" n s$ >> | `QUOTATION x -> Quotation.expand _loc x Quotation.DynAst.ctyp_tag - | s = a_UIDENT; "of"; t = constructor_arg_list -> - <:ctyp< $uid:s$ of $t$ >> - | s = a_UIDENT -> - <:ctyp< $uid:s$ >> + | id = single_uident; "of"; t = constructor_arg_list -> + <:ctyp< $id:id$ of $t$ >> + | id = single_uident -> + <:ctyp< $id:id$ >> ] ] ; constructor_arg_list: @@ -1153,6 +1153,11 @@ [ [ i = a_LIDENT -> i | i = a_UIDENT -> i ] ] ; + single_uident: + [ [ `ANTIQUOT (""|"id" as n) s -> + <:ident< $anti:mk_anti ~c:"ident" n s$ >> + | i = a_UIDENT -> <:ident< $uid:i$ >> ] ] + ; ident: [ [ `ANTIQUOT (""|"id"|"anti"|"list" as n) s -> <:ident< $anti:mk_anti ~c:"ident" n s$ >>

Notes
(0005622) Hendrik Tews (reporter) 2010-07-26 22:02	Same problem for "exception A of int". Here "A" gets the location of "A of int".

(0005623) Hendrik Tews (reporter) 2010-07-27 16:44	Same for "exception A of int" in interfaces or signatures.

(0005660) Hendrik Tews (reporter) 2010-09-16 16:29	Same for "type t = { a : int }". Here "a" gets the location of "a : int". If the field is "mutable a : int" then the location of "a" covers "mutable as well. Happens in interfaces and implementations.

(0005661) Hendrik Tews (reporter) 2010-09-16 16:50	Same for "class type virtual ['a] t = ... Here the location for t starts with "virtual". Happens also in interfaces for class types and classes.

(0005662) Hendrik Tews (reporter) 2010-09-16 17:13	Same for "class virtual ['a] t = ... in structures. Here the location of "t" starts with virtual.

(0005663) Hendrik Tews (reporter) 2010-09-16 17:25	Same for infix operators: for "let ( * ) ..." the location for "*" contains the parenthesis'.

(0006852) Hendrik Tews (reporter) 2012-01-30 22:03	Hi, I added a first patch that fixes the locations inside exceptions. I would invest some more time to fix the other issues as well, however, I would like to have some feedback before I proceed. The uploaded patch is a diff against the distributed version ocaml-3.12.1. However, the version 3.12.1 is not distributed with a fully bootstraped camlp4. Therefore, before applying the patch you first have to bootstrap camlp4 until the fixpoint is reached. Hendrik

(0007785) Hendrik Tews (reporter) 2012-07-20 11:07	I uploaded a new patch (against 4.00 branch) that fixes the problem for exceptions in structures and signatures (notes 5622 and 5623). This patch only contains the diff for the real parser sources and not for the generated code in camlp4/boot.

(0008103) doligez (manager) 2012-09-18 11:45	For infix operators, I think this is on purpose. The standard parser also does that, and more generally if an expression is enclosed in parentheses, its location includes the parentheses. We could discuss whether that is a good thing, but for the moment you might want to keep camlp4 as close as possible to the standard parser.

Issue History
Date Modified	Username	Field	Change
2010-07-25 14:40	Hendrik Tews	New Issue
2010-07-25 14:40	Hendrik Tews	Status	new => assigned
2010-07-25 14:40	Hendrik Tews	Assigned To	=> ertai
2010-07-26 22:02	Hendrik Tews	Note Added: 0005622
2010-07-27 16:44	Hendrik Tews	Note Added: 0005623
2010-09-16 16:29	Hendrik Tews	Note Added: 0005660
2010-09-16 16:50	Hendrik Tews	Note Added: 0005661
2010-09-16 17:13	Hendrik Tews	Note Added: 0005662
2010-09-16 17:25	Hendrik Tews	Note Added: 0005663
2011-10-26 08:38	ertai	Assigned To	ertai => xclerc
2012-01-30 21:49	Hendrik Tews	File Added: patch
2012-01-30 22:03	Hendrik Tews	Note Added: 0006852
2012-07-10 20:00	doligez	Target Version	=> 4.01.0+dev
2012-07-20 11:04	Hendrik Tews	File Added: new-patch
2012-07-20 11:07	Hendrik Tews	Note Added: 0007785
2012-07-31 13:36	doligez	Target Version	4.01.0+dev => 4.00.1+dev
2012-09-18 11:45	doligez	Note Added: 0008103
2012-09-18 13:01	doligez	Priority	normal => high
2012-09-18 13:01	doligez	Target Version	4.00.1+dev => 4.00.2+dev

Relationships