Do not accept per_file anymore

It was renamed per_module and it is planned to reuse per_file for
another purpose.
This commit is contained in:
Jeremie Dimino 2017-08-04 09:24:02 +01:00
parent 3ab39c7c7a
commit 06b47a73f6
3 changed files with 5 additions and 12 deletions

View File

@ -25,6 +25,10 @@
builds and executes a custom `utop` toplevel with all libraries
defined in the current directory (#183, Rudi Grinberg)
- Do not accept `per_file` anymore in `preprocess` field. `per_file`
was renamed `per_module` and it is planned to reuse `per_file` for
another purpose
1.0+beta11 (21/07/2017)
-----------------------

View File

@ -793,12 +793,6 @@ For instance:
(((action (run ./pp.sh X=1 ${<})) (foo bar)))
(((action (run ./pp.sh X=2 ${<})) (baz)))))
Note the beta versions of Jbuilder used ``per_file`` instead of
``per_module``, which was obviously the wrong name. ``per_file`` is
still accepted for backward compatibility but deprecated. It will be
re-purposed in the future to allow to distinguish between .ml and .mli
files.
Dependency specification
------------------------

View File

@ -260,12 +260,7 @@ module Per_module = struct
let t a sexp =
match sexp with
| List (_, Atom (loc, ("per_module" | "per_file" as kwd)) :: rest) -> begin
if kwd = "per_file" then
Loc.warn loc
"'per_file' was renamed 'per_module'. 'per_file' will be re-purposed \
in a future version and will take a list of file names rather \
than module names.";
| List (_, Atom (_, "per_module") :: rest) -> begin
List.concat_map rest ~f:(fun sexp ->
let pp, names = pair a module_names sexp in
List.map (String_set.elements names) ~f:(fun name -> (name, pp)))