From ca2283bdc00529967f9ccd9bf0097714447af351 Mon Sep 17 00:00:00 2001 From: Matthew Krupcale Date: Sun, 9 Aug 2020 09:37:19 -0400 Subject: Add iterator-based versions of find_option{,_prefix} This allows one to use all of the properties of iterators to manipulate the found option. --- libbuild2/utility.hxx | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'libbuild2/utility.hxx') diff --git a/libbuild2/utility.hxx b/libbuild2/utility.hxx index 7a6ada2..b747667 100644 --- a/libbuild2/utility.hxx +++ b/libbuild2/utility.hxx @@ -633,7 +633,8 @@ namespace build2 F&& get = [] (const string& s) {return s;}); // Check if a specified option is present in the variable or value. T is - // either target or scope. + // either target or scope. For the interator version use rbegin()/rend() to + // search backwards. // template bool @@ -649,6 +650,10 @@ namespace build2 const char* variable, bool ignore_case = false); + template + I + find_option (const char* option, I begin, I end, bool ignore_case = false); + LIBBUILD2_SYMEXPORT bool find_option (const char* option, const lookup&, bool ignore_case = false); @@ -691,8 +696,9 @@ namespace build2 // As above but look for an option that has the specified prefix. Return the // pointer to option or NULL if not found (thus can be used as bool). - // Search backward (which is normall consistent with how options override - // each other). + // Search backward (which is normally consistent with how options override + // each other). For the interator version use rbegin()/rend() to do the + // same. // template const string* @@ -702,6 +708,10 @@ namespace build2 const string* find_option_prefix (const char* prefix, T&, const char*, bool = false); + template + I + find_option_prefix (const char* prefix, I begin, I end, bool = false); + LIBBUILD2_SYMEXPORT const string* find_option_prefix (const char* prefix, const lookup&, bool = false); -- cgit v1.1