From 0baeb5209d3a111a53070c032d7cdb1e609e3516 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 31 May 2021 16:32:40 +0200 Subject: Implement ad hoc regex pattern rule support An ad hoc pattern rule consists of a pattern that mimics a dependency declaration followed by one or more recipes. For example: exe{~'/(.*)/'}: cxx{~'/\1/'} {{ $cxx.path -o $path($>) $path($<[0]) }} If a pattern matches a dependency declaration of a target, then the recipe is used to perform the corresponding operation on this target. For example, the following dependency declaration matches the above pattern which means the rule's recipe will be used to update this target: exe{hello}: cxx{hello} While the following declarations do not match the above pattern: exe{hello}: c{hello} # Type mismatch. exe{hello}: cxx{howdy} # Name mismatch. On the left hand side of `:` in the pattern we can have a single target or an ad hoc target group. The single target or the first (primary) ad hoc group member must be a regex pattern (~). The rest of the ad hoc group members can be patterns or substitutions (^). For example: : cxx{~'/\1/'} {{ $cxx.path -o $path($>[0]) "-Wl,-Map=$path($>[1])" $path($<[0]) }} On the left hand side of `:` in the pattern we have prerequisites which can be patterns, substitutions, or non-patterns. For example: : cxx{~'/\1/'} hxx{^'/\1/'} hxx{common} {{ $cxx.path -o $path($>[0]) "-Wl,-Map=$path($>[1])" $path($<[0]) }} Substitutions on the left hand side of `:` and substitutions and non-patterns on the right hand side are added to the dependency declaration. For example, given the above rule and dependency declaration, the effective dependency is going to be: : cxx{hello} hxx{hello} hxx{common} --- libbuild2/build/script/parser.cxx | 4 +++- libbuild2/build/script/parser.hxx | 4 ++-- libbuild2/build/script/parser.test.cxx | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'libbuild2/build') diff --git a/libbuild2/build/script/parser.cxx b/libbuild2/build/script/parser.cxx index 063ec68..9194e30 100644 --- a/libbuild2/build/script/parser.cxx +++ b/libbuild2/build/script/parser.cxx @@ -27,7 +27,9 @@ namespace build2 // script parser:: - pre_parse (const scope& bs, const target* tg, const adhoc_actions& as, + pre_parse (const scope& bs, + const target* tg, + const small_vector& as, istream& is, const path_name& pn, uint64_t line, optional diag, const location& diag_loc) { diff --git a/libbuild2/build/script/parser.hxx b/libbuild2/build/script/parser.hxx index af43e35..8c787f9 100644 --- a/libbuild2/build/script/parser.hxx +++ b/libbuild2/build/script/parser.hxx @@ -36,7 +36,7 @@ namespace build2 // targets. // script - pre_parse (const scope&, const target*, const adhoc_actions& acts, + pre_parse (const scope&, const target*, const small_vector&, istream&, const path_name&, uint64_t line, optional diag_name, const location& diag_loc); @@ -144,7 +144,7 @@ namespace build2 protected: script* script_; - const adhoc_actions* actions_; // Non-NULL during pre-parsing. + const small_vector* actions_; // Non-NULL during pre-parse. // True if performing update is one of the actions. Only set for the // pre-parse mode. diff --git a/libbuild2/build/script/parser.test.cxx b/libbuild2/build/script/parser.test.cxx index c1ba1d1..0bc1c5d 100644 --- a/libbuild2/build/script/parser.test.cxx +++ b/libbuild2/build/script/parser.test.cxx @@ -201,7 +201,7 @@ namespace build2 tt.path (path ("driver")); - adhoc_actions acts {perform_update_id}; + small_vector acts {perform_update_id}; // Parse and run. // -- cgit v1.1