Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix locations in generated lwt ppx #470

Merged
merged 3 commits into from
Sep 12, 2017
Merged

Fix locations in generated lwt ppx #470

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
403c0c4
Set the location of the generated body of "let%lwt" to location of th…
copy Sep 7, 2017
566b19a
Fix setting the location of the generated pattern of "let%wt"
copy Sep 7, 2017
a8a12d9
Mark ppx-generated wildcard pattern of "try%lwt" and "match%lwt" as g…
copy Sep 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/ppx/ppx_lwt.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ let add_wildcard_case cases =
List.exists is_catchall cases
in
if not has_wildcard
then cases @ [Exp.case [%pat? exn] [%expr Lwt.fail exn]]
then cases @ [Exp.case [%pat? exn] [%expr Lwt.fail exn]] [@metaloc Location.none]
else cases

(** {3 Internal names} *)
Expand All @@ -56,7 +56,7 @@ let gen_name i = lwt_prefix ^ string_of_int i
let gen_bindings l =
let aux i binding =
{ binding with
pvb_pat = (pvar (gen_name i)) [@metaloc binding.pvb_expr.pexp_loc]
pvb_pat = pvar ~loc:binding.pvb_expr.pexp_loc (gen_name i)
}
in
List.mapi aux l
Expand All @@ -68,10 +68,10 @@ let gen_binds e_loc l e =
| [] -> e
| binding :: t ->
let name = (* __ppx_lwt_$i, at the position of $x$ *)
(evar (gen_name i)) [@metaloc binding.pvb_expr.pexp_loc]
evar ~loc:binding.pvb_expr.pexp_loc (gen_name i)
in
let fun_ =
[%expr (fun [%p binding.pvb_pat] -> [%e aux (i+1) t])] [@metaloc binding.pvb_loc]
[%expr (fun [%p binding.pvb_pat] -> [%e aux (i+1) t])] [@metaloc e_loc]
in
let new_exp =
if !debug then
Expand Down