refactor: ocamlobjinfo can parse more than one file

Signed-off-by: Rudi Grinberg <[email protected]>

Author: rgrinberg

src/dune_rules/dep_rules.ml

@@ -36,7 +36,10 @@ let ooi_deps
       let ctx = Super_context.context sctx in
       Context.ocaml ctx
     in
-    Ocamlobjinfo.rules ocaml ~sandbox ~dir ~unit
+    Ocamlobjinfo.rules ocaml ~sandbox ~dir ~units:[ unit ]
+    |> Action_builder.map ~f:(function
+      | [ x ] -> x
+      | [] | _ :: _ -> assert false)
   in
   let add_rule = Super_context.add_rule sctx ~dir in
   let read =

src/dune_rules/ocamlobjinfo.mli

@@ -10,8 +10,8 @@ val rules
   :  Ocaml_toolchain.t
   -> dir:Path.Build.t
   -> sandbox:Sandbox_config.t option
-  -> unit:Path.t
-  -> t Action_builder.t
+  -> units:Path.t list
+  -> t list Action_builder.t
 
 (** For testing only *)
-val parse : string -> t
+val parse : string -> t list

src/dune_rules/ocamlobjinfo.mll

@@ -22,23 +22,25 @@ let ws = [' ' '\t']+
 let hash = ['0'-'9' 'a'-'z' '-']+
 let name = ['A'-'Z'] ['A'-'Z' 'a'-'z' '0'-'9' '_']*
 
-rule ocamlobjinfo acc = parse
-  | "Interfaces imported:" newline { intfs acc lexbuf }
-  | "Implementations imported:" newline { impls acc lexbuf }
-  | _ { ocamlobjinfo acc lexbuf }
-  | eof { acc }
-and intfs acc = parse
-  | ws hash ws (name as name) newline { intfs (add_intf acc name) lexbuf }
-  | "Implementations imported:" newline { impls acc lexbuf }
-  | _ | eof { acc }
-and impls acc = parse
-  | ws hash ws (name as name) newline { impls (add_impl acc name) lexbuf }
-  | _ | eof { acc }
+rule ocamlobjinfo acc_units acc = parse
+  | "Interfaces imported:" newline { intfs acc_units acc lexbuf }
+  | "Implementations imported:" newline { impls acc_units acc lexbuf }
+  | _ { ocamlobjinfo acc_units acc lexbuf }
+  | eof { acc :: acc_units }
+and intfs acc_units acc = parse
+  | ws hash ws (name as name) newline { intfs acc_units (add_intf acc name) lexbuf }
+  | "Implementations imported:" newline { impls acc_units acc lexbuf }
+  | "File " [^ '\n']+ newline { ocamlobjinfo (acc :: acc_units) empty lexbuf }
+  | _ | eof { acc :: acc_units }
+and impls acc_units acc = parse
+  | ws hash ws (name as name) newline { impls acc_units (add_impl acc name) lexbuf }
+  | "File " [^ '\n']+ newline { ocamlobjinfo (acc :: acc_units) empty lexbuf }
+  | _ | eof { acc :: acc_units }
 
 {
-let parse s = ocamlobjinfo empty (Lexing.from_string s)
+let parse s = Lexing.from_string s |> ocamlobjinfo [] empty  |> List.rev
 
-let rules (ocaml : Ocaml_toolchain.t) ~dir ~sandbox ~unit =
+let rules (ocaml : Ocaml_toolchain.t) ~dir ~sandbox ~units =
   let no_approx =
     if Ocaml.Version.ooi_supports_no_approx ocaml.version then
       [Command.Args.A "-no-approx"]
@@ -52,7 +54,9 @@ let rules (ocaml : Ocaml_toolchain.t) ~dir ~sandbox ~unit =
       []
   in
   let observing_facts =
-    Dep.Facts.singleton (Dep.file unit) (Dep.Fact.nothing)
+    List.map units ~f:(fun unit ->
+      Dep.Facts.singleton (Dep.file unit) (Dep.Fact.nothing))
+    |> Dep.Facts.union_all
   in
   let open Action_builder.O in
   let* action =
@@ -61,7 +65,7 @@ let rules (ocaml : Ocaml_toolchain.t) ~dir ~sandbox ~unit =
       (List.concat
          [ no_approx
          ; no_code
-         ; [ Dep unit ]
+         ; [ Deps units ]
          ])
   in
   (Dune_engine.Build_system.execute_action_stdout

test/expect-tests/ocamlobjinfo_tests.ml

@@ -6,146 +6,180 @@ let () = init ()
 
 let fixture =
   {ocamlobjinfo|
-File _build/install/default/lib/dune/_stdune/stdune__Env.cmx
-Name: Stdune__Env
-CRC of implementation: b678d7aae434ca3158721e3a37a15776
-Globals defined:
-        Stdune__Env
+File _boot/stdune__Env.cmi
+Unit name: Stdune__Env
 Interfaces imported:
-        053326e853ce10e1fadf8d891f08f891        Unix
-        596c497318b5c3057b47b9d6747ef5d1        Uchar
-        3fe6d98e0634486be22d9de07aa0709a        Sys
-        6339e2b71e8c583a81e808954faf6818        StringLabels
-        953d4ea121ff79e9719730997e04436d        Stdune__String
-        744ae4e7c80910dd9302bf207d11274f        Stdune__Sexp_intf
-        3a8d88a2c7628492ca76328610a53b04        Stdune__Sexp
-        788120b20799b5148dc44c2effd9db08        Stdune__Set_intf
-        764302df6c51161e13ccc4553710003d        Stdune__Set
-        7577d25061f730d87e8e0ab574216d9c        Stdune__Result
-        4d34756156087d6e6530be0d3275bde4        Stdune__Path
-        e8eebf0307152a528b7d97ebdf37d1dc        Stdune__Ordering
-        1fb9ae8c1fb73c55a857f02869cfbeab        Stdune__Map_intf
-        96daa1ecff8c9bc6c5aadf39201c2f0d        Stdune__Map
-        5b332ee2108ade34f2abc1448318c5a0        Stdune__Loc
-        721c54b94b8c3b89fffc8587041c241a        Stdune__List
-        0c6e26bc5bc285a87ab7304ee5f3bf0a        Stdune__Hashtbl_intf
-        8df5a38cb2f28d4cf23f6cd8a6c4c923        Stdune__Hashtbl
-        0ff241a400cabb742a8d681c7132c350        Stdune__Hashable
-        b438dbe8d4c60ca1bb06d04c7bc95652        Stdune__Exn
-        a1b4f657ccceb16196f104a53a0e199a        Stdune__Env
-        7643682d2d95acbcf8834a351a1e2779        Stdune__Either
-        826226f09894dc48694a431d13b9e541        Stdune__Comparator
-        69861cabc5a73becd98269ce298eaa59        Stdune__Bin
-        cbf0ce887ccceaff96f4a22a8f057799        Stdune__Array
-        37cf8dd4fc4be5636ff9f78604107f8b        Stdune__
-        28a12def19edf36c317c30fafcc03d6d        Set
-        e5dfd0ca6436c8abad976fc9e914999a        Printf
-        1b461321ebcc8e419f24eb531c5ac7ac        Printexc
-        9b04ecdc97e5102c1d342892ef7ad9a2        Pervasives
-        db5fc31b815ab3040d5a9940a91712c4        MoreLabels
-        8b8de381501aa7862270c15619322ee7        Map
-        f4e829075d9d0bb7de979cfc49c2600b        ListLabels
-        0971650cdf1fa8e506e733e9a5da2628        Lexing
-        0a88e320f172d3413ba0d5e0f9c70ccd        Hashtbl
-        1a17539924469551f027475153d4d3b5        Format
-        a4afff2bf4082efda68a6a65cf31f8e2        Stdlib__Result_compat
-        de733b926f4af640c957c8129aba4139        Stdlib__Result
-        ba19641102c1711bdb2476bb8b8dbe32        Stdlib__
-        7b10d1bd2d88af9c1da841149c988d94        Stdlib
-        cd4856c93f21942683ce190142e88396        Complex
-        79ae8c0eb753af6b441fe05456c7970b        CamlinternalFormatBasics
-        4ff98b0650eef9c38ee9c9930e0c3e9b        CamlinternalBigarray
-        9c9b3639d23d7746c571cdf04646eb29        Buffer
-        c4974e11dd7c941c002b826edc727de8        ArrayLabels
-Implementations imported:
-        e28bcdad48b0cb1739e47106149016cb        Unix
-        3c11d6a8ae012d6541b58cecff4809d5        Sys
-        --------------------------------        Stdune__String
-        --------------------------------        Stdune__Sexp
-        --------------------------------        Stdune__Set
-        --------------------------------        Stdune__Map
-        --------------------------------        Stdune__List
-        --------------------------------        Stdune__Exn
-        --------------------------------        Stdune__Bin
-        --------------------------------        Stdune__Array
-        a3cdcb16ec3b460d51a685302e993c0b        Printf
-Clambda approximation:
-  _
-Currying functions: 3 2
-Apply functions: 3 2
-Send functions:
+        bd468c1984f53f5b1d3dadf52a621031        Stdune__Env
+        ba308f46e67d900971a536229f7f4173        Stdune__String
+        421e81602ba8b4117354ae965fbcdb9b        Stdune__Set_intf
+        e71746f44d47934ce121640bcb2f82d1        Stdune__Seq
+        d5f56ce66eefdb02b6328534c965b2a4        Stdune__Result
+        06eac0380458db0b6b9dbf534491bb7d        Stdune__Map_intf
+        143081f49dab6fc606ae7041a2bb6ab1        Stdune__Hashtbl_intf
+        30c8429b4c4dacb8b40f9032dfc90a7c        Stdune__Hashtbl
+        2f561d28974f1c76974b217015d894ff        Stdune__Hashable
+        f01519520ce7398ca472c40bcdd37916        Stdune__Either
+        26c7c23a3f08949c9234b39a8456e0c4        Stdune__Dune_either
+        6c4aad0453a73862d11f3e5a6484eb83        Stdune__Comparator
+        78d20a1f0a585a77c0b794e2576c5ce1        Stdune__Comparable_intf
+        95b5a54d9e83e8c31cf45102cda75e48        Stdune__
+        e99839b765b60b06e594103d43eb2fc3        Stdlib__Uchar
+        3bc9847742f040684ab499418b7edf05        Stdlib__StringLabels
+        22ab37e5d785c94907a48029f32d8e8b        Stdlib__Seq
+        41f1535996cca328bb845b07f8302854        Stdlib__Format
+        46032d55ce31c121a36c0c831eb303d0        Stdlib__Either
+        22513dfb5b42771d934b5ab03c3e52e2        Stdlib__Domain
+        fb4e94053b07bc3831961cf2dd4bfa5f        Stdlib__Buffer
+        b7726274865ffd07290ef11351fb84fe        Stdlib
+        3d06cb761b7b5c8b1688884de82f6f44        Pp
+        95df35f1ae12a6752513bc2d6dd1e2aa        Ordering
+        40da7899f44eca869bcd9216c9f03eb3        Dyn
+        863a7f5288599b181f046f0f55277b0f        CamlinternalFormatBasics
+File _build/default/otherlibs/stdune/src/.stdune.objs/byte/stdune__Env.cmo
+Unit name: Stdune__Env
+Interfaces imported:
+        03e897aee435213573adf13c80fcb505        Unix
+        a37d011736ba15fcb93e301d6e9668d2        Stdune__String
+        b51e9564a437f5dab85ecd7dbeb5fe9e        Stdune__Set_intf
+        5fa01009dd8a8dc4b5aa020829607a29        Stdune__Seq
+        c4077e4346d1333fb5a5d86cb1b29d00        Stdune__Result
+        533fd86efff7f4531b0b06618b7035fc        Stdune__Poly
+        fb775f8b752e8168d73ada4c504f02b6        Stdune__Map_intf
+        fae59d6691dc238fd60bd45af4965361        Stdune__Map
+        73b7f60f54e3ce7915dc84d6e67ed356        Stdune__Loc0
+        e17e834cc6ebc2c4dd1c00550d905672        Stdune__List
+        dacde49bf9f97ac658c92aed71b8c785        Stdune__Lexbuf
+        c1d2054a047001a99870331b34bcabfb        Stdune__Hashtbl_intf
+        2355b12e6f04e2effaeed7fcf7788457        Stdune__Hashtbl
+        f78523139161a07f69c9bb172c66d2d6        Stdune__Hashable
+        e658ad11f9a5db6440d11c79d9c50742        Stdune__Env
+        9fd88bd5b1dfb61f9d7713cda581d288        Stdune__Either
+        c6c90e99c836610dda40af3b03120714        Stdune__Dune_either
+        99b7fcf93dc56dcc938e4886b46ce3b3        Stdune__Comparator
+        4ab9970cf012f4719f898657f92b5780        Stdune__Comparable_intf
+        ed5bf8d301e6efbb9bb75d08e9fda6ed        Stdune__Comparable
+        b280176bcf92e00bb31e82e836b79478        Stdune__Code_error
+        2fdcab3c50cae1145cd9ad5a42fef2b0        Stdune__Array
+        56b745aad68436e15c04a81a49a64bc2        Stdune__
+        e99839b765b60b06e594103d43eb2fc3        Stdlib__Uchar
+        37ffc17421e2ae344263e703f9b97a7f        Stdlib__Sys
+        3bc9847742f040684ab499418b7edf05        Stdlib__StringLabels
+        22ab37e5d785c94907a48029f32d8e8b        Stdlib__Seq
+        48aae94bed7b9364737dec491dd5504f        Stdlib__Printf
+        2b62d36b226e41c97dbde849f2884dd5        Stdlib__ListLabels
+        79bfb1f841143482726839838f8b6560        Stdlib__Lexing
+        41f1535996cca328bb845b07f8302854        Stdlib__Format
+        46032d55ce31c121a36c0c831eb303d0        Stdlib__Either
+        22513dfb5b42771d934b5ab03c3e52e2        Stdlib__Domain
+        d3484881d7abcc6fad213e2616c0406e        Stdlib__Complex
+        fb4e94053b07bc3831961cf2dd4bfa5f        Stdlib__Buffer
+        5bd8a0c0af94a79b082f9c2fdd62d630        Stdlib__Bigarray
+        c754c627bac3f2948b8da959a4caa4e5        Stdlib__ArrayLabels
+        b7726274865ffd07290ef11351fb84fe        Stdlib
+        b0a9d2486ded60332f67def162ad115a        Pp
+        74e26938103410d4bef478dee9a67659        Ordering
+        b6bda25e76f7a0790682d620ddd2e240        Dyn
+        863a7f5288599b181f046f0f55277b0f        CamlinternalFormatBasics
+Required globals:
+        Dyn
+        Stdlib__Printf
+        Stdlib__Sys
+        Stdune__Array
+        Stdune__Code_error
+        Stdune__Comparable
+        Stdune__List
+        Stdune__Poly
+        Stdune__String
+        Unix
+Uses unsafe features: no
 Force link: no
 |ocamlobjinfo}
 ;;
 
-let parse s = Ocamlobjinfo.parse s |> Ocamlobjinfo.to_dyn |> print_dyn
+let parse s = Ocamlobjinfo.parse s |> Dyn.list Ocamlobjinfo.to_dyn |> print_dyn
 
 let%expect_test _ =
   parse fixture;
   [%expect
     {|
-{ impl =
-    set
-      { "printf"
-      ; "stdune__Array"
-      ; "stdune__Bin"
-      ; "stdune__Exn"
-      ; "stdune__List"
-      ; "stdune__Map"
-      ; "stdune__Set"
-      ; "stdune__Sexp"
-      ; "stdune__String"
-      ; "sys"
-      ; "unix"
+    [ { impl = set {}
+      ; intf =
+          set
+            { "camlinternalFormatBasics"
+            ; "dyn"
+            ; "ordering"
+            ; "pp"
+            ; "stdlib"
+            ; "stdlib__Buffer"
+            ; "stdlib__Domain"
+            ; "stdlib__Either"
+            ; "stdlib__Format"
+            ; "stdlib__Seq"
+            ; "stdlib__StringLabels"
+            ; "stdlib__Uchar"
+            ; "stdune__"
+            ; "stdune__Comparable_intf"
+            ; "stdune__Comparator"
+            ; "stdune__Dune_either"
+            ; "stdune__Either"
+            ; "stdune__Env"
+            ; "stdune__Hashable"
+            ; "stdune__Hashtbl"
+            ; "stdune__Hashtbl_intf"
+            ; "stdune__Map_intf"
+            ; "stdune__Result"
+            ; "stdune__Seq"
+            ; "stdune__Set_intf"
+            ; "stdune__String"
+            }
       }
-; intf =
-    set
-      { "arrayLabels"
-      ; "buffer"
-      ; "camlinternalBigarray"
-      ; "camlinternalFormatBasics"
-      ; "complex"
-      ; "format"
-      ; "hashtbl"
-      ; "lexing"
-      ; "listLabels"
-      ; "map"
-      ; "moreLabels"
-      ; "pervasives"
-      ; "printexc"
-      ; "printf"
-      ; "set"
-      ; "stdlib"
-      ; "stdlib__"
-      ; "stdlib__Result"
-      ; "stdlib__Result_compat"
-      ; "stdune__"
-      ; "stdune__Array"
-      ; "stdune__Bin"
-      ; "stdune__Comparator"
-      ; "stdune__Either"
-      ; "stdune__Env"
-      ; "stdune__Exn"
-      ; "stdune__Hashable"
-      ; "stdune__Hashtbl"
-      ; "stdune__Hashtbl_intf"
-      ; "stdune__List"
-      ; "stdune__Loc"
-      ; "stdune__Map"
-      ; "stdune__Map_intf"
-      ; "stdune__Ordering"
-      ; "stdune__Path"
-      ; "stdune__Result"
-      ; "stdune__Set"
-      ; "stdune__Set_intf"
-      ; "stdune__Sexp"
-      ; "stdune__Sexp_intf"
-      ; "stdune__String"
-      ; "stringLabels"
-      ; "sys"
-      ; "uchar"
-      ; "unix"
+    ; { impl = set {}
+      ; intf =
+          set
+            { "camlinternalFormatBasics"
+            ; "dyn"
+            ; "ordering"
+            ; "pp"
+            ; "stdlib"
+            ; "stdlib__ArrayLabels"
+            ; "stdlib__Bigarray"
+            ; "stdlib__Buffer"
+            ; "stdlib__Complex"
+            ; "stdlib__Domain"
+            ; "stdlib__Either"
+            ; "stdlib__Format"
+            ; "stdlib__Lexing"
+            ; "stdlib__ListLabels"
+            ; "stdlib__Printf"
+            ; "stdlib__Seq"
+            ; "stdlib__StringLabels"
+            ; "stdlib__Sys"
+            ; "stdlib__Uchar"
+            ; "stdune__"
+            ; "stdune__Array"
+            ; "stdune__Code_error"
+            ; "stdune__Comparable"
+            ; "stdune__Comparable_intf"
+            ; "stdune__Comparator"
+            ; "stdune__Dune_either"
+            ; "stdune__Either"
+            ; "stdune__Env"
+            ; "stdune__Hashable"
+            ; "stdune__Hashtbl"
+            ; "stdune__Hashtbl_intf"
+            ; "stdune__Lexbuf"
+            ; "stdune__List"
+            ; "stdune__Loc0"
+            ; "stdune__Map"
+            ; "stdune__Map_intf"
+            ; "stdune__Poly"
+            ; "stdune__Result"
+            ; "stdune__Seq"
+            ; "stdune__Set_intf"
+            ; "stdune__String"
+            ; "unix"
+            }
       }
-}
-|}]
+    ]
+    |}]
 ;;