Skip to content

Ppx: switch ppx_deriving_json to ast 408 #849

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

Merged
merged 1 commit into from
Dec 10, 2019
Merged

Ppx: switch ppx_deriving_json to ast 408 #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion js_of_ocaml-ppx_deriving_json.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ depends: [
"dune" {>= "1.11.1"}
"js_of_ocaml"
"ocaml-migrate-parsetree"
"ppxlib" {< "0.9.0"}
"ppxlib" {>= "0.9.0"}
]
16 changes: 8 additions & 8 deletions ppx/ppx_deriving_json/lib/ppx_deriving_json.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

open StdLabels
open Migrate_parsetree
open OCaml_407.Ast
open OCaml_408.Ast
open Ast_helper
open Asttypes
open Parsetree
Expand Down Expand Up @@ -76,7 +76,7 @@ let fresh_var bound =
in
loop 0

module To_current = Migrate_parsetree.Convert (OCaml_407) (OCaml_current)
module To_current = Migrate_parsetree.Convert (OCaml_408) (OCaml_current)

let string_of_core_type typ : string =
let typ = { typ with ptyp_attributes = [] } in
Expand Down Expand Up @@ -243,8 +243,8 @@ and write_body_of_tuple_type l ~arg ~poly ~tag =
[%e e]]

and write_poly_case r ~arg ~poly =
match r with
| Parsetree.Rtag ({ txt = label; _ }, _, _, l) ->
match r.prf_desc with
| Parsetree.Rtag ({ txt = label; _ }, _, l) ->
let i = hash_variant label and n = List.length l in
let v = fresh_var [] in
let lhs = (if n = 0 then None else Some (pvar v)) |> Ast_helper.Pat.variant label
Expand Down Expand Up @@ -339,8 +339,8 @@ let recognize_case_of_constructor i l =
let recognize_body_of_poly_variant l ~loc =
let l =
let f x =
match x with
| Parsetree.Rtag ({ txt = label; _ }, _, _, l) ->
match x.prf_desc with
| Parsetree.Rtag ({ txt = label; _ }, _, l) ->
let i = hash_variant label in
recognize_case_of_constructor i l
| Rinherit { ptyp_desc = Ptyp_constr (lid, _); _ } ->
Expand All @@ -361,8 +361,8 @@ let maybe_tuple_type = function
| l -> Ast_helper.Typ.tuple l

let rec read_poly_case ?decl y x =
match x with
| Parsetree.Rtag ({ txt = label; _ }, _, _, l) -> (
match x.prf_desc with
| Parsetree.Rtag ({ txt = label; _ }, _, l) -> (
let i = hash_variant label |> pint in
match l with
| [] -> Ast_helper.Exp.case [%pat? `Cst [%p i]] (Ast_helper.Exp.variant label None)
Expand Down