From e8b0a98a78b44f28c97dcbe96fe90f2d94c7573b Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Tue, 11 Nov 2014 13:53:57 +0000 Subject: Remove %rec{...} strings, now "..." strings expand their content --- src/command_manager.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/command_manager.cc') diff --git a/src/command_manager.cc b/src/command_manager.cc index a771ddeb..aa966161 100644 --- a/src/command_manager.cc +++ b/src/command_manager.cc @@ -139,8 +139,6 @@ Token::Type token_type(StringView type_name) return Token::Type::OptionExpand; else if (type_name == "val") return Token::Type::ValExpand; - else if (type_name == "rec") - return Token::Type::RawEval; else if (throw_on_invalid) throw unknown_expand{type_name}; else @@ -239,8 +237,9 @@ TokenList parse(StringView line) if (throw_on_unterminated and pos == length) throw unterminated_string(String{delimiter}, String{delimiter}); - result.emplace_back(Token::Type::Raw, token_start, - pos, std::move(token)); + result.emplace_back(delimiter == '"' ? Token::Type::RawEval + : Token::Type::Raw, + token_start, pos, std::move(token)); } else if (line[pos] == '%') result.push_back( -- cgit v1.2.3