From 73c7f8615ebfaf76063207fbd071b2ff7b6b5a3f Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 26 Nov 2016 16:19:28 +0200
Subject: Spec testscript regex, add support in token/lexer

---
 build2/test/script/token | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

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

diff --git a/build2/test/script/token b/build2/test/script/token
index d4f6eec..7f79746 100644
--- a/build2/test/script/token
+++ b/build2/test/script/token
@@ -30,29 +30,22 @@ namespace build2
           minus,                        // -
 
           pipe,                         // |
-          clean_always,                 // &
-          clean_maybe,                  // &?
-          clean_never,                  // &!
+          clean,                        // &{?!}   (modifiers in value)
           log_and,                      // &&
           log_or,                       // ||
 
           in_pass,                      // <+
           in_null,                      // <-
-          in_str,                       // <
-          in_str_nn,                    // <:
-          in_doc,                       // <<
-          in_doc_nn,                    // <<:
+          in_str,                       // <{:}    (modifiers in value)
+          in_doc,                       // <<{:}   (modifiers in value)
           in_file,                      // <<<
 
           out_pass,                     // >+
           out_null,                     // >-
           out_merge,                    // >&
-          out_str,                      // >
-          out_str_nn,                   // >:
-          out_doc,                      // >>
-          out_doc_nn,                   // >>:
-          out_file,                     // >>>
-          out_file_app                  // >>>&
+          out_str,                      // >{:~}   (modifiers in value)
+          out_doc,                      // >>{:~}  (modifiers in value)
+          out_file                      // >>>{&}  (modifiers in value)
         };
 
         token_type () = default;
-- 
cgit v1.1