Ppx: switch to ast 408 (#826)

Author: hhugo

compiler/lib/js_output.ml

@@ -990,8 +990,8 @@ struct
           last_semi ();
           PP.end_group f;
           PP.end_group f
-          (* There MUST be a space between the return and its
-             argument. A line return will not work *)
+      (* There MUST be a space between the return and its
+       argument. A line return will not work *)
       )
     | Labelled_statement (i, s) ->
         PP.string f (Javascript.Label.to_string i);

js_of_ocaml-ppx.opam

@@ -16,7 +16,7 @@ build: [["dune" "build" "-p" name "-j" jobs]]
 depends: [
   "ocaml" {>= "4.02.0"}
   "dune" {build & >= "1.2"}
-  "ocaml-migrate-parsetree" {>= "1.3.1"}
-  "ppx_tools_versioned" {>= "5.2.2"}
+  "ocaml-migrate-parsetree" {>= "1.4"}
+  "ppx_tools_versioned" {>= "5.2.3"}
   "js_of_ocaml" {>= "3.0"}
 ]

js_of_ocaml.opam

@@ -18,8 +18,8 @@ build: [["dune" "build" "-p" name "-j" jobs]]
 depends: [
   "ocaml" {>= "4.02.0"}
   "dune" {build & >= "1.2"}
-  "ocaml-migrate-parsetree" {>= "1.3.1"}
-  "ppx_tools_versioned" {>= "5.2.2"}
+  "ocaml-migrate-parsetree" {>= "1.4"}
+  "ppx_tools_versioned" {>= "5.2.3"}
   "uchar"
   "js_of_ocaml-compiler"
 ]

ppx/ppx_js/lib/dune

@@ -6,7 +6,7 @@
              ocaml-migrate-parsetree)
   (ppx_runtime_libraries js_of_ocaml)
   (kind ppx_rewriter)
-  (preprocess (pps ppx_tools_versioned.metaquot_407)))
+  (preprocess (pps ppx_tools_versioned.metaquot_408)))
 
 
 (rule

ppx/ppx_js/lib/ppx_js.mli

@@ -18,4 +18,4 @@
 
 (**/**)
 
-val mapper : Migrate_parsetree.OCaml_407.Ast.Ast_mapper.mapper
+val mapper : Migrate_parsetree.OCaml_408.Ast.Ast_mapper.mapper

ppx/ppx_js/lib_internal/dune

@@ -3,4 +3,4 @@
   (libraries compiler-libs.common
              ocaml-migrate-parsetree)
   (kind ppx_rewriter)
-  (preprocess (pps ppx_tools_versioned.metaquot_407)))
+  (preprocess (pps ppx_tools_versioned.metaquot_408)))

ppx/ppx_js/lib_internal/ppx_js_internal.ml

@@ -18,7 +18,7 @@
 
 open StdLabels
 open Migrate_parsetree
-open OCaml_407.Ast
+open OCaml_408.Ast
 open Ast_helper
 open Asttypes
 open Parsetree
@@ -44,10 +44,6 @@ let tuple ?loc ?attrs = function
 
 let str ?loc ?attrs s = Exp.constant ?loc ?attrs (Pconst_string (s, None))
 
-module Pervasives = struct
-  let ( ! ) = ( ! )
-end
-
 (** Check if an expression is an identifier and returns it.
     Raise a Location.error if it's not.
 *)
@@ -87,7 +83,10 @@ let inside_Js =
    It turns out not to be working properly, just hiding location instead of the all
    ast node.
 *)
-let merlin_noloc = {txt = "merlin.loc"; loc = Location.none}, PStr []
+let merlin_noloc =
+  { attr_name = {txt = "merlin.loc"; loc = Location.none}
+  ; attr_payload = PStr []
+  ; attr_loc = Location.none }
 
 module Js : sig
   val type_ :
@@ -501,7 +500,10 @@ let preprocess_literal_object mappper fields : [`Fields of field_desc list | `Er
     | false, _ -> None
     | true, _ -> Some (`Unkown x)
   in
-  let jsoo_attributes = filter_map (fun ({txt; _}, _) -> parse_attribute txt) in
+  let jsoo_attributes =
+    filter_map (fun {attr_name = {txt; _}; attr_payload = _; attr_loc = _} ->
+        parse_attribute txt)
+  in
   let f (names, fields) exp =
     match exp.pcf_desc with
     | Pcf_val (id, mut, Cfk_concrete (bang, body)) ->
@@ -754,5 +756,5 @@ let mapper =
 let () =
   Driver.register
     ~name:"ppx_js"
-    Migrate_parsetree.Versions.ocaml_407
+    Migrate_parsetree.Versions.ocaml_408
     (fun _config _cookies -> mapper)

ppx/ppx_js/lib_internal/ppx_js_internal.mli

@@ -20,4 +20,4 @@
 
 val wrapper : string option ref
 
-val mapper : Migrate_parsetree.OCaml_407.Ast.Ast_mapper.mapper
+val mapper : Migrate_parsetree.OCaml_408.Ast.Ast_mapper.mapper

ppx/ppx_js/tests/main.ml

@@ -1,7 +1,7 @@
 let () =
   let module Converter =
     Migrate_parsetree.Versions.Convert
-      (Migrate_parsetree.OCaml_407)
+      (Migrate_parsetree.OCaml_408)
       (Migrate_parsetree.OCaml_current)
   in
   let mapper = Converter.copy_mapper Ppx_js.mapper in

toplevel/examples/lwt_toplevel/ppx_enabled.ml.in

@@ -3,7 +3,7 @@ open Migrate_parsetree
 let init () =
   let module Converter =
     Migrate_parsetree.Versions.Convert
-      (Migrate_parsetree.OCaml_407)
+      (Migrate_parsetree.OCaml_408)
       (Migrate_parsetree.OCaml_current)
   in
   let mapper = Converter.copy_mapper Ppx_js.mapper in