WIP: OMP

_tags

@@ -1,5 +1,7 @@
-true: package(compiler-libs.common)
-true: package(ppx_tools.metaquot)
+true: bin_annot
+true: package(ocaml-migrate-parsetree)
+true: package(ppx_tools_versioned.metaquot_404)
+true: package(ppx_tools_versioned)
 true: package(str)
 "lib": include
 <ppx/*>: package(dynlink)

lib/ast_tools.ml

@@ -1,5 +1,5 @@
-open Asttypes
-open Parsetree
+open Migrate_parsetree.Ast_404.Asttypes
+open Migrate_parsetree.Ast_404.Parsetree
 
 let rec li_eq li1 li2 =
   let open Longident in
@@ -39,7 +39,7 @@ and expr_list_eq el1 el2 =
   with Invalid_argument _ -> false
 
 and label_eq l1 l2 =
-  let open Ast_convenience.Label in
+  let open Ppx_tools_404.Ast_convenience.Label in
   match explode l1, explode l2 with
   | Nolabel, Nolabel -> true
   | Labelled s1, Labelled s2
@@ -54,4 +54,18 @@ and expr_label_list_eq el1 el2 =
     List.for_all2 expr_label_eq el1 el2
   with Invalid_argument _ -> false
 
-let sigitem_attributes = Compat.sigitem_attributes
+let sigitem_attributes { psig_desc } =
+  match psig_desc with
+  | Psig_value vd -> [vd.pval_attributes]
+  | Psig_type (_, tdecls) -> List.map (fun tdecl -> tdecl.ptype_attributes) tdecls
+  | Psig_typext text -> [text.ptyext_attributes]
+  | Psig_exception exc -> [exc.pext_attributes]
+  | Psig_module md -> [md.pmd_attributes]
+  | Psig_recmodule mds -> List.map (fun md -> md.pmd_attributes) mds
+  | Psig_modtype pmtd -> [pmtd.pmtd_attributes]
+  | Psig_open popen -> [popen.popen_attributes]
+  | Psig_include pincl -> [pincl.pincl_attributes]
+  | Psig_class pcis
+  | Psig_class_type pcis -> List.map (fun pct -> pct.pci_attributes) pcis
+  | Psig_attribute attribute -> [[attribute]]
+  | Psig_extension (_, attributes) -> [attributes]

lib/ast_tools.mli

@@ -1,7 +1,7 @@
-val expr_eq : Parsetree.expression -> Parsetree.expression -> bool
+val expr_eq : Migrate_parsetree.Ast_404.Parsetree.expression -> Migrate_parsetree.Ast_404.Parsetree.expression -> bool
 
 (**
    Return all attributes for a signature item.
    In some cases (e.g. recursive type declarations) there can be several ones.
  *)
-val sigitem_attributes : Parsetree.signature_item -> Parsetree.attributes list
+val sigitem_attributes : Migrate_parsetree.Ast_404.Parsetree.signature_item -> Migrate_parsetree.Ast_404.Parsetree.attributes list

lib/ocamllint_rules.ml

@@ -1,13 +1,13 @@
 open Ast_tools
-open Asttypes
-open Parsetree
+open Migrate_parsetree.Ast_404.Asttypes
+open Migrate_parsetree.Ast_404.Parsetree
 
 (** Allocated litterals *)
 let is_allocated_lit exp =
   match exp.pexp_desc with
   | Pexp_constant _ ->
     begin
-      match Ast_convenience.get_str exp with
+      match Ppx_tools_404.Ast_convenience.get_str exp with
       | Some _ -> true
       | None -> false
     end
@@ -229,7 +229,7 @@ let filter_rev_map : type a b . (a -> b option) -> a list -> b list
   go []
 
 let extract_ocaml_doc attributes =
-  let open Ast_convenience in
+  let open Ppx_tools_404.Ast_convenience in
   match find_attr_expr "ocaml.doc" attributes with
   | Some e -> get_str e
   | None -> None

lib/ocamllint_rules.mli

@@ -1,9 +1,9 @@
-val rate_expression : Parsetree.expression -> Ocamllint.Warning.t option
+val rate_expression : Migrate_parsetree.Ast_404.Parsetree.expression -> Ocamllint.Warning.t option
 
 val rate_module_name : string -> Ocamllint.Warning.t option
 
 val rate_module_type_name : string -> Ocamllint.Warning.t option
 
-val rate_signature_item : Parsetree.signature_item -> Ocamllint.Warning.t option
+val rate_signature_item : Migrate_parsetree.Ast_404.Parsetree.signature_item -> Ocamllint.Warning.t option
 
 val is_snake_case : string -> bool

opam

@@ -22,6 +22,6 @@ depends: [
     "ocamlbuild" {build}
     "topkg" {build}
     "ounit" {test}
-    "ppx_tools" {>= "5.0"}
+    "ppx_tools_versioned" {>= "5.0"}
 ]
 available: [ocaml-version >= "4.02.0"]

pkg/META

@@ -6,5 +6,5 @@ requires = "compiler-libs.common,ppx_tools.metaquot"
 package "ppx" (
     description = "Run ocamllint through a ppx"
     requires = "ocamllint"
-    ppx = "./ppx_lint"
+    ppx = "./ppx_lint --as-ppx"
 )

ppx/ppx_lint.ml

@@ -1,6 +1,6 @@
-open Ast_mapper
-open Asttypes
-open Parsetree
+open Migrate_parsetree.Ast_404.Ast_mapper
+open Migrate_parsetree.Ast_404.Asttypes
+open Migrate_parsetree.Ast_404.Parsetree
 
 let raise_errorf ?sub ?if_highlight ?loc message =
   message |> Printf.kprintf (fun str ->
@@ -12,8 +12,7 @@ let dynlink ?(loc=Location.none) filename =
   try
     Dynlink.loadfile filename
   with Dynlink.Error error ->
-    raise_errorf ~loc "Cannot load %s: %s" filename (Dynlink.error_message error)
-
+    raise_errorf ~loc "Cannot load %s: %s" filename (Dynlink.error_message error) 
 let load_config filename =
   dynlink filename;
   Ocamllint.Plugin.get_config ()
@@ -49,17 +48,19 @@ let handle_signature_item config sigitem =
   warn_on config ~loc (Ocamllint_rules.rate_signature_item sigitem)
 
 let should_run () =
-  match tool_name () with
-  | "ocamlc" -> true
-  | "ocamlopt" -> true
-  | _ -> false
+  true
+  (*match tool_name () with*) (* XXX *)
+  (*| "ocamlc" -> true*)
+  (*| "ocamlopt" -> true*)
+  (*| _ -> false*)
 
-let lint_mapper argv =
-  let config = match argv with
-    | [] -> Ocamllint.Config.default
-    | [config_module] -> load_config config_module
-    | _ -> raise_errorf "Only one plugin can be loaded"
-  in
+let lint_mapper _ _ =
+  (*let config = match argv with*) (* XXX *)
+    (*| [] -> Ocamllint.Config.default*)
+    (*| [config_module] -> load_config config_module*)
+    (*| _ -> raise_errorf "Only one plugin can be loaded"*)
+  (*in*)
+  let config = Ocamllint.Config.default in
   if should_run () then
     { default_mapper with
       expr = (fun mapper expr ->
@@ -78,4 +79,11 @@ let lint_mapper argv =
   else
     default_mapper
 
-let () = register "lint" lint_mapper
+let main () =
+  Migrate_parsetree.Driver.register
+    ~name:"lint"
+    Migrate_parsetree.Versions.ocaml_404
+    lint_mapper;
+  Migrate_parsetree.Driver.run_main ()
+
+let () = main ()

test/tests.ml

@@ -18,14 +18,20 @@ let warning_opt_to_string = function
   | None -> "(nothing)"
   | Some w -> Ocamllint.Warning.to_string w
 
+let string_of_expression expr =
+  let open Migrate_parsetree.Versions in
+  let migration = migrate ocaml_404 ocaml_current in
+  let current_expr = migration.copy_expression expr in
+  Pprintast.string_of_expression current_expr
+
 (** Test rate_expression. Note that the recursion is implemented by the
     ast_mapper, so subexpressions are not checked in this test.
 *)
 let test_expression =
   let open Ocamllint.Warning in
   let t (expr, r) =
     let name =
-      Printf.sprintf "Rate %s" (Pprintast.string_of_expression expr)
+      Printf.sprintf "Rate %s" (string_of_expression expr)
     in
     name >:: fun ctxt ->
       assert_equal
@@ -71,10 +77,13 @@ let test_expression =
     ]
 
 let string_of_signature_item x =
+  let open Migrate_parsetree.Versions in
   let open Format in
+  let migration = migrate ocaml_404 ocaml_current in
+  let current_sig = migration.copy_signature [x] in
   ignore (flush_str_formatter ()) ;
   let f = str_formatter in
-  Pprintast.signature f [x];
+  Pprintast.signature f current_sig;
   flush_str_formatter ()
 
 (**
@@ -93,9 +102,9 @@ let test_signature_item =
         r
         (Ocamllint_rules.rate_signature_item sigitem)
   in
-  let open Ast_helper in
-  let open Location in
-  let open Parsetree in
+  let open Migrate_parsetree.Ast_404.Ast_helper in
+  let open Migrate_parsetree.Ast_404.Location in
+  let open Migrate_parsetree.Ast_404.Parsetree in
   List.map t
     [ Sig.value @@ Val.mk
         ~attrs: