Don't apply parts of a pattern that are already present

[builder.git] / source / pattern.cpp

diff --git a/source/pattern.cpp b/source/pattern.cpp
index e87981f8f941603653de1bbf9f5e33ba068bcc45..51ca9c6f1c94830967ed1f7c2a5a210b9b20c243 100644 (file)
--- a/source/pattern.cpp
+++ b/source/pattern.cpp
@@ -14,5 +14,18 @@ Pattern::Pattern(const string &pat)
 
 string Pattern::apply(const string &body) const
 {
-       return prefix+body+suffix;
+       string result = body;
+       if(body.compare(0, prefix.size(), prefix))
+               result = prefix+result;
+       if(body.size()>suffix.size() && body.compare(body.size()-suffix.size(), suffix.size(), suffix))
+               result += suffix;
+       return result;
+}
+
+list<string> Pattern::apply_list(const list<Pattern> &patterns, const string &body)
+{
+       list<string> result;
+       for(list<Pattern>::const_iterator i=patterns.begin(); i!=patterns.end(); ++i)
+               result.push_back(i->apply(body));
+       return result;
 }