parent
b7ae454d7d
commit
c52d0676e8
|
@ -8,6 +8,8 @@ next
|
||||||
- Change the location of preprocessed files inside the build directory
|
- Change the location of preprocessed files inside the build directory
|
||||||
(#1004, @diml)
|
(#1004, @diml)
|
||||||
|
|
||||||
|
- Fix parsing of `%{lib:name:file}` forms (#1022, fixes #1019, @diml)
|
||||||
|
|
||||||
1.0.0 (10/07/2018)
|
1.0.0 (10/07/2018)
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
|
|
|
@ -282,7 +282,7 @@ and quoted_string_after_escaped_newline = parse
|
||||||
{ quoted_string lexbuf }
|
{ quoted_string lexbuf }
|
||||||
|
|
||||||
and template_variable = parse
|
and template_variable = parse
|
||||||
| (varname_char+ as name) (':' (varname_char* as payload))? '}'
|
| (varname_char+ as name) (':' ((':' | varname_char)* as payload))? '}'
|
||||||
{ let payload =
|
{ let payload =
|
||||||
match payload with
|
match payload with
|
||||||
| Some "" -> error lexbuf "payload after : in variable cannot be empty"
|
| Some "" -> error lexbuf "payload after : in variable cannot be empty"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
(library (name foo))
|
(library (name foo) (public_name foo))
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
(name default)
|
(name default)
|
||||||
(echo %{lib:foo:foo.ml}))
|
(action (echo %{lib:foo:foo.ml})))
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
Regression test for #1019
|
Regression test for #1019
|
||||||
|
|
||||||
$ dune build
|
$ dune build
|
||||||
File "dune", line 5, characters 9-10:
|
../install/default/lib/foo/foo.ml
|
||||||
Error: This character is not allowed inside %{...} forms
|
|
||||||
[1]
|
|
||||||
|
|
Loading…
Reference in New Issue