Merge pull request #1079 from quickfur/issue9119_const

byKeyValue should also work with const loop variables.
dlang · Jan 4, 2015 · 9ec46a6 · 9ec46a6
2 parents b3a8032 + a1f9857
commit 9ec46a6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/object.di b/src/object.di
@@ -542,8 +542,8 @@ auto byKeyValue(T : Value[Key], Value, Key)(T aa) pure nothrow @nogc @property
                 private Key* keyp;
                 private Value* valp;
 
-                @property ref Key key() { return *keyp; }
-                @property ref Value value() { return *valp; }
+                @property ref inout(Key) key() inout { return *keyp; }
+                @property ref inout(Value) value() inout { return *valp; }
             }
             return Pair(cast(Key*)_aaRangeFrontKey(r),
                         cast(Value*)_aaRangeFrontValue(r));

diff --git a/src/object_.d b/src/object_.d
@@ -2142,8 +2142,8 @@ auto byKeyValue(T : Value[Key], Value, Key)(T aa) pure nothrow @nogc @property
                 private Key* keyp;
                 private Value* valp;
 
-                @property ref Key key() { return *keyp; }
-                @property ref Value value() { return *valp; }
+                @property ref inout(Key) key() inout { return *keyp; }
+                @property ref inout(Value) value() inout { return *valp; }
             }
             return Pair(cast(Key*)_aaRangeFrontKey(r),
                         cast(Value*)_aaRangeFrontValue(r));
@@ -2419,6 +2419,17 @@ unittest
     assert(count == aa.length);
 }
 
+unittest
+{
+    // Verify iteration with const.
+    auto aa = [1:2, 3:4];
+    foreach (const t; aa.byKeyValue)
+    {
+        auto k = t.key;
+        auto v = t.value;
+    }
+}
+
 // Explicitly undocumented. It will be removed in March 2015.
 deprecated("Please use destroy instead of clear.")
 alias destroy clear;