matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of indexed lookups for deps 

Have %{first-dep} to replace %{<}

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
This commit is contained in:
Rudi Grinberg 2018-07-06 18:25:00 +07:00
parent 2c29217a20
commit c4545fce18
19 changed files with 54 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/migration.rst
View File

@ -169,7 +169,7 @@ Jbuild Dune
======================== ============
``${@}`` ``%{targets}``
``${^}`` ``%{deps}``
``${<}`` ``%{deps[0]}``
``${<}`` ``%{first-dep}``
``${path:file}`` ``%{dep:file}``
``${SCOPE_ROOT}`` ``%{project_root}``
``${findlib:..}`` ``%{lib:..}``

10
doc/quick-start.rst
View File

@ -136,7 +136,7 @@ Add this field to your ``library`` or ``executable`` stanzas:
.. code:: scheme
(preprocess (action (run %{bin:cppo} -V OCAML:%{ocaml_version} %{deps[0]})))
(preprocess (action (run %{bin:cppo} -V OCAML:%{ocaml_version} %{first-dep})))
Additionally, if you are include a ``config.h`` file, you need to
declare the dependency to this file via:
@ -155,7 +155,7 @@ Write this in your ``dune`` file:
(rule
(targets foo.ml)
(deps foo.cppo.ml <other files that foo.ml includes>)
(action (run %{bin:cppo} %{deps[0]} -o %{targets})))
(action (run %{bin:cppo} %{first-dep} -o %{targets})))
Defining a library with C stubs
===============================
@ -193,7 +193,7 @@ compilation and link flags. Write this ``dune`` file:
(rule
(targets c_flags.sexp c_library_flags.sexp)
(deps config/discover.exe)
(action (run %{deps[0]} -ocamlc %{OCAMLC})))
(action (run %{first-dep} -ocamlc %{OCAMLC})))
Then create a ``config`` subdirectory and write this ``dune`` file:
@ -241,7 +241,7 @@ To generate a file ``foo.ml`` using a program from another directory:
(rule
(targets foo.ml)
(deps ../generator/gen.exe)
(action (run %{deps[0]} -o %{targets})))
(action (run %{first-dep} -o %{targets})))
Defining tests
==============
@ -253,7 +253,7 @@ Write this in your ``dune`` file:
(alias
(name runtest)
(deps my-test-program.exe)
(action (run %{deps[0]})))
(action (run %{first-dep})))
And run the tests with:

2
example/sample-projects/with-configure-step/dune
View File

@ -2,7 +2,7 @@
((fallback)
(targets (config))
(deps (config.defaults))
(action (copy %{deps[0]} %{targets}))))
(action (copy %{first-dep} %{targets}))))
(rule
((targets (config.full))

2
example/sample-projects/with-configure-step/src/dune
View File

@ -8,5 +8,5 @@
(rule
((targets (config.ml))
(deps (../config.full))
(action (copy %{deps[0]} %{targets}))))
(action (copy %{first-dep} %{targets}))))

2
src/dune
View File

@ -11,7 +11,7 @@
which_program)
(synopsis "Internal Dune library, do not use!"))
(ocamllex meta_lexer glob_lexer dune_lexer dune_vars)
(ocamllex meta_lexer glob_lexer dune_lexer)
(rule
(targets setup.ml)

1
src/dune_vars.mli
View File

@ -1 +0,0 @@
val deps : string -> int option

13
src/dune_vars.mll
View File

@ -1,13 +0,0 @@
{
open Stdune
}
let digit = ['0'-'9']
rule deps = parse
| "deps[" (digit+ as i) "]" eof { Some (Int.of_string_exn i) }
| _ { None }
{
let deps s = deps (Lexing.from_string s)
}

4
src/jbuild.ml
View File

@ -1243,7 +1243,7 @@ module Rule = struct
[ S.virt_text __POS__ "-q"
; S.virt_text __POS__ "-o"
; S.virt_var __POS__ "targets"
; S.virt_var __POS__"deps[0]"
; S.virt_var __POS__"first-dep"
])))
; mode
; locks = []
@ -1261,7 +1261,7 @@ module Rule = struct
Chdir
(S.virt_var __POS__ "ROOT",
Run (S.virt_text __POS__ "ocamlyacc",
[S.virt_var __POS__ "deps[0]"])))
[S.virt_var __POS__ "first-dep"])))
; mode
; locks = []
; loc

27
src/super_context.ml
View File

@ -807,20 +807,23 @@ module Action = struct
match String.Map.find dynamic_expansions key with
| Some _ as opt -> opt
| None ->
let dep i =
match List.nth deps_written_by_user i with
| None ->
Loc.warn loc "Variable '%s' used with no explicit \
dependencies@." key;
[Value.String ""]
| Some v -> [Path v]
let first_dep () =
Some (
match deps_written_by_user with
| [] ->
Loc.warn loc "Variable '%s' used with no explicit \
dependencies@." key;
[Value.String ""]
| v :: _ -> [Path v]
)
in
match key with
| "<" ->
if syntax_version < (1, 0) then
Some (dep 0)
first_dep ()
else
Loc.fail loc "Variable '<' is renamed to 'deps[0]' in dune"
Loc.fail loc "Variable '<' is renamed to 'first-dep' in dune"
| "first-dep" when syntax_version >= (1, 0) -> first_dep ()
| "^" ->
if syntax_version < (1, 0) then
Some (Value.L.paths deps_written_by_user)
@ -828,11 +831,7 @@ module Action = struct
Loc.fail loc "Variable %%{^} has been renamed to %%{deps}"
| "deps" when syntax_version >= (1, 0) ->
Some (Value.L.paths deps_written_by_user)
| _ ->
if syntax_version < (1, 0) then
None
else
Option.map (Dune_vars.deps key) ~f:dep)
| _ -> None)
let run sctx ~loc ?(extra_vars=String.Map.empty)
t ~dir ~dep_kind ~targets:targets_written_by_user ~scope

2
test/blackbox-tests/test-cases/force-test/dune
View File

@ -4,4 +4,4 @@
(alias
(name runtest)
(deps f.exe)
(action (run %{deps[0]})))
(action (run %{first-dep})))

4
test/blackbox-tests/test-cases/github568/dune
View File

@ -8,7 +8,7 @@
(name runtest)
(package lib1)
(deps test1.exe)
(action (run %{deps[0]})))
(action (run %{first-dep})))
(executable
(name test1)
@ -25,7 +25,7 @@
(name runtest)
(package lib2)
(deps test2.exe)
(action (run %{deps[0]})))
(action (run %{first-dep})))
(executable
(name test2)

2
test/blackbox-tests/test-cases/github660/explicit-interfaces/dune
View File

@ -1,6 +1,6 @@
(alias
(name runtest)
(deps main.exe)
(action (run %{deps[0]})))
(action (run %{first-dep})))
(executable (name main))

2
test/blackbox-tests/test-cases/github660/no-interfaces/dune
View File

@ -1,6 +1,6 @@
(alias
(name runtest)
(deps main.exe)
(action (run %{deps[0]})))
(action (run %{first-dep})))
(executable (name main))

6
test/blackbox-tests/test-cases/output-obj/dune
View File

@ -33,7 +33,7 @@
(rule
(targets dynamic.exe)
(deps dynamic.c)
(action (run %{CC} -o %{targets} %{deps[0]} %{ocaml-config:native_c_libraries})))
(action (run %{CC} -o %{targets} %{first-dep} %{ocaml-config:native_c_libraries})))
(alias
(name runtest)
@ -48,9 +48,9 @@
(alias
(name runtest)
(deps test.bc%{ext_dll})
(action (run ./dynamic.exe ./%{deps[0]})))
(action (run ./dynamic.exe ./%{first-dep})))
(alias
(name runtest)
(deps test%{ext_dll})
(action (run ./dynamic.exe ./%{deps[0]})))
(action (run ./dynamic.exe ./%{first-dep})))

10
test/blackbox-tests/test-cases/reason/dune
View File

@ -8,18 +8,18 @@
(lint
(per_module
((pps (reasonppx (-lint true))) (hello cppome))
((action (run ./pp/reasononlypp.exe -lint %{deps[0]})) (foo bar pped))))
((action (run ./pp/reasononlypp.exe -lint %{first-dep})) (foo bar pped))))
(preprocess
(per_module
((pps (reasonppx)) (foo))
((pps (reasonppx (-lint false))) (hello))
((action (run ./pp/reasononlypp.exe %{deps[0]})) (cppome))))))
((action (run ./pp/reasononlypp.exe %{first-dep})) (cppome))))))
(executable
((name rbin)
(modules rbin)
(lint (action (run ./pp/reasononlypp.exe -lint %{deps[0]})))
(preprocess (action (run ./pp/reasononlypp.exe %{deps[0]})))
(lint (action (run ./pp/reasononlypp.exe -lint %{first-dep})))
(preprocess (action (run ./pp/reasononlypp.exe %{first-dep})))
(libraries (rlib))))
;; we want to make sure that .rei files are present
@ -31,4 +31,4 @@
(alias
((name runtest)
(deps (rbin.exe))
(action (run %{deps[0]}))))
(action (run %{first-dep}))))

2
test/blackbox-tests/test-cases/select/dune
View File

@ -11,4 +11,4 @@
(alias
(name runtest)
(deps main.exe)
(action (run %{deps[0]})))
(action (run %{first-dep})))

2
test/unit-tests/configurator/dune
View File

@ -5,4 +5,4 @@
(alias
(name runtest)
(deps ./test_configurator.exe)
(action (run %{deps[0]})))
(action (run %{first-dep})))

28
test/unit-tests/dune
View File

@ -25,8 +25,8 @@
(source_tree findlib-db))
(action (chdir %{project_root}
(progn
(run %{exe:expect_test.exe} %{deps[0]})
(diff? %{deps[0]} %{deps[0]}.corrected)))))
(run %{exe:expect_test.exe} %{first-dep})
(diff? %{first-dep} %{first-dep}.corrected)))))
(alias
(name runtest)
@ -35,8 +35,8 @@
(glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi))
(action (chdir %{project_root}
(progn
(run %{exe:expect_test.exe} %{deps[0]})
(diff? %{deps[0]} %{deps[0]}.corrected)))))
(run %{exe:expect_test.exe} %{first-dep})
(diff? %{first-dep} %{first-dep}.corrected)))))
(alias
(name runtest)
@ -45,8 +45,8 @@
(glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi))
(action (chdir %{project_root}
(progn
(run %{exe:expect_test.exe} %{deps[0]})
(diff? %{deps[0]} %{deps[0]}.corrected)))))
(run %{exe:expect_test.exe} %{first-dep})
(diff? %{first-dep} %{first-dep}.corrected)))))
(alias
(name runtest)
@ -55,8 +55,8 @@
(glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi))
(action (chdir %{project_root}
(progn
(run %{exe:expect_test.exe} %{deps[0]})
(diff? %{deps[0]} %{deps[0]}.corrected)))))
(run %{exe:expect_test.exe} %{first-dep})
(diff? %{first-dep} %{first-dep}.corrected)))))
(alias
(name runtest)
@ -65,8 +65,8 @@
(glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi))
(action (chdir %{project_root}
(progn
(run %{exe:expect_test.exe} %{deps[0]})
(diff? %{deps[0]} %{deps[0]}.corrected)))))
(run %{exe:expect_test.exe} %{first-dep})
(diff? %{first-dep} %{first-dep}.corrected)))))
(alias
(name runtest)
@ -75,8 +75,8 @@
(glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi))
(action (chdir %{project_root}
(progn
(run %{exe:expect_test.exe} %{deps[0]})
(diff? %{deps[0]} %{deps[0]}.corrected)))))
(run %{exe:expect_test.exe} %{first-dep})
(diff? %{first-dep} %{first-dep}.corrected)))))
(alias
(name runtest)
@ -85,5 +85,5 @@
(glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi))
(action (chdir %{project_root}
(progn
(run %{exe:expect_test.exe} %{deps[0]})
(diff? %{deps[0]} %{deps[0]}.corrected)))))
(run %{exe:expect_test.exe} %{first-dep})
(diff? %{first-dep} %{first-dep}.corrected)))))

2
test/unit-tests/ocaml-config/dune
View File

@ -5,4 +5,4 @@
(alias
(name runtest)
(deps ./gh637.exe)
(action (run %{deps[0]})))
(action (run %{first-dep})))