aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/build/script
diff options
context:
space:
mode:
Diffstat (limited to 'libbuild2/build/script')
-rw-r--r--libbuild2/build/script/parser.cxx4
-rw-r--r--libbuild2/build/script/parser.hxx4
-rw-r--r--libbuild2/build/script/parser.test.cxx2
3 files changed, 6 insertions, 4 deletions
diff --git a/libbuild2/build/script/parser.cxx b/libbuild2/build/script/parser.cxx
index 063ec68..9194e30 100644
--- a/libbuild2/build/script/parser.cxx
+++ b/libbuild2/build/script/parser.cxx
@@ -27,7 +27,9 @@ namespace build2
//
script parser::
- pre_parse (const scope& bs, const target* tg, const adhoc_actions& as,
+ pre_parse (const scope& bs,
+ const target* tg,
+ const small_vector<action, 1>& as,
istream& is, const path_name& pn, uint64_t line,
optional<string> diag, const location& diag_loc)
{
diff --git a/libbuild2/build/script/parser.hxx b/libbuild2/build/script/parser.hxx
index af43e35..8c787f9 100644
--- a/libbuild2/build/script/parser.hxx
+++ b/libbuild2/build/script/parser.hxx
@@ -36,7 +36,7 @@ namespace build2
// targets.
//
script
- pre_parse (const scope&, const target*, const adhoc_actions& acts,
+ pre_parse (const scope&, const target*, const small_vector<action, 1>&,
istream&, const path_name&, uint64_t line,
optional<string> diag_name, const location& diag_loc);
@@ -144,7 +144,7 @@ namespace build2
protected:
script* script_;
- const adhoc_actions* actions_; // Non-NULL during pre-parsing.
+ const small_vector<action, 1>* actions_; // Non-NULL during pre-parse.
// True if performing update is one of the actions. Only set for the
// pre-parse mode.
diff --git a/libbuild2/build/script/parser.test.cxx b/libbuild2/build/script/parser.test.cxx
index c1ba1d1..0bc1c5d 100644
--- a/libbuild2/build/script/parser.test.cxx
+++ b/libbuild2/build/script/parser.test.cxx
@@ -201,7 +201,7 @@ namespace build2
tt.path (path ("driver"));
- adhoc_actions acts {perform_update_id};
+ small_vector<action, 1> acts {perform_update_id};
// Parse and run.
//