Fix macro expansion: Now support } and/or }% to close a variable

Felipe Zimmerle · Felipe Zimmerle · commit 30d9ade19277 · 2016-02-18T19:39:43.000-03:00
diff --git a/src/macro_expansion.cc b/src/macro_expansion.cc
@@ -62,7 +62,11 @@ std::string MacroExpansion::expand(const std::string& input,
             variableValue = transaction->m_collections.resolveFirst(col, var);
         }
 
-        res.erase(start, end - start + 2);
+        if (res[end - start + 2] == '%') {
+            res.erase(start, end - start + 1);
+        } else {
+            res.erase(start, end - start + 2);
+        }
         if (variableValue != NULL) {
             res.insert(start, *variableValue);
         }

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