From ffa0839de796fbefc48bacc4777648ff19b3fee6 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 8 Sep 2017 16:16:11 +0200
Subject: Add ability to pass scope to buildfile functions, add
 $install.resolve()

---
 build2/parser.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'build2/parser.cxx')

diff --git a/build2/parser.cxx b/build2/parser.cxx
index 66af0a5..3782230 100644
--- a/build2/parser.cxx
+++ b/build2/parser.cxx
@@ -2893,7 +2893,7 @@ namespace build2
               }));
 
           p = functions.try_call (
-            "builtin.concat", vector_view<value> (a), loc);
+            *scope_, "builtin.concat", vector_view<value> (a), loc);
         }
 
         if (!p.second)
@@ -3398,7 +3398,7 @@ namespace build2
 
             // Note that we "move" args to call().
             //
-            result_data = functions.call (name, args, loc);
+            result_data = functions.call (*scope_, name, args, loc);
             what = "function call";
           }
           else
@@ -3506,7 +3506,7 @@ namespace build2
                   }));
 
               p = functions.try_call (
-                "string", vector_view<value> (&result_data, 1), loc);
+                *scope_, "string", vector_view<value> (&result_data, 1), loc);
             }
 
             if (!p.second)
-- 
cgit v1.1