Merge pull request #4787 from WalterBright/scope-opApply

add 'scope' to opApply() parameter
dlang · Sep 15, 2016 · 3142577 · 3142577
2 parents e75831a + 55e5737
commit 3142577
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/std/algorithm/iteration.d b/std/algorithm/iteration.d
@@ -982,7 +982,7 @@ template each(alias pred = "a")
     static class S
     {
         int x;
-        int opApply(int delegate(ref int _x) dg) { return dg(x); }
+        int opApply(scope int delegate(ref int _x) dg) { return dg(x); }
     }
 
     auto s = new S;
@@ -2862,7 +2862,7 @@ The number of seeds must be correspondingly increased.
     {
         bool actEmpty;
 
-        int opApply(int delegate(ref int) dg)
+        int opApply(scope int delegate(ref int) dg)
         {
             int res;
             if (actEmpty) return res;

diff --git a/std/array.d b/std/array.d
@@ -221,7 +221,7 @@ ElementType!String[] array(String)(String str) if (isNarrowString!String)
 
     static struct OpApply
     {
-        int opApply(int delegate(ref int) dg)
+        int opApply(scope int delegate(ref int) dg)
         {
             int res;
             foreach (i; 0..10)

diff --git a/std/json.d b/std/json.d
@@ -616,7 +616,7 @@ struct JSONValue
     }
 
     /// Implements the foreach $(D opApply) interface for json arrays.
-    int opApply(int delegate(size_t index, ref JSONValue) dg) @system
+    int opApply(scope int delegate(size_t index, ref JSONValue) dg) @system
     {
         int result;
 
@@ -631,7 +631,7 @@ struct JSONValue
     }
 
     /// Implements the foreach $(D opApply) interface for json objects.
-    int opApply(int delegate(string key, ref JSONValue) dg) @system
+    int opApply(scope int delegate(string key, ref JSONValue) dg) @system
     {
         enforce!JSONException(type == JSON_TYPE.OBJECT,
                                 "JSONValue is not an object");

diff --git a/std/range/interfaces.d b/std/range/interfaces.d
@@ -110,10 +110,10 @@ interface InputRange(E) {
     /**$(D foreach) iteration uses opApply, since one delegate call per loop
      * iteration is faster than three virtual function calls.
      */
-    int opApply(int delegate(E));
+    int opApply(scope int delegate(E));
 
     /// Ditto
-    int opApply(int delegate(size_t, E));
+    int opApply(scope int delegate(size_t, E));
 
 }
 
@@ -436,7 +436,7 @@ if (isInputRange!(Unqual!R))
 
             // Optimization:  One delegate call is faster than three virtual
             // function calls.  Use opApply for foreach syntax.
-            int opApply(int delegate(E) dg) {
+            int opApply(scope int delegate(E) dg) {
                 int res;
 
                 for (auto r = _range; !r.empty; r.popFront())
@@ -448,7 +448,7 @@ if (isInputRange!(Unqual!R))
                 return res;
             }
 
-            int opApply(int delegate(size_t, E) dg) {
+            int opApply(scope int delegate(size_t, E) dg) {
                 int res;
 
                 size_t i = 0;

diff --git a/std/traits.d b/std/traits.d
@@ -5633,7 +5633,7 @@ enum bool isIterable(T) = is(typeof({ foreach (elem; T.init) {} }));
 {
     struct OpApply
     {
-        int opApply(int delegate(ref uint) dg) { assert(0); }
+        int opApply(scope int delegate(ref uint) dg) { assert(0); }
     }
 
     struct Range