aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/build
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2021-12-06 08:33:15 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2021-12-06 08:33:15 +0200
commit2006284bfbda3416eb8348078fd98fa518d25c47 (patch)
tree960d8495e1d4a011348ab719fa486af49a50f912 /libbuild2/build
parentdcd8ccd86ca97de5293efc50f98d7072ee359e4c (diff)
Redo make_parser interface to return path, handle invalid_path exception
Diffstat (limited to 'libbuild2/build')
-rw-r--r--libbuild2/build/script/parser.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/libbuild2/build/script/parser.cxx b/libbuild2/build/script/parser.cxx
index 2210cc8..042eabb 100644
--- a/libbuild2/build/script/parser.cxx
+++ b/libbuild2/build/script/parser.cxx
@@ -1866,7 +1866,7 @@ namespace build2
size_t pos (0);
do
{
- pair<make_type, string> r;
+ pair<make_type, path> r;
{
auto df = make_diag_frame (
[this, &l] (const diag_record& dr)
@@ -1908,9 +1908,7 @@ namespace build2
if (r.first == make_type::target)
continue;
- if (optional<bool> u = add (path (move (r.second)),
- &skip,
- rmt))
+ if (optional<bool> u = add (move (r.second), &skip, rmt))
{
restart = *u;