diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2022-10-14 16:06:35 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2022-10-14 17:30:12 +0300 |
| commit | 63b5b6416c6bde16560eb9b83a9e3122599369d5 (patch) | |
| tree | 82c0f624aedebf6917aeb4c9b6648f8cdb9d3fc1 /libbuild2/build/script | |
| parent | fbe94f38ee51e705202a2d5cf1f45b5e8a08d8c7 (diff) | |
Fix 'for [<attrs>] x: ...' to treat <attrs> as value attributes
Diffstat (limited to 'libbuild2/build/script')
| -rw-r--r-- | libbuild2/build/script/parser+for.test.testscript | 19 | ||||
| -rw-r--r-- | libbuild2/build/script/parser.cxx | 11 |
2 files changed, 15 insertions, 15 deletions
diff --git a/libbuild2/build/script/parser+for.test.testscript b/libbuild2/build/script/parser+for.test.testscript index c5f6587..cbcaf14 100644 --- a/libbuild2/build/script/parser+for.test.testscript +++ b/libbuild2/build/script/parser+for.test.testscript @@ -58,7 +58,7 @@ cmd b EOO - : typed-value + : typed-values : $* <<EOI >>~%EOO% for x: [dir_paths] a b @@ -69,7 +69,7 @@ %cmd (b/|'b\\')% EOO - : typed-var + : typed-var-value : $* <<EOI >>~%EOO% for [dir_path] x: a b @@ -80,15 +80,16 @@ %cmd (b/|'b\\')% EOO - : type-mismatch + : typed-values-var-value : - $* <<EOI 2>>EOE != 0 - for [string] x: [dir_paths] a b + $* <<EOI >>~%EOO% + for [dir_path] x: [strings] a b cmd $x end EOI - buildfile:11:1: error: conflicting variable x type string and value type dir_path - EOE + %cmd (a/|'a\\')% + %cmd (b/|'b\\')% + EOO : defined-var : @@ -340,7 +341,7 @@ echo a b | for x EOO - : typed-var + : typed-var-value : $* <<EOI >>EOO echo 'a b' | for -w [dir_paths] x @@ -563,7 +564,7 @@ for x b <a EOO - : typed-var + : typed-var-value : $* <<EOI >>EOO for -w [dir_path] x <'a b' diff --git a/libbuild2/build/script/parser.cxx b/libbuild2/build/script/parser.cxx index 035ab6b..3098bc9 100644 --- a/libbuild2/build/script/parser.cxx +++ b/libbuild2/build/script/parser.cxx @@ -1455,15 +1455,14 @@ namespace build2 auto exec_for = [this] (const variable& var, value&& val, - const location& l) + const attributes& val_attrs, + const location&) { 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); + attributes_.push_back (move (val_attrs)); + + apply_value_attributes (&var, lhs, move (val), type::assign); }; build2::script::parser::exec_lines ( |