diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2016-11-25 11:18:34 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-11-25 11:18:34 +0200 |
commit | 28f8338ded34f160e0083da9be4679bc778be7ca (patch) | |
tree | 7bd01311683d835f946c73d7d8220f552bae718f /build2/parser.cxx | |
parent | f32bb0aceb00cfa4bd04eea72f8fa2fe02b738b3 (diff) |
Distinguish token quoting type and completeness
Diffstat (limited to 'build2/parser.cxx')
-rw-r--r-- | build2/parser.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/build2/parser.cxx b/build2/parser.cxx index 5f9850d..c2737cb 100644 --- a/build2/parser.cxx +++ b/build2/parser.cxx @@ -2154,7 +2154,10 @@ namespace build2 tt != type::lparen) || peeked ().separated)) { tt = type::word; - t = token (move (concat_str), true, false, t.line, t.column); + t = token (move (concat_str), + true, + quote_type::unquoted, false, + t.line, t.column); concat = false; } else if (!first) @@ -2792,7 +2795,7 @@ namespace build2 // // See tests/keyword. // - if (!t.quoted) + if (t.qtype == quote_type::unquoted) { // We cannot peek at the whole token here since it might have to be // lexed in a different mode. So peek at its first character. |