From ae20570f2ad55b2fa8e71cf450457cb9c4b21b1b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 18 Apr 2016 10:17:37 +0200
Subject: Add support for using value attributes in eval context

For example:

if ($x == [null])

Or:

if ([uint64] 01 == [uint64] 1)
---
 build2/scope.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'build2/scope.cxx')

diff --git a/build2/scope.cxx b/build2/scope.cxx
index b22cb0c..1459687 100644
--- a/build2/scope.cxx
+++ b/build2/scope.cxx
@@ -326,7 +326,7 @@ namespace build2
     // while we still need to apply prefixes/suffixes in the type-aware way.
     //
     if (cache.value.type == nullptr && var.type != nullptr)
-      typify (cache.value, *var.type, var);
+      typify (cache.value, *var.type, &var);
 
     // Now apply override prefixes and suffixes. Also calculate the vars and
     // depth of the result, which will be those of the stem or prefix/suffix
@@ -362,11 +362,11 @@ namespace build2
 
         if (l) // No sense to prepend/append if NULL.
         {
-          cache.value.prepend (names (cast<names> (l)), var);
+          cache.value.prepend (names (cast<names> (l)), &var);
         }
         else if ((l = find (o, ".__suffix")))
         {
-          cache.value.append (names (cast<names> (l)), var);
+          cache.value.append (names (cast<names> (l)), &var);
         }
 
         if (l.defined ())
-- 
cgit v1.1