aboutsummaryrefslogtreecommitdiff
path: root/build2/parser.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-09-08 16:16:11 +0200
committerKaren Arutyunov <karen@codesynthesis.com>2017-09-11 13:57:29 +0300
commitffa0839de796fbefc48bacc4777648ff19b3fee6 (patch)
tree0f493314df633b6f35f9b9db78c7163506c8eed1 /build2/parser.cxx
parent66e516ad81225b888469b24e726095533c4f9c4c (diff)
Add ability to pass scope to buildfile functions, add $install.resolve()
Diffstat (limited to 'build2/parser.cxx')
-rw-r--r--build2/parser.cxx6
1 files changed, 3 insertions, 3 deletions
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)