From 2006284bfbda3416eb8348078fd98fa518d25c47 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 6 Dec 2021 08:33:15 +0200
Subject: Redo make_parser interface to return path, handle invalid_path
 exception

---
 libbuild2/build/script/parser.cxx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'libbuild2/build')

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;
 
-- 
cgit v1.1