Upgrade to OCaml 4.10 (#79)

.travis.yml

@@ -9,4 +9,4 @@ env:
    - PACKAGE="ppx_tools"
    - PRE_INSTALL_HOOK="cd /home/opam/opam-repository && git pull origin master && opam update -u -y"
  matrix:
-   - DISTRO=ubuntu-16.04 OCAML_VERSION=4.08.0
+   - DISTRO=ubuntu-16.04 OCAML_VERSION=4.10.0+rc2 OCAML_BETA=enable

ast_mapper_class.ml

@@ -162,6 +162,10 @@ module CT = struct
       (List.map (sub # class_type_field) pcsig_fields)
 end
 
+let map_functor_param sub = function
+  | Unit -> Unit
+  | Named (s, mt) -> Named (map_loc sub s, sub # module_type mt)
+
 module MT = struct
   (* Type expressions for the module language *)
 
@@ -173,10 +177,10 @@ module MT = struct
     | Pmty_ident s -> ident ~loc ~attrs (map_loc sub s)
     | Pmty_alias s -> alias ~loc ~attrs (map_loc sub s)
     | Pmty_signature sg -> signature ~loc ~attrs (sub # signature sg)
-    | Pmty_functor (s, mt1, mt2) ->
-        functor_ ~loc ~attrs (map_loc sub s)
-          (map_opt (sub # module_type) mt1)
-          (sub # module_type mt2)
+    | Pmty_functor (param, mt) ->
+        functor_ ~loc ~attrs
+          (map_functor_param sub param)
+          (sub # module_type mt)
     | Pmty_with (mt, l) ->
         with_ ~loc ~attrs (sub # module_type mt)
           (List.map (sub # with_constraint) l)
@@ -227,9 +231,9 @@ module M = struct
     match desc with
     | Pmod_ident x -> ident ~loc ~attrs (map_loc sub x)
     | Pmod_structure str -> structure ~loc ~attrs (sub # structure str)
-    | Pmod_functor (arg, arg_ty, body) ->
-        functor_ ~loc ~attrs (map_loc sub arg)
-          (map_opt (sub # module_type) arg_ty)
+    | Pmod_functor (param, body) ->
+        functor_ ~loc ~attrs
+          (map_functor_param sub param)
           (sub # module_expr body)
     | Pmod_apply (m1, m2) ->
         apply ~loc ~attrs (sub # module_expr m1) (sub # module_expr m2)

genlifter.ml

@@ -50,7 +50,7 @@ module Main : sig end = struct
     if Hashtbl.mem printed ty then ()
     else let tylid = Longident.parse ty in
       let td =
-        try Env.find_type (Env.lookup_type tylid env) env
+        try snd (Env.find_type_by_name tylid env)
         with Not_found ->
           Format.eprintf "** Cannot resolve type %s@." ty;
           exit 2

ppx_tools.opam

@@ -9,6 +9,6 @@ bug-reports: "https://github.com/ocaml-ppx/ppx_tools/issues"
 dev-repo: "git://github.com/ocaml-ppx/ppx_tools.git"
 build: ["dune" "build" "-p" name "-j" jobs]
 depends: [
-  "ocaml" {>= "4.08.0"}
+  "ocaml" {>= "4.10.0"}
   "dune" {>= "1.6"}
 ]