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

Fix error messages when percent macros are used incorrectly 

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
This commit is contained in:
Rudi Grinberg 2018-07-08 17:27:35 +07:00
parent ccabeb7181
commit a2153539e1
2 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/super_context.ml
View File

@ -87,8 +87,8 @@ let find_scope_by_name t name = Scope.DB.find_by_name t.scopes name
let expand_vars t ~syntax_version ~var =
if String_with_vars.Var.is_macro var then
Exn.code_error "expand_vars can't expand macros"
[ "var", String_with_vars.Var.sexp_of_t var ]
Loc.fail (String_with_vars.Var.loc var)
"macros of the form %%{name:..} cannot be expanded here"
else
Pform.Map.expand t.vars ~syntax_version ~var

28
test/blackbox-tests/test-cases/form-error/run.t
View File

@ -3,30 +3,6 @@ inappropariate place:
$ dune build
Info: creating file dune-project with this contents: (lang dune 1.0)
Internal error, please report upstream including the contents of _build/log.
Description:
("expand_vars can't expand macros" (var "\%{read:x}"))
Backtrace:
Raised at file "src/stdune/exn.ml", line 32, characters 5-10
Called from file "src/super_context.ml", line 105, characters 12-46
Called from file "src/string_with_vars.ml", line 276, characters 12-32
Called from file "src/string_with_vars.ml", line 252, characters 20-40
Called from file "src/string_with_vars.ml", line 275, characters 4-487
Called from file "src/super_context.ml", line 118, characters 4-38
Called from file "src/gen_rules.ml", line 204, characters 21-68
Called from file "src/gen_rules.ml", line 261, characters 25-68
Called from file "list.ml", line 82, characters 20-23
Called from file "src/stdune/list.ml" (inlined), line 29, characters 29-39
Called from file "src/gen_rules.ml", line 254, characters 12-827
Called from file "src/stdune/hashtbl.ml", line 80, characters 12-17
Called from file "src/gen_rules.ml", line 1023, characters 16-39
Called from file "src/gen_rules.ml", line 1086, characters 19-30
Called from file "src/build_system.ml", line 917, characters 6-62
Called from file "src/build_system.ml", line 893, characters 6-59
Re-raised at file "src/build_system.ml", line 904, characters 6-17
Called from file "src/build_system.ml" (inlined), line 861, characters 32-63
Called from file "src/build_system.ml", line 871, characters 4-24
Called from file "src/build_system.ml" (inlined), line 861, characters 32-63
Called from file "src/build_system.ml", line 1115, characters 6-21
Called from file "src/fiber/fiber.ml", line 160, characters 6-169
File "dune", line 1, characters 14-21:
Error: macros of the form %{name:..} cannot be expanded here
[1]