X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpattern.cpp;h=d910f196276c142dac8b0f573522c4140d409286;hb=c3968651eb8a2ba66a95398f0571dd5afd37225c;hp=51ca9c6f1c94830967ed1f7c2a5a210b9b20c243;hpb=daac042aa64e944248160c1b38b9a31e3972bb50;p=builder.git

diff --git a/source/pattern.cpp b/source/pattern.cpp
index 51ca9c6..d910f19 100644
--- a/source/pattern.cpp
+++ b/source/pattern.cpp
@@ -17,7 +17,7 @@ string Pattern::apply(const string &body) const
 	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))
+	if(body.size()<=suffix.size() || body.compare(body.size()-suffix.size(), suffix.size(), suffix))
 		result += suffix;
 	return result;
 }
@@ -25,7 +25,7 @@ string Pattern::apply(const string &body) const
 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));
+	for(const Pattern &p: patterns)
+		result.push_back(p.apply(body));
 	return result;
 }