From 023d8d8b040d5fce821080b016b4ce25eb67550d Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 26 Oct 2016 21:22:10 +0300 Subject: Add support of merge redirect to testscript parser --- build2/test/script/lexer.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'build2/test/script/lexer.cxx') 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 '>': { -- cgit v1.1