Skip to content

Commit

Permalink
Fix some legacy stuff for compilation (no Base, fix camlp5)
Browse files Browse the repository at this point in the history
Signed-off-by: Kakadu <Kakadu@pm.me>
  • Loading branch information
Kakadu committed Aug 25, 2024
1 parent 527ad47 commit b193f2c
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 21 deletions.
2 changes: 1 addition & 1 deletion config/dune
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(executable
(name gentests)
(modules gentests)
(libraries str stdio base))
(libraries str))

(executable
(name discover)
Expand Down
30 changes: 15 additions & 15 deletions config/gentests.ml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
open Base

let header =
{|; THIS FILE IS GENERATED AUTOMATICALLY

Expand Down Expand Up @@ -63,31 +61,33 @@ let wrap =
;;

let footer names =
Stdio.printf "(cram\n";
Stdio.printf " ;(package noCanren-tests)\n";
Stdio.printf " (deps\n";
Array.iter names ~f:(Stdio.printf " ./%s_run.exe\n");
Stdio.printf " ;\n ))\n"
Printf.printf "(cram\n";
Printf.printf " ;(package noCanren-tests)\n";
Printf.printf " (deps\n";
ListLabels.iter names ~f:(Printf.printf " ./%s_run.exe\n");
Printf.printf " ;\n ))\n";
flush stdout
;;

let () =
let path = (Sys.get_argv ()).(1) in
let files = Caml.Sys.readdir path in
let path = Sys.argv.(1) in
let files = Stdlib.Sys.readdir path |> Array.to_list in
let tail = "_run.ml" in
let taillen = String.length tail in
let names =
Array.filter_map files ~f:(fun s ->
ListLabels.filter_map files ~f:(fun s ->
if String.length s > taillen && (String.equal tail @@ Str.last_chars s taillen)
then (
let name = String.chop_suffix_exn s ~suffix:tail in
let name = String.sub s 0 (String.length s - taillen) in
match name with
| "lorry" -> None
| _ -> Some name)
else None)
|> Array.sorted_copy ~compare:String.compare
|> List.sort String.compare
in
(* Array.iter names ~f:Stdio.print_endline; *)
Stdio.printf "%s\n%!" header;
Array.iter names ~f:(fun name -> Stdio.printf "%s%!" (wrap name));
footer names
Printf.printf "%s\n%!" header;
ListLabels.iter names ~f:(fun name -> Printf.printf "%s%!" (wrap name));
footer names;
flush stdout
;;
8 changes: 3 additions & 5 deletions dune
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@
(run
mkcamlp5.opt
-package
camlp5,camlp5.pa_o
-package
OCanren.syntax,GT.syntax,GT.syntax.all
pr_o.cmx
-package
camlp5,camlp5.pa_o,camlp5.pr_o
-o
%{targets}
-)))
Expand All @@ -27,10 +26,9 @@
(run
mkcamlp5.opt
-package
camlp5,camlp5.pa_o
camlp5,camlp5.pa_o,camlp5.pr_dump
-package
OCanren.syntax,GT.syntax,GT.syntax.all
pr_dump.cmx
-o
%{targets}
-)))

0 comments on commit b193f2c

Please sign in to comment.