Fix macro expansion: no more % abandoned by the end of variable

zimmerle · zimmerle · commit 33a704e91854 · 2016-05-06T14:16:37.000-03:00
diff --git 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);
         }

Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,11 @@ std::string MacroExpansion::expand(const std::string& input,`
`62`	`62`	`variableValue = transaction->m_collections.resolveFirst(col, var);`
`63`	`63`	`}`
`64`	`64`
`65`		`- if (res[end - start + 2] == '%') {`
`66`		`- res.erase(start, end - start + 1);`
`67`		`- } else {`
`68`		`- res.erase(start, end - start + 2);`
	`65`	`+ res.erase(start, end - start + 1);`
	`66`	`+ if (res[start] == '%') {`
	`67`	`+ res.erase(start, 1);`
`69`	`68`	`}`
	`69`	`+`
`70`	`70`	`if (variableValue != NULL) {`
`71`	`71`	`res.insert(start, *variableValue);`
`72`	`72`	`}`