aboutsummaryrefslogtreecommitdiff
path: root/build2/scope.hxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-08-07 14:59:07 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-08-07 19:32:10 +0200
commitc2b4305349ca855c497904282db354de56c74842 (patch)
tree13ff2901d1ab491d930f81cee6fa49e5cff11577 /build2/scope.hxx
parent7149c8eaeec3efcfc9da0f89c9ae979ff2c07fd5 (diff)
Add support for default extension specification, trailing dot escaping
For example: cxx{*}: extension = cxx cxx{foo} # foo.cxx cxx{foo.test} # foo.test (probably what we want...) cxx{foo.test...} # foo.test.cxx (... is this) cxx{foo..} # foo. cxx{foo....} # foo.. cxx{foo.....} # error (must come in escape pair)
Diffstat (limited to 'build2/scope.hxx')
-rw-r--r--build2/scope.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/build2/scope.hxx b/build2/scope.hxx
index 73d95b6..d40d14a 100644
--- a/build2/scope.hxx
+++ b/build2/scope.hxx
@@ -213,12 +213,12 @@ namespace build2
// Given a name, figure out its type, taking into account extensions,
// special names (e.g., '.' and '..'), or anything else that might be
- // relevant. Also process the name (in place) by extracting the
- // extension, adjusting dir/value, etc., (note that the dir is not
+ // relevant. Process the name (in place) by extracting (and returning)
+ // extension, adjusting dir/leaf, etc., (note that the dir is not
// necessarily normalized). Return NULL if not found.
//
- const target_type*
- find_target_type (name&, optional<string>& ext, const location&) const;
+ pair<const target_type*, optional<string>>
+ find_target_type (name&, const location&) const;
// Dynamically derive a new target type from an existing one. Return the
// reference to the target type and an indicator of whether it was