aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/build
diff options
context:
space:
mode:
Diffstat (limited to 'libbuild2/build')
-rw-r--r--libbuild2/build/script/parser+for.test.testscript4
-rw-r--r--libbuild2/build/script/parser.cxx37
2 files changed, 29 insertions, 12 deletions
diff --git a/libbuild2/build/script/parser+for.test.testscript b/libbuild2/build/script/parser+for.test.testscript
index f4ebf3c..877f958 100644
--- a/libbuild2/build/script/parser+for.test.testscript
+++ b/libbuild2/build/script/parser+for.test.testscript
@@ -87,9 +87,7 @@
cmd $x
end
EOI
- error: type mismatch in variable x
- info: value type is dir_path
- info: variable type is string
+ buildfile:11:1: error: conflicting variable x type string and value type dir_path
EOE
: defined-var
diff --git a/libbuild2/build/script/parser.cxx b/libbuild2/build/script/parser.cxx
index cb0dbbb..8759cdf 100644
--- a/libbuild2/build/script/parser.cxx
+++ b/libbuild2/build/script/parser.cxx
@@ -1305,19 +1305,25 @@ namespace build2
// Note that we rely on "small function object" optimization for the
// exec_*() lambdas.
//
- auto exec_assign = [this] (const variable& var,
- value&& val,
- type kind,
- const location& l)
+ auto exec_set = [this] (const variable& var,
+ token& t, build2::script::token_type& tt,
+ const location&)
{
+ next (t, tt);
+ type kind (tt); // Assignment kind.
+
+ mode (lexer_mode::variable_line);
+ value rhs (parse_variable_line (t, tt));
+
+ assert (tt == type::newline);
+
+ // Assign.
+ //
value& lhs (kind == type::assign
? environment_->assign (var)
: environment_->append (var));
- if (kind == type::assign)
- lhs = move (val);
- else
- append_value (&var, lhs, move (val), l);
+ apply_value_attributes (&var, lhs, move (rhs), kind);
};
auto exec_cond = [this] (token& t, build2::script::token_type& tt,
@@ -1333,9 +1339,22 @@ namespace build2
return runner_->run_cond (*environment_, ce, ii, li, ll);
};
+ auto exec_for = [this] (const variable& var,
+ value&& val,
+ const location& l)
+ {
+ value& lhs (environment_->assign (var));
+
+ // To match the function semantics also pass the value's type
+ // attribute, restoring it from RHS. Note that the value can't be
+ // NULL.
+ //
+ apply_value (&var, lhs, move (val), type::assign, l, val.type);
+ };
+
build2::script::parser::exec_lines (
begin, end,
- exec_assign, exec_cmd, exec_cond,
+ exec_set, exec_cmd, exec_cond, exec_for,
nullptr /* iteration_index */,
environment_->exec_line,
&environment_->var_pool);