Allow usage of const DictionaryList and reduce code size

vibe-d · Jun 19, 2014 · eedc0cc · eedc0cc
1 parent 0a41d3b
commit eedc0cc
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/source/vibe/utils/dictionarylist.d b/source/vibe/utils/dictionarylist.d
@@ -184,31 +184,35 @@ struct DictionaryList(VALUE, bool case_sensitive = true, size_t NUM_STATIC_FIELD
 
 	/** Iterates over all fields, including duplicates.
 	*/
-	int opApply(int delegate(string key, ref ValueType val) del)
+	int opApply(scope int delegate(string key, ref ValueType val) del)
 	{
-		foreach( ref kv; m_fields[0 .. m_fieldCount] ){
-			if( auto ret = del(kv.key, kv.value) )
+		foreach (ref kv; m_fields[0 .. m_fieldCount]) {
+			if (auto ret = del(kv.key, kv.value))
 				return ret;
 		}
-		foreach( ref kv; m_extendedFields ){
-			if( auto ret = del(kv.key, kv.value) )
+		foreach (ref kv; m_extendedFields) {
+			if (auto ret = del(kv.key, kv.value))
 				return ret;
 		}
 		return 0;
 	}
 
 	/// ditto
-	int opApply(int delegate(ref ValueType val) del)
+	int opApply(scope int delegate(ref ValueType val) del)
 	{
-		foreach( ref kv; m_fields[0 .. m_fieldCount] ){
-			if( auto ret = del(kv.value) )
-				return ret;
-		}
-		foreach( ref kv; m_extendedFields ){
-			if( auto ret = del(kv.value) )
-				return ret;
-		}
-		return 0;
+		return this.opApply((string key, ref ValueType val) { return del(val); });
+	}
+
+	/// ditto
+	int opApply(scope int delegate(string key, ref const(ValueType) val) del) const
+	{
+		return (cast() this).opApply(cast(int delegate(string, ref ValueType)) del);
+	}
+
+	/// ditto
+	int opApply(scope int delegate(ref const(ValueType) val) del) const
+	{
+		return (cast() this).opApply(cast(int delegate(ref ValueType)) del);
 	}
 
 	static if (is(typeof({ const(ValueType) v; ValueType w; w = v; }))) {