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

Prepare for 5.2 AST bump #11

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Prepare for 5.2 AST bump #11

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
16 changes: 8 additions & 8 deletions src/ppx_jsobject_conv.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ module Attrs = struct
| Ptyp_tuple (_) | Ptyp_variant (_)
| Ptyp_object (_) | Ptyp_class (_)
| Ptyp_package(_) | Ptyp_any | Ptyp_var(_) | Ptyp_arrow(_)
| Ptyp_alias(_) | Ptyp_poly(_) | Ptyp_extension(_) -> err ()
| Ptyp_alias(_) | Ptyp_poly(_) | Ptyp_extension(_) | Ptyp_open(_) -> err ()
in true
| None -> false

Expand Down Expand Up @@ -126,7 +126,7 @@ module Attrs = struct
| Ptyp_tuple (_) | Ptyp_variant (_)
| Ptyp_object (_) | Ptyp_class (_)
| Ptyp_package(_) | Ptyp_any | Ptyp_var(_) | Ptyp_arrow(_)
| Ptyp_alias(_) | Ptyp_poly(_) | Ptyp_extension(_) -> ()
| Ptyp_alias(_) | Ptyp_poly(_) | Ptyp_extension(_) | Ptyp_open(_) -> ()
in v
| None -> None

Expand Down Expand Up @@ -170,7 +170,7 @@ module Fun_or_match = struct
let expr ~loc t =
match t with
| Fun f -> f
| Match cases -> pexp_function ~loc cases
| Match cases -> pexp_function_cases ~loc cases

let unroll ~loc e t =
match t with
Expand Down Expand Up @@ -339,7 +339,7 @@ module Jsobject_of_expander = struct
| Ptyp_package(_) ->
Location.raise_errorf ~loc "ppx_jsobject_conv: jsobject_of_type -- modules are not supported yet"
| Ptyp_any | Ptyp_arrow(_) | Ptyp_alias(_)
| Ptyp_poly(_) | Ptyp_extension(_) ->
| Ptyp_poly(_) | Ptyp_extension(_) | Ptyp_open(_) ->
Location.raise_errorf ~loc "ppx_jsobject_conv: jsobject_of_type -- Unsupported type"
(* Conversion of tuples *)
and jsobject_of_tuple ~loc tparams tps =
Expand Down Expand Up @@ -514,7 +514,7 @@ module Jsobject_of_expander = struct
let body' = match body with
| Fun_or_match.Fun fun_expr -> [%expr fun [%p input_pvar ~loc] ->
[%e fun_expr] [%e input_evar ~loc]]
| Fun_or_match.Match matchings -> pexp_function ~loc matchings
| Fun_or_match.Match matchings -> pexp_function_cases ~loc matchings
in
let body'' =
let _, eps = List.split tparams in
Expand Down Expand Up @@ -601,7 +601,7 @@ module Jsobject_of_expander = struct
let ev, pv = mk_ep_var ~loc "wildcard" in
let wild_match = pv -->
eapply ~loc previous_evar [ev] in
pexp_function ~loc (List.append matchings [wild_match])
pexp_function_cases ~loc (List.append matchings [wild_match])
| Fun_or_match.Fun _ ->
Location.raise_errorf ~loc "ppx_jsobject_conv: impossible state"
in
Expand Down Expand Up @@ -754,7 +754,7 @@ module Of_jsobject_expander = struct
| Ptyp_package(_) ->
Location.raise_errorf ~loc "ppx_jsobject_conv: type_of_jsobject -- modules are not supported yet"
| Ptyp_any | Ptyp_arrow(_) | Ptyp_alias(_)
| Ptyp_poly(_) | Ptyp_extension(_) ->
| Ptyp_poly(_) | Ptyp_extension(_) | Ptyp_open(_) ->
Location.raise_errorf ~loc "ppx_jsobject_conv: type_of_jsobject -- Unsupported type"
and tuple_of_jsobject ~loc tparams tps =
let fps = List.map ~f:(type_of_jsobject tparams) tps in
Expand Down Expand Up @@ -1108,7 +1108,7 @@ module Of_jsobject_expander = struct
let body' = match body with
| Fun_or_match.Fun fun_expr -> [%expr fun [%p input_pvar ~loc] ->
[%e fun_expr] [%e input_evar ~loc]]
| Fun_or_match.Match matchings -> pexp_function ~loc matchings
| Fun_or_match.Match matchings -> pexp_function_cases ~loc matchings
in
let body'' =
let _, eps = List.split tparams in
Expand Down