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

switch to ppxlib #30

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

switch to ppxlib #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f51616c
switch to ppxlib
pveber Sep 13, 2020
0ac020c
opam: update deps
pveber Sep 14, 2020
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 hdf5.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ depends: [
"dune" {build & >= "1.1.0"}
"ocaml" {>= "4.04"}
"ppx_inline_test"
"ppx_tools_versioned"
"ppxlib"
"stdio"
]
depexts: [
Expand Down
2 changes: 1 addition & 1 deletion src/ppx/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
(name ppx_h5struct)
(public_name hdf5.ppx)
(kind ppx_rewriter)
(libraries ppx_tools_versioned))
(libraries ppxlib))
134 changes: 60 additions & 74 deletions src/ppx/ppx_h5struct.cppo.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
open Migrate_parsetree
open Ast_406

open Ast_mapper
open Ppxlib
open Ast_helper
open Asttypes
open Parsetree
open Longident

module Type = struct
type t =
Expand Down Expand Up @@ -75,6 +69,7 @@ end
#define Nolabel ""
#define Pconst_string Const_string
#endif

let rec extract_fields expression =
match expression.pexp_desc with
| Pexp_sequence (expression1, expression2) ->
Expand All @@ -84,18 +79,18 @@ let rec extract_fields expression =
match id with
| Lident id -> id
| _ ->
raise (Location.Error (Location.error ~loc:pexp_loc (Printf.sprintf
Location.raise_errorf ~loc:pexp_loc
"[%%h5struct] invalid field %s, field identifiers must be simple"
(Longident.last id))))
(Longident.last_exn id)
in
begin match expressions with
| (_, name) :: (_, type_) :: expressions ->
let name =
match name.pexp_desc with
| Pexp_constant (Pconst_string (name, _)) -> name
| _ ->
raise (Location.Error (Location.error ~loc:name.pexp_loc (Printf.sprintf
"[%%h5struct] invalid field %s, field name must be a string constant" id)))
Location.raise_errorf ~loc:name.pexp_loc
"[%%h5struct] invalid field %s, field name must be a string constant" id
in
let type_, ocaml_type =
match type_ with
Expand All @@ -120,9 +115,9 @@ let rec extract_fields expression =
Type.String length
#endif
| _ ->
raise (Location.Error (Location.error ~loc (Printf.sprintf
Location.raise_errorf ~loc
"[%%h5struct] invalid field %s, field type String requires length"
id)))
id
in
type_, Longident.Lident "string"
| "Bigstring" -> a Bigstring
Expand All @@ -138,16 +133,14 @@ let rec extract_fields expression =
| "Array_nativeint" -> a Array_nativeint
| "Array_char" -> a Array_char
| _ ->
raise (Location.Error (Location.error ~loc (Printf.sprintf
"[%%h5struct] invalid field %s, unrecognized type %s" id type_)))
Location.raise_errorf ~loc "[%%h5struct] invalid field %s, unrecognized type %s" id type_
end
| _ ->
raise (Location.Error (Location.error ~loc (Printf.sprintf
"[%%h5struct] invalid field %s, field type must be simple" id)))
Location.raise_errorf ~loc "[%%h5struct] invalid field %s, field type must be simple" id
end
| _ ->
raise (Location.Error (Location.error ~loc:type_.pexp_loc (Printf.sprintf
"[%%h5struct] invalid field %s, field type must be a construct" id)))
Location.raise_errorf ~loc:type_.pexp_loc
"[%%h5struct] invalid field %s, field type must be a construct" id
in
let seek = ref false in
let default = ref None in
Expand All @@ -163,23 +156,22 @@ let rec extract_fields expression =
| Pexp_constant (Pconst_string (s, _)) -> Longident.Lident s
| Pexp_ident c -> c.txt
| _ ->
raise (Location.Error (Location.error ~loc:expression.pexp_loc
(Format.asprintf
"[%%h5struct] invalid field %s, unexpected type" id))))
Location.raise_errorf ~loc:expression.pexp_loc
"[%%h5struct] invalid field %s, unexpected type" id)
| _ ->
raise (Location.Error (Location.error ~loc:expression.pexp_loc (Format.asprintf
"[%%h5struct] invalid field %s, unexpected modifiers" id)))) expressions;
Location.raise_errorf ~loc:expression.pexp_loc
"[%%h5struct] invalid field %s, unexpected modifiers" id) expressions;
[ { Field.id; name; type_; ocaml_type = !ocaml_type; seek = !seek;
default = !default } ]
| _ ->
raise (Location.Error (Location.error ~loc:pexp_loc (Printf.sprintf
Location.raise_errorf ~loc:pexp_loc
"[%%h5struct] invalid field %s, exactly two arguments expected: name and type"
id)))
id
end
| _ ->
raise (Location.Error (Location.error ~loc:expression.pexp_loc
"[%h5struct] accepts a list of fields, \
e.g. [%h5struct time \"Time\" Int; price \"Price\" Float64]"))
Location.raise_errorf ~loc:expression.pexp_loc
"[%%h5struct] accepts a list of fields, \
e.g. [%%h5struct time \"Time\" Int; price \"Price\" Float64]"

let rec construct_fields_list fields loc =
match fields with
Expand Down Expand Up @@ -369,12 +361,12 @@ let construct_set_all_fields fields loc =
Vb.mk ~loc (Pat.var ~loc { txt = "_"; loc })
(Exp.ident ~loc { txt = Longident.Lident "set"; loc }) ] ]

let construct_size_dependent_fun name ~bsize ~index loc =
let construct_size_dependent_fun cname ~bsize ~index loc =
let call =
Exp.apply ~loc
(Exp.ident ~loc
{ loc; txt =
Longident.(Ldot (Ldot (Ldot (Lident "Hdf5_caml", "Struct"), "Ptr"), name)) })
Longident.(Ldot (Ldot (Ldot (Lident "Hdf5_caml", "Struct"), "Ptr"), cname)) })
(* It is hidden that [t] is of type [Struct.Ptr.t] so it's necessary to use
[Obj.magic] to access it. *)
( [ Nolabel, obj_magic ~loc (Exp.ident ~loc { txt = Longident.Lident "t"; loc }) ]
Expand All @@ -390,7 +382,7 @@ let construct_size_dependent_fun name ~bsize ~index loc =
#endif
in
[ Str.value ~loc Nonrecursive [
Vb.mk ~loc (Pat.var ~loc { txt = name; loc })
Vb.mk ~loc (Pat.var ~loc { txt = cname; loc })
(Exp.fun_ ~loc Nolabel None
(Pat.constraint_ ~loc
(Pat.var ~loc { txt = "t"; loc })
Expand All @@ -400,37 +392,27 @@ let construct_size_dependent_fun name ~bsize ~index loc =
else call )) ];
Str.value ~loc Nonrecursive [
Vb.mk ~loc (Pat.var ~loc { txt = "_"; loc })
(Exp.ident ~loc { txt = Longident.Lident name; loc }) ] ]
(Exp.ident ~loc { txt = Longident.Lident cname; loc }) ] ]

let map_structure_item mapper structure_item =
match structure_item with
| { pstr_desc = Pstr_extension (({txt = "h5struct"; _}, payload), attrs);
pstr_loc = loc } ->
let fields =
match payload with
| PStr [{ pstr_desc = Pstr_eval (expression, _); _ }] ->
extract_fields expression
| _ ->
raise (Location.Error (Location.error ~loc
"[%h5struct] accepts a list of fields, \
e.g. [%h5struct time \"Time\" Int; price \"Price\" Float64]"))
in
let include_ =
Str.include_ ~loc (
Incl.mk ~loc
(Mod.apply ~loc
(Mod.ident ~loc { loc; txt = Longident.(
Ldot (Ldot (Lident "Hdf5_caml", "Struct"), "Make")) })
(Mod.structure ~loc [
Str.value ~loc Nonrecursive [
Vb.mk ~loc (Pat.var ~loc { txt = "fields"; loc })
(construct_fields_list fields loc)]])))
in
let bsize = 8 *
List.fold_left (fun sum field -> sum + Type.wsize field.Field.type_) 0 fields in
let pos = ref 0 in
let functions =
List.mapi (fun column field ->
let h5struct_rewriter ~ctxt expression =
let loc = Expansion_context.Extension.extension_point_loc ctxt in
let fields = extract_fields expression in
let include_ =
Str.include_ ~loc (
Incl.mk ~loc
(Mod.apply ~loc
(Mod.ident ~loc { loc; txt = Longident.(
Ldot (Ldot (Lident "Hdf5_caml", "Struct"), "Make")) })
(Mod.structure ~loc [
Str.value ~loc Nonrecursive [
Vb.mk ~loc (Pat.var ~loc { txt = "fields"; loc })
(construct_fields_list fields loc)]])))
in
let bsize = 8 *
List.fold_left (fun sum field -> sum + Type.wsize field.Field.type_) 0 fields in
let pos = ref 0 in
let functions =
List.mapi (fun column field ->
let functions =
[ construct_field_get field column !pos loc;
construct_field_set field column !pos loc ]
Expand All @@ -455,17 +437,21 @@ let map_structure_item mapper structure_item =
functions) fields
|> List.concat
in
Str.include_ ~loc (Incl.mk ~loc ~attrs (Mod.structure ~loc (
include_ :: functions
@ (construct_set_all_fields fields loc)
@ (construct_size_dependent_fun "unsafe_next" ~bsize ~index:false loc)
@ (construct_size_dependent_fun "unsafe_prev" ~bsize ~index:false loc)
@ (construct_size_dependent_fun "unsafe_move" ~bsize ~index:true loc)
@ (construct_size_dependent_fun "next" ~bsize ~index:false loc)
@ (construct_size_dependent_fun "prev" ~bsize ~index:false loc)
@ (construct_size_dependent_fun "move" ~bsize ~index:true loc))))
| s -> default_mapper.structure_item mapper s
Str.include_ ~loc (Incl.mk ~loc (Mod.structure ~loc (
include_ :: functions
@ (construct_set_all_fields fields loc)
@ (construct_size_dependent_fun "unsafe_next" ~bsize ~index:false loc)
@ (construct_size_dependent_fun "unsafe_prev" ~bsize ~index:false loc)
@ (construct_size_dependent_fun "unsafe_move" ~bsize ~index:true loc)
@ (construct_size_dependent_fun "next" ~bsize ~index:false loc)
@ (construct_size_dependent_fun "prev" ~bsize ~index:false loc)
@ (construct_size_dependent_fun "move" ~bsize ~index:true loc))))

let h5struct_mapper _config _cookies = { default_mapper with structure_item = map_structure_item }
let extension =
Extension.V3.declare
"h5struct"
Extension.Context.Structure_item
Ast_pattern.(single_expr_payload __)
h5struct_rewriter

let () = Driver.register ~name:"h5struct" Versions.ocaml_406 h5struct_mapper
let () = Driver.register_transformation ~extensions:[ extension ] "h5struct"