From 218a739b33325c5dd6baa5cf6291dad849ad2441 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 14 Dec 2022 08:03:32 +0200
Subject: Handle NULL values in $string() and $concat() functions

This is relied upon by the parser to provide conversion/concatenation
semantics consistent with untyped values. Note that we handle NULL values
only for types that have empty representation.
---
 libbuild2/functions-path.cxx | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'libbuild2/functions-path.cxx')

diff --git a/libbuild2/functions-path.cxx b/libbuild2/functions-path.cxx
index 0c9b57f..b5511ad 100644
--- a/libbuild2/functions-path.cxx
+++ b/libbuild2/functions-path.cxx
@@ -161,7 +161,13 @@ namespace build2
 
     // string
     //
-    f["string"] += [](path p) {return move (p).string ();};
+    // Note that we must handle NULL values (relied upon by the parser
+    // to provide conversion semantics consistent with untyped values).
+    //
+    f["string"] += [](path* p)
+    {
+      return p != nullptr ? move (*p).string () : string ();
+    };
 
     f["string"] += [](paths v)
     {
@@ -694,6 +700,11 @@ namespace build2
     //
     function_family b (m, "builtin", &path_thunk);
 
+    // Note that while we should normally handle NULL values (relied upon by
+    // the parser to provide concatenation semantics consistent with untyped
+    // values), the result will unlikely be what the user expected, especially
+    // if the NULL value is on the LHS. So for now we keep it a bit tighter.
+    //
     b[".concat"] += &concat_path_string;
     b[".concat"] += &concat_dir_path_string;
 
-- 
cgit v1.1