Add support for returning optional<T> from (buildfile) function implementations

1 files changed, 20 insertions, 0 deletions

diff --git a/build2/variable.ixx b/build2/variable.ixx
index 8c16559..bf5fb92 100644
--- a/build2/variable.ixx
+++ b/build2/variable.ixx
@@ -24,6 +24,14 @@ namespace build2
     new (&data_) names (move (ns));
   }
 
+  inline value::
+  value (optional<names> ns)
+      : type (nullptr), null (!ns), extra (0)
+  {
+    if (!null)
+      new (&data_) names (move (*ns));
+  }
+
   template <typename T>
   inline value::
   value (T v)
@@ -33,6 +41,18 @@ namespace build2
     null = false;
   }
 
+  template <typename T>
+  inline value::
+  value (optional<T> v)
+      : type (&value_traits<T>::value_type), null (true), extra (0)
+  {
+    if (v)
+    {
+      value_traits<T>::assign (*this, move (*v));
+      null = false;
+    }
+  }
+
   inline value& value::
   operator= (reference_wrapper<value> v)
   {