diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2016-10-26 21:22:10 +0300 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-11-04 09:26:36 +0200 |
| commit | 023d8d8b040d5fce821080b016b4ce25eb67550d (patch) | |
| tree | 9524aa8cb18bcca33ec89f4cd4ef2b87fb3a65e8 /build2/test/script/lexer.cxx | |
| parent | 5daf46f700217521e8ba90c4be0e0369105544df (diff) | |
Add support of merge redirect to testscript parser
Diffstat (limited to 'build2/test/script/lexer.cxx')
| -rw-r--r-- | build2/test/script/lexer.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build2/test/script/lexer.cxx b/build2/test/script/lexer.cxx index 98d52e7..003e4ac 100644 --- a/build2/test/script/lexer.cxx +++ b/build2/test/script/lexer.cxx @@ -288,7 +288,7 @@ namespace build2 { xchar p (peek ()); - if (p == '+' || p == '-' || p == ':' || p == '>') + if (p == '+' || p == '-' || p == '&' || p == ':' || p == '>') { get (); @@ -296,6 +296,7 @@ namespace build2 { case '+': return make_token (type::out_pass); case '-': return make_token (type::out_null); + case '&': return make_token (type::out_merge); case ':': return make_token (type::out_str_nn); case '>': { |