From 3ca670b7b7c71ca67d70cac9dffb2ba6120b2e36 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 15 Dec 2022 11:24:18 +0200
Subject: Improve escape sequence support

Specifically:

1. In the double-quoted strings we now only do effective escaping of the
   special `$("\` characters plus `)` for symmetry.

2. There is now support for "escape sequence expansion" in the form $\X where
   \X can be any of the C/C++ simple escape sequences (\n, \t, etc) plus \0
   (which in C/C++ is an octal escape sequence). For example:

   info "foo$\n$\tbar$\n$\tbaz"

   Will print:

   buildfile:1:1: info: foo
           bar
           baz
---
 libbuild2/token.hxx | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'libbuild2/token.hxx')

diff --git a/libbuild2/token.hxx b/libbuild2/token.hxx
index fca888c..f9ede65 100644
--- a/libbuild2/token.hxx
+++ b/libbuild2/token.hxx
@@ -30,6 +30,7 @@ namespace build2
       eos,
       newline,
       word,
+      escape,          // token::value is <...> in $\<...>
       pair_separator,  // token::value[0] is the pair separator char.
 
       colon,           // :
@@ -159,16 +160,13 @@ namespace build2
     token (string v, bool s,
            quote_type qt, bool qc, bool qf,
            uint64_t l, uint64_t c)
-        : token (token_type::word, move (v), s,
-                 qt, qc, qf,
-                 l, c,
-                 &token_printer) {}
+        : token (token_type::word, move (v), s, qt, qc, qf, l, c) {}
 
     token (token_type t,
            string v, bool s,
            quote_type qt, bool qc, bool qf,
            uint64_t l, uint64_t c,
-           printer_type* p)
+           printer_type* p = &token_printer)
         : type (t), separated (s),
           qtype (qt), qcomp (qc), qfirst (qf),
           value (move (v)),
-- 
cgit v1.1