From 132c1f2bb19c92722274c69a190c2f71b801b602 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 22 Oct 2016 16:10:38 +0200
Subject: Add support for no-newline redirects in testscript

The no-newline operators are '<:', '>:', '<<:', and '>>:'.
---
 build2/test/script/token.cxx | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'build2/test/script/token.cxx')

diff --git a/build2/test/script/token.cxx b/build2/test/script/token.cxx
index 6ed0443..31bfcd5 100644
--- a/build2/test/script/token.cxx
+++ b/build2/test/script/token.cxx
@@ -21,20 +21,24 @@ namespace build2
 
         switch (t.type)
         {
-        case token_type::semi:         os << q << ';' << q; break;
-
-        case token_type::pipe:         os << q << '|' << q; break;
-        case token_type::clean:        os << q << '&' << q; break;
-        case token_type::log_and:      os << q << "&&" << q; break;
-        case token_type::log_or:       os << q << "||" << q; break;
-
-        case token_type::in_null:      os << q << "<!" << q; break;
-        case token_type::in_string:    os << q << '<' << q; break;
-        case token_type::in_document:  os << q << "<<" << q; break;
-
-        case token_type::out_null:     os << q << ">!" << q; break;
-        case token_type::out_string:   os << q << '>' << q; break;
-        case token_type::out_document: os << q << ">>" << q; break;
+        case token_type::semi:         os << q << ';'   << q; break;
+
+        case token_type::pipe:         os << q << '|'   << q; break;
+        case token_type::clean:        os << q << '&'   << q; break;
+        case token_type::log_and:      os << q << "&&"  << q; break;
+        case token_type::log_or:       os << q << "||"  << q; break;
+
+        case token_type::in_null:      os << q << "<!"  << q; break;
+        case token_type::in_str:       os << q << '<'   << q; break;
+        case token_type::in_str_nn:    os << q << "<:"  << q; break;
+        case token_type::in_doc:       os << q << "<<"  << q; break;
+        case token_type::in_doc_nn:    os << q << "<<:" << q; break;
+
+        case token_type::out_null:     os << q << ">!"  << q; break;
+        case token_type::out_str:      os << q << '>'   << q; break;
+        case token_type::out_str_nn:   os << q << ">:"  << q; break;
+        case token_type::out_doc:      os << q << ">>"  << q; break;
+        case token_type::out_doc_nn:   os << q << ">>:" << q; break;
 
         default: build2::token_printer (os, t, d);
         }
-- 
cgit v1.1