Skip to content

Update to OCaml 4.11 AST #19

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
Sep 15, 2020
Merged

Update to OCaml 4.11 AST #19

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 ppx_blob.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build: [
depends: [
"ocaml"
"dune"
"ocaml-migrate-parsetree"
"ocaml-migrate-parsetree" {>= "1.7.0"}
"alcotest" {with-test}
]
synopsis: "Include a file as a string at compile time"
Expand Down
8 changes: 4 additions & 4 deletions src/ppx_blob.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
open Migrate_parsetree
open Ast_408
open Ast_411

let str ?loc ?attrs s = Ast_helper.Exp.constant ?loc ?attrs (Pconst_string (s, None))
let str ?loc ?attrs s = Ast_helper.Exp.constant ?loc ?attrs (Ast_helper.Const.string ?loc s)

let location_errorf ~loc =
Format.ksprintf (fun err ->
Expand Down Expand Up @@ -32,7 +32,7 @@ let mapper _config _cookies =
begin match pstr with
| PStr [{ pstr_desc =
Pstr_eval ({ pexp_loc = loc;
pexp_desc = Pexp_constant (Pconst_string (file_name, _));
pexp_desc = Pexp_constant (Pconst_string (file_name, _, _));
_ }, _);
_ }] ->
str (get_blob ~loc file_name)
Expand All @@ -44,5 +44,5 @@ let mapper _config _cookies =

let () =
Driver.register ~name:"ppx_blob"
Versions.ocaml_408
Versions.ocaml_411
mapper