From 9a9276e1d151910ba31db4d91521b41e5ea1435f Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 6 Jul 2020 10:22:12 +0200 Subject: Adjust variable block applicability in dependency chains Before the block used to apply to the set of prerequisites before the last `:`. This turned out to be counterintuitive and not very useful since prerequisite-specific variables are a lot less common than target specific. And it doesn't fit with ad hoc recipes. The new rule is if the chain ends with `:`, then the block applies to the last set of prerequisites. Otherwise, it applies to the last set of targets. For example: ./: exe{test}: cxx{main} { test = true # Applies to the exe{test} target. } ./: exe{test}: libue{test}: { bin.whole = false # Applies to the libue{test} prerequisite. } This is actually consistent with both non-chain and non-block cases. Consider: exe{test}: cxx{main} { test = true } exe{test}: libue{test}: { bin.whole = false } exe{test}: libue{test}: bin.whole = false The only exception we now have in this overall approach of "if the dependency declaration ends with a colon, then what follows is for a prerequisite" is for the first semicolon: exe{test}: { test = true } exe{test}: test = true But that's probably intuitive enough since there cannot be a prerequisite without a target. --- libbuild2/parser.hxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'libbuild2/parser.hxx') diff --git a/libbuild2/parser.hxx b/libbuild2/parser.hxx index 2db7ade..24a1ac1 100644 --- a/libbuild2/parser.hxx +++ b/libbuild2/parser.hxx @@ -152,12 +152,11 @@ namespace build2 small_vector, 1> enter_targets (names&&, const location&, adhoc_names&&, size_t); - bool + void parse_dependency (token&, token_type&, names&&, const location&, adhoc_names&&, - names&&, const location&, - bool = false); + names&&, const location&); void parse_assert (token&, token_type&); -- cgit v1.1