From 33a704e91854c6c762820da276b42939e768beca Mon Sep 17 00:00:00 2001 From: Felipe Zimmerle Date: Fri, 6 May 2016 14:16:37 -0300 Subject: [PATCH] Fix macro expansion: no more % abandoned by the end of variable --- src/macro_expansion.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/macro_expansion.cc b/src/macro_expansion.cc index 8daf663d..aecdfefa 100644 --- a/src/macro_expansion.cc +++ b/src/macro_expansion.cc @@ -62,11 +62,11 @@ std::string MacroExpansion::expand(const std::string& input, variableValue = transaction->m_collections.resolveFirst(col, var); } - if (res[end - start + 2] == '%') { - res.erase(start, end - start + 1); - } else { - res.erase(start, end - start + 2); + res.erase(start, end - start + 1); + if (res[start] == '%') { + res.erase(start, 1); } + if (variableValue != NULL) { res.insert(start, *variableValue); }